Mostly minor changes. Fixed user level detection for displaying app menus.

diff --git a/application/libraries/Core.php b/application/libraries/Core.php
index 862a37d16596f692d0c49bb9c88cb9bc704362e4..0d3cc119fa201c2094dbfda4f4ef62b7df13c3ce 100644 (file)
--- a/application/libraries/Core.php
+++ b/application/libraries/Core.php
@@ -18,7 +18,7 @@ class Core {
                $menu = array();
 
                $ulev = $this->CI->user->level();
-               if ($ulev == 'operator') $chklevel = "a.access = 'user' OR a.access = 'manager'";
+               if ($ulev == 'operator') $chklevel = "a.access = 'user' OR a.access = 'operator'";
                elseif ($ulev == 'manager') $chklevel = "1"; // full access -> always true
                else $chklevel = "a.access = 'user'"; // fallback
 
@@ -56,15 +56,16 @@ class Core {
                                        <div class="control-group">
                                                <label class="control-label" for="inputUsername">Username</label>
                                                <div class="controls">
-                                                       <input type="text" id="inputUsername" placeholder="Username">
+                                                       <input type="text" id="inputUsername" placeholder="Username" tabindex="1">
                                                </div>
                                        </div>
                                        <div class="control-group">
                                                <label class="control-label" for="inputPassword">Password</label>
                                                <div class="controls">
-                                                       <input type="password" id="inputPassword" placeholder="Password">
+                                                       <input type="password" id="inputPassword" placeholder="Password" tabindex="2">
                                                </div>
                                        </div>
+<!--
                                        <div class="control-group">
                                                <div class="controls">
                                                        <label class="checkbox">
@@ -72,9 +73,10 @@ class Core {
                                                        </label>
                                                </div>
                                        </div>
+-->
                                </div>
                                <div class="modal-footer">
-                                       <button type="submit" class="btn btn-primary">Login</button>
+                                       <button type="submit" class="btn btn-primary" tabindex="3">Login</button>
                                </div>
                        </form>
                </div>';

diff --git a/public/js/application.js b/public/js/application.js
index 7708e75010246a82081d221b096781be28f9e6b8..5195983917d63a69485dee9c884c6bc960db7bd8 100644 (file)
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -52,11 +52,11 @@ var wos
                                if (resp.success) {
                                        navStr = '<ul class="nav">';
                                        $.each(resp.contents, function(key, val) {
-                                               openStr = '<li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#">'+key+' <b class="caret"></b></a><ul class="dropdown-menu">';
+                                               openStr = '<li class="dropdown"><a tabindex="-1" class="dropdown-toggle" data-toggle="dropdown" href="#">'+key+' <b class="caret"></b></a><ul class="dropdown-menu">';
                                                innerStr = '';
                                                closeStr = '</ul></li>';
                                                $.each(val, function(ikey, ival) {
-                                                       innerStr += '<li><a href=\''+ival+'\'>'+ikey+'</a></li>';
+                                                       innerStr += '<li><a tabindex="-1" href=\''+ival+'\'>'+ikey+'</a></li>';
                                                });
                                                navStr += openStr+innerStr+closeStr;
                                        });