[Phpgroupware-cvs] phpgwapi inc/class.xslttemplates.inc.php templa...

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/28 12:48:08

Modified files:
        inc            : class.xslttemplates.inc.php 
        templates/idots: head.inc.php 
        templates/verdilak: head.inc.php 

Log message:
        make noframework with xslt apps act like nonavbar for phplib did in 16, 
although i think this is wrong and is broken logic

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xslttemplates.inc.php?cvsroot=phpgwapi&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/idots/head.inc.php?cvsroot=phpgwapi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/verdilak/head.inc.php?cvsroot=phpgwapi&r1=1.22&r2=1.23

Patches:
Index: inc/class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- inc/class.xslttemplates.inc.php     26 Sep 2006 12:39:17 -0000      1.33
+++ inc/class.xslttemplates.inc.php     28 Sep 2006 12:48:08 -0000      1.34
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.xslttemplates.inc.php,v 1.33 2006/09/26 12:39:17 
skwashd Exp $
+       * @version $Id: class.xslttemplates.inc.php,v 1.34 2006/09/28 12:48:08 
skwashd Exp $
        */
 
        if( (floor(phpversion()) == 4 && !extension_loaded('xslt') )
@@ -275,13 +275,12 @@
 
                function parse($parsexsl = True, $parsexml = True)
                {
-                       $output_header = 
!(isset($GLOBALS['phpgw_info']['flags']['nonavbar']) && 
$GLOBALS['phpgw_info']['flags']['nonavbar']);
+                       $output_header = 
!(isset($GLOBALS['phpgw_info']['flags']['noframework']) && 
$GLOBALS['phpgw_info']['flags']['noframework']);
                        
                        // Determine whether the browser is wml-capable or not
                        $wml_out = execMethod('phpgwapi.browser.is_mobile');
                        
-                       if( 
!(isset($GLOBALS['phpgw_info']['flags']['noframework']) && 
!$GLOBALS['phpgw_info']['flags']['noframework']) 
-                               || !$wml_out)
+                       if ( !$wml_out )
                        {
                                
$GLOBALS['phpgw']->common->phpgw_header($output_header);
                        }

Index: templates/idots/head.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/idots/head.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- templates/idots/head.inc.php        6 Aug 2006 04:51:27 -0000       1.13
+++ templates/idots/head.inc.php        28 Sep 2006 12:48:08 -0000      1.14
@@ -19,8 +19,8 @@
        $GLOBALS['phpgw']->template->set_block('head', 'theme_stylesheet', 
'theme_stylesheets');
 
        $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
-       if ( ! (isset($GLOBALS['phpgw_info']['flags']['noframework']) && 
$GLOBALS['phpgw_info']['flags']['noframework']) )
-       {
+
+       $theme_styles[] = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/idots/css/base.css";
                if(file_exists(PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/idots/css/' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
                {
                        $theme_styles[] = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/idots/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
@@ -60,10 +60,10 @@
                        'javascript'    => 
$GLOBALS['phpgw']->common->get_javascript(),
                        'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
                        'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
-                       'str_base_url'  => $GLOBALS['phpgw']->link('/'),        
        
+               'str_base_url'  => $GLOBALS['phpgw']->link('/', array(), true), 
        
                        'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                        'win_on_events' => 
$GLOBALS['phpgw']->common->get_on_events(),
                ));
-       }
+
        $GLOBALS['phpgw']->template->pfp('out','head');
 ?>

Index: templates/verdilak/head.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/verdilak/head.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- templates/verdilak/head.inc.php     19 Sep 2006 13:23:45 -0000      1.22
+++ templates/verdilak/head.inc.php     28 Sep 2006 12:48:08 -0000      1.23
@@ -5,7 +5,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: head.inc.php,v 1.22 2006/09/19 13:23:45 skwashd Exp $
+       * @version $Id: head.inc.php,v 1.23 2006/09/28 12:48:08 skwashd Exp $
        */
        
        if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
@@ -19,8 +19,7 @@
        $GLOBALS['phpgw']->template->set_block('head', 'theme_stylesheet', 
'theme_stylesheets');
 
        $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
-       if ( ! (isset($GLOBALS['phpgw_info']['flags']['noframework']) && 
$GLOBALS['phpgw_info']['flags']['noframework']) )
-       {
+
                $theme_styles[] = 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/verdilak/css/base.css";
                if(file_exists(PHPGW_SERVER_ROOT . 
'/phpgwapi/templates/verdilak/css/' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css'))
                {
@@ -65,7 +64,7 @@
                        'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
                        'win_on_events' => 
$GLOBALS['phpgw']->common->get_on_events(),
                ));
-       }
+
        $GLOBALS['phpgw']->template->pfp('out','head');
 ?>