From: John Runyon <redacted>
Date: Tue, 23 Oct 2012 02:12:16 +0000 (+0300)
Subject: Mostly minor changes. Fixed user level detection for displaying app menus.
X-Git-Url: https://jfr.im/git/z_archive/KronOS.git/commitdiff_plain/7b1c4752b856a3a62673693e4607033d8c4e8b90

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

diff --git a/application/libraries/Core.php b/application/libraries/Core.php
index 862a37d..0d3cc11 100644
--- 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 7708e75..5195983 100644
--- 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;
 					});