[Phpgroupware-cvs] [21200] Fix: minor fix 4746:5203

[Sigurd Nes]

Revision: 21200
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=21200
Author:   sigurdne
Date:     2010-04-14 19:31:46 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
Fix: minor fix 4746:5203

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/templates/idots/head.inc.php
    people/sigurdne/modules/phpgwapi/trunk/templates/portico/head.inc.php
    people/sigurdne/modules/phpgwapi/trunk/templates/portico/js/base.js
    people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/idots/head.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/idots/head.inc.php 
2010-04-14 19:31:17 UTC (rev 21199)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/idots/head.inc.php 
2010-04-14 19:31:46 UTC (rev 21200)
@@ -28,9 +28,11 @@
                
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] = 'idots';
        }
 
+
        $stylesheets = array();
        if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
        {
+
                $stylesheets = array
        (
                '/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css',
@@ -39,6 +41,8 @@
        );
        }
 
+       phpgwapi_yui::load_widget('button');
+
        $stylesheets[] = '/phpgwapi/templates/base/css/base.css';
        $stylesheets[] = '/phpgwapi/templates/idots/css/base.css';
        $stylesheets[] = 
"/phpgwapi/templates/idots/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/portico/head.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/portico/head.inc.php       
2010-04-14 19:31:17 UTC (rev 21199)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/portico/head.inc.php       
2010-04-14 19:31:46 UTC (rev 21200)
@@ -25,13 +25,13 @@
        phpgwapi_yui::load_widget('resize');
        $javascripts = array
        (
-               "/phpgwapi/js/json/json.js",
-               "/phpgwapi/templates/portico/js/base.js"
+               "/phpgwapi/js/json/json.js"
        );
 
        if( !isset($GLOBALS['phpgw_info']['flags']['noframework']) )
        {
                phpgwapi_yui::load_widget('layout');
+               $javascripts[] = "/phpgwapi/templates/portico/js/base.js";
        }
 
        phpgwapi_yui::load_widget('button');

Modified: people/sigurdne/modules/phpgwapi/trunk/templates/portico/js/base.js
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/portico/js/base.js 
2010-04-14 19:31:17 UTC (rev 21199)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/portico/js/base.js 
2010-04-14 19:31:46 UTC (rev 21200)
@@ -139,7 +139,14 @@
 
 YAHOO.PORTICO.BorderLayout = function()
 {
-       this.config = border_layout_config.length == 0 ? {} : 
border_layout_config;
+       if(border_layout_config)
+       {
+               this.config = border_layout_config.length == 0 ? {} : 
border_layout_config;
+       }
+       else
+       {
+               this.config = {};
+       }
 
        var self = this;
 

Modified: 
people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php     
2010-04-14 19:31:17 UTC (rev 21199)
+++ people/sigurdne/modules/phpgwapi/trunk/templates/portico/navbar.inc.php     
2010-04-14 19:31:46 UTC (rev 21200)
@@ -62,7 +62,8 @@
                        $var['debug_url'] = "javascript:openwindow('"
                         . $GLOBALS['phpgw']->link('/index.php', array
                         (
-                               'menuaction'=> 'property.uidebug_json.index'
+                               'menuaction'=> 'property.uidebug_json.index',
+                               'app'           => 
$GLOBALS['phpgw_info']['flags']['currentapp']
                         )) . "','','')";
 
                        $var['debug_text'] = lang('debug');



_______________________________________________
phpGroupWare-cvs mailing list
phpGroupWare-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs