[Fmsystem-commits] [12574]

[Sigurd Nes]

Revision: 12574
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12574
Author:   sigurdne
Date:     2015-01-09 14:12:26 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
    branches/dev-syncromind/property/js/portico/condition_survey_edit.js

Modified: branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php  
2015-01-09 14:10:56 UTC (rev 12573)
+++ branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php  
2015-01-09 14:12:26 UTC (rev 12574)
@@ -111,6 +111,13 @@
                        self::add_javascript('phpgwapi', 'tinybox2', 
'packed.js');
                        
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
 
+                       if(phpgw::get_var('nonavbar'))
+                       {
+                       //      $GLOBALS['phpgw_info']['flags']['nonavbar'] = 
true;
+                               $GLOBALS['phpgw_info']['flags']['noframework'] 
= true;
+                       //      
$GLOBALS['phpgw_info']['flags']['headonly']=true;
+                       }
+
                }
 
                private function get_ui_session_key()

Modified: branches/dev-syncromind/property/js/portico/condition_survey_edit.js
===================================================================
--- branches/dev-syncromind/property/js/portico/condition_survey_edit.js        
2015-01-09 14:10:56 UTC (rev 12573)
+++ branches/dev-syncromind/property/js/portico/condition_survey_edit.js        
2015-01-09 14:12:26 UTC (rev 12574)
@@ -10,7 +10,7 @@
        this.fileuploader = function()
        {
                var requestUrl = phpGWLink('index.php', fileuploader_action);
-               TINY.box.show({iframe:requestUrl, 
boxid:'frameless',width:750,height:450,fixed:false,maskid:'darkmask',maskopacity:40,
 mask:true, animate:true, close: true,closejs:function(){refresh_files()}});
+               TINY.box.show({iframe:requestUrl, 
boxid:'frameless',width:750,height:450,fixed:false,maskid:'darkmask',maskopacity:40,
 mask:true, animate:true, close: true});
        }