[Phpgroupware-cvs] phpgwapi/templates/idots navbar.inc.php navbar.tpl

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Dave Hall <address@hidden>      06/04/10 02:17:16

Modified files:
        templates/idots: navbar.inc.php navbar.tpl 

Log message:
        yet more little fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/navbar.inc.php.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/templates/idots/navbar.tpl.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: phpgwapi/templates/idots/navbar.inc.php
diff -u phpgwapi/templates/idots/navbar.inc.php:1.8 
phpgwapi/templates/idots/navbar.inc.php:1.9
--- phpgwapi/templates/idots/navbar.inc.php:1.8 Sun Apr  9 00:00:27 2006
+++ phpgwapi/templates/idots/navbar.inc.php     Mon Apr 10 02:17:16 2006
@@ -5,7 +5,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: navbar.inc.php,v 1.8 2006/04/09 00:00:27 skwashd Exp $
+       * @version $Id: navbar.inc.php,v 1.9 2006/04/10 02:17:16 skwashd Exp $
        */
 
 
@@ -126,14 +126,15 @@
                $GLOBALS['phpgw']->template->pparse('out','navbar_footer');
 
                // If the application has a header include, we now include it
-               if (address@hidden'phpgw_info']['flags']['noappheader'] && 
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
+               if (address@hidden'phpgw_info']['flags']['noappheader'] && 
@isset($_GET['menuaction']))
                {
-                       list($app,$class,$method) = 
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
+                       list($app,$class,$method) = 
explode('.',$_GET['menuaction']);
                        if (is_array($GLOBALS[$class]->public_functions) && 
$GLOBALS[$class]->public_functions['header'])
                        {
                                $GLOBALS[$class]->header();
                        }
                }
+               $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
                $GLOBALS['phpgw']->hooks->process('after_navbar');
                return;
        }
@@ -184,7 +185,7 @@
                {
                        $GLOBALS['phpgw']->template->set_var(array
                        (
-                               'list_style_image'      => ($item_image ? 
$item_image : 'none'),
+                               'list_style_image'      => ($item_image ? 
"url('{$item_image}')" : 'none'),
                                'lang_item'             => ($use_lang ? 
lang($item_text) : $item_text),
                                'item_link'             => $item_link
                        ));
Index: phpgwapi/templates/idots/navbar.tpl
diff -u phpgwapi/templates/idots/navbar.tpl:1.8 
phpgwapi/templates/idots/navbar.tpl:1.9
--- phpgwapi/templates/idots/navbar.tpl:1.8     Sun Apr  9 01:24:34 2006
+++ phpgwapi/templates/idots/navbar.tpl Mon Apr 10 02:17:16 2006
@@ -41,7 +41,7 @@
 <!-- END extra_blocks_footer -->
 
 <!-- BEGIN extra_block_row -->
-                               <li style="list-style-image: 
url('{list_style_image}');"><a href="{item_link}">{lang_item}</a></li>
+                               <li style="list-style-image: 
{list_style_image};"><a href="{item_link}">{lang_item}</a></li>
 <!-- END extra_block_row -->
 
 <!-- BEGIN extra_block_spacer -->