[Fmsystem-commits] [14499] tweaks

[Sigurd Nes]

Revision: 14499
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14499
Author:   sigurdne
Date:     2015-11-28 10:03:06 +0000 (Sat, 28 Nov 2015)
Log Message:
-----------
tweaks

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php
    branches/dev-syncromind/booking/templates/base/metasettings.xsl
    branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
    branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
    branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl

Modified: branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php    
2015-11-28 00:31:24 UTC (rev 14498)
+++ branches/dev-syncromind/booking/inc/class.uimetasettings.inc.php    
2015-11-28 10:03:06 UTC (rev 14499)
@@ -37,4 +37,9 @@
                        $this->use_yui_editor();
                        self::render_template('metasettings', 
array('config_data' =>$config->config_data));
                }
+
+               function query()
+               {
+
+               }
        }

Modified: branches/dev-syncromind/booking/templates/base/metasettings.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/metasettings.xsl     
2015-11-28 00:31:24 UTC (rev 14498)
+++ branches/dev-syncromind/booking/templates/base/metasettings.xsl     
2015-11-28 10:03:06 UTC (rev 14499)
@@ -2,7 +2,6 @@
     <div id="content">
 
     <xsl:call-template name="msgbox"/>
-       <xsl:call-template name="yui_booking_i18n"/>
 
        <dl class="form">
                <dt class="heading"><xsl:value-of select="php:function('lang', 
'Booking system settings')"/></dt>

Modified: branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/js/base.js       
2015-11-28 00:31:24 UTC (rev 14498)
+++ branches/dev-syncromind/phpgwapi/templates/portico/js/base.js       
2015-11-28 10:03:06 UTC (rev 14499)
@@ -42,4 +42,24 @@
                        $('#navbar').jstree('open_all');
                });
 
+               update_content = function(requestUrl)
+               {
+
+                       window.location.href = requestUrl;
+                       return false;
+                       requestUrl += '&phpgw_return_as=stripped_html';
+                       $.ajax({
+                               type: 'GET',
+                               url: requestUrl,
+                               success: function (data) {
+                                       if (data != null)
+                                       {
+                                               $("#center_content").html(data);
+                                       }
+                               }
+                       });
+
+               }
+
+
        });
\ No newline at end of file

Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php   
2015-11-28 00:31:24 UTC (rev 14498)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php   
2015-11-28 10:03:06 UTC (rev 14499)
@@ -208,7 +208,8 @@
                                //              var treeInst = 
$('#treeDiv1').jstree(true);
                                //              treeInst.save_state();
                                                setTimeout(function() {
-                                                       window.location.href = 
data.node.a_attr.href;
+                                                       
update_content(data.node.a_attr.href);
+                                                       //window.location.href 
= data.node.a_attr.href;
                                                }, 100);
 
                                        });

Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl       
2015-11-28 00:31:24 UTC (rev 14498)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl       
2015-11-28 10:03:06 UTC (rev 14499)
@@ -64,6 +64,6 @@
                                </div>
                        </div>
 
-                       <div class="ui-layout-center content">
+                       <div id="center_content" class="ui-layout-center 
content">
                                <h1 id="top">{current_app_title}</h1>