[geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.109, 1.110

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv16460

Modified Files:
	functions.inc 
Log Message:
Improve formatting of bottom page hits and date. Only show separator | if required.

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** functions.inc	5 Jan 2008 15:54:55 -0000	1.109
--- functions.inc	5 Jan 2008 20:02:55 -0000	1.110
***************
*** 58,66 ****
  if (!isset($_SP_CONF['allow_php'])) {
      require_once $_CONF['path_system'] . 'classes/config.class.php';
      $sp_config = config::get_instance();
  
      $LANG_configsubgroups['staticpages'][0] = $LANG_STATIC['config_menubar'];
      $LANG_fs['staticpages'][0] = $LANG_STATIC['config_menu1'];
- 
      $_SP_CONF = $sp_config->get_config('staticpages');
  }
--- 58,66 ----
  if (!isset($_SP_CONF['allow_php'])) {
      require_once $_CONF['path_system'] . 'classes/config.class.php';
+ 
      $sp_config = config::get_instance();
  
      $LANG_configsubgroups['staticpages'][0] = $LANG_STATIC['config_menubar'];
      $LANG_fs['staticpages'][0] = $LANG_STATIC['config_menu1'];
      $_SP_CONF = $sp_config->get_config('staticpages');
  }
***************
*** 342,345 ****
--- 342,346 ----
  
      if ($A['sp_format'] <> 'blankpage') {
+         $spage->set_var('info_separator','hidden');
          $curtime = COM_getUserDateTimeFormat ($A['sp_date']);
          if ($_SP_CONF['show_date'] == 1) {
***************
*** 350,354 ****
          if ($_SP_CONF['show_hits'] == 1) {
              if ($_SP_CONF['show_date'] == 1) {
!                 $hits = "| ";
              }
              $hits = COM_numberFormat ($A['sp_hits']) . ' ' . $LANG_STATIC['hits'];
--- 351,355 ----
          if ($_SP_CONF['show_hits'] == 1) {
              if ($_SP_CONF['show_date'] == 1) {
!                 $spage->set_var('info_separator','visible');
              }
              $hits = COM_numberFormat ($A['sp_hits']) . ' ' . $LANG_STATIC['hits'];