[Fmsystem-commits] [10919] controller: add jquery

[Sigurd Nes]

Revision: 10919
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10919
Author:   sigurdne
Date:     2013-02-18 14:47:02 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
controller: add jquery

Modified Paths:
--------------
    trunk/controller/inc/class.hook_helper.inc.php
    trunk/home.php
    trunk/mobilefrontend/home.php

Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php      2013-02-18 13:45:59 UTC 
(rev 10918)
+++ trunk/controller/inc/class.hook_helper.inc.php      2013-02-18 14:47:02 UTC 
(rev 10919)
@@ -111,7 +111,8 @@
                        $styling .= "\n".'<!-- END checklist info -->'."\n";
                        echo $styling;
 
-                       echo "<script 
src='phpgwapi/js/jquery/js/jquery-1.7.2.min.js'></script>";
+                       //Loaded from home.php
+                       //echo "<script 
src='phpgwapi/js/jquery/js/jquery-1.7.2.min.js'></script>";
 
                        $script = "<script>";
                        $script .= "$(document).ready(function(){";

Modified: trunk/home.php
===================================================================
--- trunk/home.php      2013-02-18 13:45:59 UTC (rev 10918)
+++ trunk/home.php      2013-02-18 14:47:02 UTC (rev 10919)
@@ -63,6 +63,8 @@
        }
        else
        {
+               phpgw::import_class('phpgwapi.jquery');
+               phpgwapi_jquery::load_widget('core');
                $GLOBALS['phpgw']->common->phpgw_header();
                echo parse_navbar();
        }

Modified: trunk/mobilefrontend/home.php
===================================================================
--- trunk/mobilefrontend/home.php       2013-02-18 13:45:59 UTC (rev 10918)
+++ trunk/mobilefrontend/home.php       2013-02-18 14:47:02 UTC (rev 10919)
@@ -68,6 +68,9 @@
        }
        else */
        {
+
+               phpgw::import_class('phpgwapi.jquery');
+               phpgwapi_jquery::load_widget('core');
                $GLOBALS['phpgw']->common->phpgw_header();
                echo parse_navbar();
        }