[Fmsystem-commits] [11645] bkbooking: stavanger fixed error application

[Kjell Arne Espedal]

Revision: 11645
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11645
Author:   kjell
Date:     2014-01-31 13:18:32 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
bkbooking: stavanger fixed error application

Modified Paths:
--------------
    branches/stavangerkommune/phpgwapi/inc/class.js.inc.php
    branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
    branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl

Modified: branches/stavangerkommune/phpgwapi/inc/class.js.inc.php
===================================================================
--- branches/stavangerkommune/phpgwapi/inc/class.js.inc.php     2014-01-29 
15:41:26 UTC (rev 11644)
+++ branches/stavangerkommune/phpgwapi/inc/class.js.inc.php     2014-01-31 
13:18:32 UTC (rev 11645)
@@ -195,12 +195,16 @@
                        {
                                if ( is_array($actions) && count($actions) )
                                {
-                                       $ret_str .= "window.on{$win_event} = 
function()\n{\n";
+                    if ( $win_event == 'load') {
+                        $ret_str .= "$(document).ready(function()\n{\n";
+                    } else {
+                        $ret_str .= "window.on{$win_event} = function()\n{\n";
+                    }
                                        foreach ( $actions as $action )
                                        {
                                                $ret_str .= "\t$action\n";
                                        }
-                                       $ret_str .= "}\n";
+                                       $ret_str .= "});\n";
                                }
                        }
                        $ret_str .= "\n// end phpGW javascript class imported 
window.on* event handlers\n\n";

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2014-01-29 15:41:26 UTC (rev 11644)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.inc.php 
2014-01-31 13:18:32 UTC (rev 11645)
@@ -78,6 +78,7 @@
                }
        }
 
+    $javascripts[] = "/phpgwapi/js/jquery/js/jquery-1.7.2.min.js";
        $javascripts[] = "/phpgwapi/templates/stavanger/js/minid.js";
 
        foreach ( $javascripts as $javascript )
@@ -202,27 +203,27 @@
        $bouser = CreateObject('bookingfrontend.bouser');
        if($bouser->is_logged_in())
        {
-                               $tpl_vars['organization_json'] = 
json_encode(phpgwapi_cache::session_get($bouser->get_module(), 
$bouser::ORGARRAY_SESSION_KEY));
+               $tpl_vars['organization_json'] = 
json_encode(phpgwapi_cache::session_get($bouser->get_module(), 
$bouser::ORGARRAY_SESSION_KEY));
 
-                               $tpl_vars['change_org_header'] = lang('Change 
organization');
+               $tpl_vars['change_org_header'] = lang('Change organization');
 
-                if ( $bouser->orgname == '000000003') {
-                    $tpl_vars['login_text'] = lang('Error input is not a ssn 
or orgnr'). ' :: ' . lang('Logout');
-                } elseif ( $bouser->orgname == '000000002') {
-                    $tpl_vars['login_text'] = lang('Organization not in the 
database'). ' :: ' . lang('Logout');
-                } elseif ( $bouser->orgname == '000000001') {
-                    $tpl_vars['login_text'] = lang('No organization data'). ' 
:: ' . lang('Logout');
-                } elseif ( $bouser->orgname == '000000000') { 
-                    $tpl_vars['login_text'] = lang('SSN not registred'). ' :: 
' . lang('Logout');
-                } else {
-                       $tpl_vars['login_text'] = $bouser->orgname . ' :: ' . 
lang('Logout');
-                }
-               $tpl_vars['login_url'] = '/logout.php';
+        if ( $bouser->orgname == '000000003') {
+               $tpl_vars['login_text'] = lang('Error input is not a ssn or 
orgnr'). ' :: ' . lang('Logout');
+        } elseif ( $bouser->orgname == '000000002') {
+            $tpl_vars['login_text'] = lang('Organization not in the 
database'). ' :: ' . lang('Logout');
+        } elseif ( $bouser->orgname == '000000001') {
+            $tpl_vars['login_text'] = lang('No organization data'). ' :: ' . 
lang('Logout');
+        } elseif ( $bouser->orgname == '000000000') { 
+            $tpl_vars['login_text'] = lang('SSN not registred'). ' :: ' . 
lang('Logout');
+        } else {
+               $tpl_vars['login_text'] = $bouser->orgname . ' :: ' . 
lang('Logout');
+        }
+               $tpl_vars['login_url'] = 'logout.php';
        }
        else
        {
                $tpl_vars['login_text'] = lang('Login');
-               $tpl_vars['login_url'] = 
'/login.php?after='.urlencode($_SERVER['QUERY_STRING']);
+               $tpl_vars['login_url'] = 
'login.php?after='.urlencode($_SERVER['QUERY_STRING']);
                $config         = 
CreateObject('phpgwapi.config','bookingfrontend');
                $config->read();
                $login_parameter = 
isset($config->config_data['login_parameter']) && 
$config->config_data['login_parameter'] ? 
$config->config_data['login_parameter'] : '';

Modified: branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl     
2014-01-29 15:41:26 UTC (rev 11644)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/head.tpl     
2014-01-31 13:18:32 UTC (rev 11645)
@@ -17,16 +17,16 @@
 
                {css}
 
-               <script type="text/javascript">
-               <!--
-                       var strBaseURL = '{str_base_url}';
-                       {win_on_events}
-               //-->
-               </script>
-               {javascript}
                <!-- BEGIN javascript -->
                        <script type="text/javascript" 
src="{javascript_uri}"></script>
        <!-- END javascript -->
+        {javascript}
+        <script type="text/javascript">
+            <!--
+            var strBaseURL = '{str_base_url}';
+            {win_on_events}
+            //-->
+        </script>
 
        </head>
 <body>