Author: jfthomps
Date: Fri Nov 18 18:20:37 2016
New Revision: 1770419
URL: http://svn.apache.org/viewvc?rev=1770419&view=rev
Log:
This commit is for a bunch of small changes, a good chunck of which are simply
layout related.
authentication.php: modified printLoginPage: added link to select a different
authentication method (useful for users who accidentally selected to save the
wrong one)
dashboard.php: modified getNewReservationData: added states 16 and 24 (image
and checkpoint) to query getting active reservation data
groups.php:
-modified viewGroups: changed pixel width of edit column in user and resource
group tables from 38px to 43px
-modified editOrAddGroup: changed max allowed length of name field from 30 to
60 characters
-modified processGroupInput: changed checks for name fields to allow up to 60
characters
privileges.php: modified userLookup: added closing table tag to "Server
Reservations User Can Use" section
requests.php: modified viewRequests: changed width of detailed reservation
status pane from 350px to 380px
resource.php: modified viewResources: changed pixel based width of name column
from 38px to 43px
siteconfig.php: modified AJvalidateMessagesPoll: removed query from JSON
returned if there were invalids - this was just for debugging while writing the
code
statistics.php: modified viewStatistics: added <br> after table containing
unique user counts
utils.php:
-modified checkAccess: added several calls to addLoginLog for failed
authentication during XMLRPC calls
-modified abort: added error_log to insert a separator so different errors can
more easily be distinguished in the php error log
-modified isAvailable: added extra debugging information when $debug is true -
number of mapped computers and number of computers available to the user
-modified prettyDatetime: added argument to prevent applying the timezone offset
-modified getDojoHTML: changed name of oneclick dojo filename from oneclick.js
to vclgos.js; changed check for session being initialized from calling
session_status (required fairly recent php version) to calling
isset($_SESSION['persistdata'])
xmlrpcWrappers.php: modified XMLRPCgetImages: added ostype to data retured for
each image
vcl.css:
-added .logincol
-added .logincell
privileges.js: modified updateNodeLabels: set value of newNodeName to nodename
resources/computer.js:
-modified initPage: changed width of first column from 18px to 21px
-modified buildExtraFilters: changed width of first column from 18px to 21px;
added fetchProperties to comboboxes to sort on value
-modified saveResourceCB: added resourcegrid.store.setValue for imagerevision
resources.js: modified Resource.prototype.updateFieldCookie: added expires to
each dojo.cookie call so that the cookies will be persistant instead of session
cookies
themes/dropdownmenus/page.php: moved userLookup from Manage to Reporting,
changed reporting items to be handled by a foreach loop instead of having them
all inline
Modified:
vcl/trunk/web/.ht-inc/authentication.php
vcl/trunk/web/.ht-inc/dashboard.php
vcl/trunk/web/.ht-inc/groups.php
vcl/trunk/web/.ht-inc/privileges.php
vcl/trunk/web/.ht-inc/requests.php
vcl/trunk/web/.ht-inc/resource.php
vcl/trunk/web/.ht-inc/siteconfig.php
vcl/trunk/web/.ht-inc/statistics.php
vcl/trunk/web/.ht-inc/utils.php
vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
vcl/trunk/web/css/vcl.css
vcl/trunk/web/js/privileges.js
vcl/trunk/web/js/resources.js
vcl/trunk/web/js/resources/computer.js
vcl/trunk/web/themes/dropdownmenus/page.php
Modified: vcl/trunk/web/.ht-inc/authentication.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/authentication.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/authentication.php (original)
+++ vcl/trunk/web/.ht-inc/authentication.php Fri Nov 18 18:20:37 2016
@@ -299,6 +299,11 @@ function printLoginPage($servertimeout=0
print " <TR>\n";
print " <TD colspan=2 align=right><INPUT type=submit value=\"" .
i("Login") . "\"></TD>\n";
print " </TR>\n";
+ print " <TR>\n";
+ print " <TD colspan=2 align=center><br><br><small>";
+ print "<a href=\"" . BASEURL . SCRIPT .
"?mode=selectauth&clearselection=1\">";
+ print i("Select a different authentication method") .
"</a></small></TD>\n";
+ print " </TR>\n";
print "</TABLE>\n";
print "<input type=\"hidden\" name=\"mode\" value=\"submitLogin\">\n";
print "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\">\n";
Modified: vcl/trunk/web/.ht-inc/dashboard.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/dashboard.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/dashboard.php (original)
+++ vcl/trunk/web/.ht-inc/dashboard.php Fri Nov 18 18:20:37 2016
@@ -692,8 +692,8 @@ function getNewReservationData() {
. "LEFT JOIN user u ON (u.id = rq.userid) "
. "LEFT JOIN user u2 ON (u2.id = c.ownerid) "
. "LEFT JOIN affiliation af ON (af.id = u.affiliationid) "
- . "WHERE ((rq.stateid IN (6, 13, 19) AND rq.start < NOW()) OR "
- . "(rq.stateid = 14 AND rq.laststateid IN (6, 13, 16, 19)
AND "
+ . "WHERE ((rq.stateid IN (6, 13, 16, 19, 24) AND rq.start <
NOW()) OR "
+ . "(rq.stateid = 14 AND rq.laststateid IN (6, 13, 16, 19,
24) AND "
. "rq.start < DATE_ADD(NOW(), INTERVAL 1 HOUR)))
";
if($affilid)
$query .= "AND (u.affiliationid = $affilid OR u2.affiliationid
= $affilid) ";
Modified: vcl/trunk/web/.ht-inc/groups.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/groups.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/groups.php (original)
+++ vcl/trunk/web/.ht-inc/groups.php Fri Nov 18 18:20:37 2016
@@ -142,7 +142,7 @@ function viewGroups() {
if(preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']) ||
preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']) ||
preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']))
- $w = array('54px', '38px', '200px', '142px', '65px', '142px',
'59px', '58px', '63px', '73px');
+ $w = array('54px', '43px', '200px', '142px', '65px', '142px',
'59px', '58px', '63px', '73px');
else
$w = array('4.8em', '3.5em', '17em', '12em', '5em', '12em',
'5em', '5em', '5.6em', '6.3em');
print "<th field=\"id\" width=\"{$w[0]}\"
formatter=\"fmtUserGroupDeleteBtn\"> </th>\n";
@@ -261,7 +261,7 @@ function viewGroups() {
if(preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']) ||
preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']) ||
preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']))
- $w = array('54px', '38px', '108px', '240px', '250px', '24px');
+ $w = array('54px', '43px', '108px', '240px', '250px', '24px');
else
$w = array('4.5em', '3.5em', '9em', '20em', '21em', '1.6em');
@@ -700,7 +700,7 @@ function editOrAddGroup($state) {
print " <TR>\n";
print " <TH align=right>Name:</TH>\n";
print " <TD><INPUT type=text name=name
value=\"{$data['name']}\" ";
- print "maxlength=30>";
+ print "maxlength=60 size=60>";
if($data['type'] == 'user' && $selectAffil) {
print "@";
printSelectInput('affiliationid', $affils,
$data['affiliationid']);
@@ -1009,16 +1009,16 @@ function processGroupInput($checks=1) {
if($return['custom'] == 1 && $return['courseroll'] == 0 && $editname) {
if($return['type'] == 'user' &&
- ! preg_match('/^[-a-zA-Z0-9_\.: ]{3,30}$/',
$return["name"])) {
+ ! preg_match('/^[-a-zA-Z0-9_\.: ]{3,60}$/',
$return["name"])) {
$submitErr |= GRPNAMEERR;
- $submitErrMsg[GRPNAMEERR] = "Name must be between 3 and
30 characters "
+ $submitErrMsg[GRPNAMEERR] = "Name must be between 3 and
60 characters "
. "and can only contain
letters, numbers, "
. "spaces, and these
characters: - . _ :";
}
elseif($return['type'] == 'resource' &&
- ! preg_match('/^[-a-zA-Z0-9_\. ]{3,30}$/', $return["name"]))
{
+ ! preg_match('/^[-a-zA-Z0-9_\. ]{3,60}$/', $return["name"]))
{
$submitErr |= GRPNAMEERR;
- $submitErrMsg[GRPNAMEERR] = "Name must be between 3 and
30 characters "
+ $submitErrMsg[GRPNAMEERR] = "Name must be between 3 and
60 characters "
. "and can only contain
letters, numbers, "
. "spaces, and these
characters: - . _";
}
Modified: vcl/trunk/web/.ht-inc/privileges.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/privileges.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/privileges.php (original)
+++ vcl/trunk/web/.ht-inc/privileges.php Fri Nov 18 18:20:37 2016
@@ -1843,6 +1843,7 @@ function userLookup() {
print "
<td>{$req['managementnode']}</td>\n";
print " </tr>\n";
}
+ print "</table>\n";
}
}
}
Modified: vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Fri Nov 18 18:20:37 2016
@@ -542,7 +542,7 @@ function viewRequests() {
$text .= " resizable=true\n";
$text .= " closable=true\n";
$text .= " title=\"" . i("Detailed Reservation Status") .
"\"\n";
- $text .= " style=\"width: 350px; ";
+ $text .= " style=\"width: 380px; ";
$text .= "height: 300px; ";
$text .= "position: absolute; ";
$text .= "left: 0px; ";
Modified: vcl/trunk/web/.ht-inc/resource.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/resource.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/resource.php (original)
+++ vcl/trunk/web/.ht-inc/resource.php Fri Nov 18 18:20:37 2016
@@ -311,7 +311,7 @@ class Resource {
if(preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']) ||
preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']) ||
preg_match('/Edge/i', $_SERVER['HTTP_USER_AGENT']))
- $w = array('64px', '38px', '200px');
+ $w = array('64px', '43px', '200px');
else
$w = array('5em', '3.5em', '17em');
$h .= "<th field=\"id\" id=\"delcolth\" width=\"{$w[0]}\"
formatter=\"resource.DeleteBtn\" styles=\"text-align: center;\"> </th>\n";
Modified: vcl/trunk/web/.ht-inc/siteconfig.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/siteconfig.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/siteconfig.php (original)
+++ vcl/trunk/web/.ht-inc/siteconfig.php Fri Nov 18 18:20:37 2016
@@ -2598,7 +2598,7 @@ class Messages {
}
}
if(count($invalids)) {
- sendJSON(array('status' => 'invalid', 'values' =>
$invalids, 'query' => $query));
+ sendJSON(array('status' => 'invalid', 'values' =>
$invalids));
return;
}
sendJSON(array('status' => 'valid'));
Modified: vcl/trunk/web/.ht-inc/statistics.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/statistics.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/statistics.php (original)
+++ vcl/trunk/web/.ht-inc/statistics.php Fri Nov 18 18:20:37 2016
@@ -439,6 +439,7 @@ function viewStatistics() {
print " </TR>\n";
}
print "</TABLE>\n";
+ print "<br>\n";
print "<TABLE>\n";
print " <TR>\n";
Modified: vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Fri Nov 18 18:20:37 2016
@@ -371,6 +371,7 @@ function checkAccess() {
}
}
if(! array_key_exists('HTTP_X_PASS', $_SERVER) ||
strlen($_SERVER['HTTP_X_PASS']) == 0) {
+ addLoginLog($xmluser, 'unknown', $user['affilid'], 0);
printXMLRPCerror(3); # access denied
dbDisconnect();
exit;
@@ -380,6 +381,7 @@ function checkAccess() {
$xmlpass = stripslashes($xmlpass);
$apiver = processInputData($_SERVER['HTTP_X_APIVERSION'],
ARG_NUMERIC, 1);
if($apiver == 1) {
+ addLoginLog($xmluser, 'unknown', $user['affilid'], 0);
printXMLRPCerror(8); # unsupported API version
dbDisconnect();
exit;
@@ -394,6 +396,7 @@ function checkAccess() {
}
if(empty($authtype)) {
print "No authentication mechanism found for
passed in X-User";
+ addLoginLog($xmluser, 'unknown',
$user['affilid'], 0);
dbDisconnect();
exit;
}
@@ -401,6 +404,7 @@ function checkAccess() {
$auth = $authMechs[$authtype];
$ds =
ldap_connect("ldaps://{$auth['server']}/");
if(! $ds) {
+ addLoginLog($xmluser, $authtype,
$user['affilid'], 0);
printXMLRPCerror(5); # failed to
connect to auth server
dbDisconnect();
exit;
@@ -889,6 +893,7 @@ function abort($errcode, $query="") {
error_log($query);
}
print "ERROR($errcode): " . $ERRORS["$errcode"] . "<BR>\n";
+
error_log("===========================================================================");
error_log("ERROR($errcode): " . $ERRORS["$errcode"]);
$backtrace = getBacktraceString(FALSE);
print "<pre>\n";
@@ -4060,6 +4065,7 @@ function isAvailable($images, $imageid,
$requestInfo["imageid"] = $imageid;
$requestInfo["ipwarning"] = 0;
$allocatedcompids = array(0);
+ $debug = getContinuationVar('debug', 0);
if(! is_array($imagerevisionid))
$imagerevisionid = array($imageid => array($imagerevisionid));
@@ -4220,6 +4226,10 @@ function isAvailable($images, $imageid,
return debugIsAvailable(0, 6, $start, $end,
$imagerevisionid);
}
$mappedcomputers = implode(',', $compids);
+ if($debug) {
+ $cnt = count($compids);
+ print "console.log('mapped computers: $cnt');";
+ }
// if $ip specified, only look at computers under management
nodes that can
# handle that network
@@ -4295,6 +4305,10 @@ function isAvailable($images, $imageid,
array("available"), 0, 0, $userid);
$usercomputers = implode("','",
array_keys($resources["computer"]));
$usercomputers = "'$usercomputers'";
+ if($debug) {
+ $cnt = count($resources['computer']);
+ print "console.log('computers available
to user: $cnt');";
+ }
}
$alloccompids = implode(",", $allocatedcompids);
@@ -9391,10 +9405,12 @@ function printArray($array) {
////////////////////////////////////////////////////////////////////////////////
///
-/// \fn prettyDatetime($stamp, $showyear=0)
+/// \fn prettyDatetime($stamp, $showyear=0, $notzoffset=0)
///
/// \param $stamp - a timestamp in unix or mysql datetime format
/// \param $showyear (optional, default=0) - set to 1 to include year
+/// \param $notzoffset (optional, default=0) - set to 1 to prevent timezone
+/// conversion
///
/// \return date/time in html format of [Day of week], [month] [day of month],
/// [HH:MM] [am/pm]
@@ -9402,11 +9418,11 @@ function printArray($array) {
/// \brief reformats the datetime to look better
///
////////////////////////////////////////////////////////////////////////////////
-function prettyDatetime($stamp, $showyear=0) {
+function prettyDatetime($stamp, $showyear=0, $notzoffset=0) {
global $locale;
if(! preg_match('/^[\d]+$/', $stamp))
$stamp = datetimeToUnix($stamp);
- if(array_key_exists('tzoffset', $_SESSION['persistdata']))
+ if(! $notzoffset && array_key_exists('tzoffset',
$_SESSION['persistdata']))
$stamp += $_SESSION['persistdata']['tzoffset'] * 60;
if($showyear)
$return = strftime('%A, %b %-d, %Y, %l:%M %P',
$stamp);
@@ -13191,7 +13207,7 @@ function getDojoHTML($refresh) {
case 'submitOneClick':
case 'submitEditOneClick':
case 'deleteOneClick':
- $filename = 'oneclick.js';
+ $filename = 'vclgos.js';
$dojoRequires = array('dojo.parser',
'dijit.layout.ContentPane',
'dijit.form.ValidationTextBox',
@@ -13217,7 +13233,7 @@ function getDojoHTML($refresh) {
$rt = '';
$jslocale = strtolower(str_replace('_', '-', $locale));
$rt .= "<script type=\"text/javascript\">\n";
- if(session_status() === PHP_SESSION_ACTIVE &&
array_key_exists('tzoffset', $_SESSION['persistdata']))
+ if(isset($_SESSION['persistdata']) && array_key_exists('tzoffset',
$_SESSION['persistdata']))
$rt .= " var tzoffset =
{$_SESSION['persistdata']['tzoffset']};\n";
else
$rt .= " var tzoffset = 'unset';\n";
Modified: vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/xmlrpcWrappers.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/xmlrpcWrappers.php (original)
+++ vcl/trunk/web/.ht-inc/xmlrpcWrappers.php Fri Nov 18 18:20:37 2016
@@ -121,12 +121,14 @@ function XMLRPCgetImages() {
$resources = getUserResources(array("imageAdmin", "imageCheckOut"));
$resources["image"] = removeNoCheckout($resources["image"]);
$return = array();
+ $images = getImages();
foreach($resources['image'] as $key => $val) {
$notes = getImageNotes($key);
$tmp = array('id' => $key,
'name' => $val,
'description' => $notes['description'],
- 'usage' => $notes['usage']);
+ 'usage' => $notes['usage'],
+ 'ostype' => $images[$key]['ostype']);
array_push($return, $tmp);
}
return $return;
Modified: vcl/trunk/web/css/vcl.css
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/css/vcl.css?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/css/vcl.css (original)
+++ vcl/trunk/web/css/vcl.css Fri Nov 18 18:20:37 2016
@@ -613,6 +613,16 @@ body {
margin-left: 10.5em;
}
+.logincol {
+ border-right: 1px solid #000000;
+}
+
+.logincell {
+ padding-right: 5px;
+ padding-left: 5px;
+ text-align: center;
+}
+
#configvariables {
border: 1px solid black;
margin: 3px;
Modified: vcl/trunk/web/js/privileges.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/privileges.js?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/js/privileges.js (original)
+++ vcl/trunk/web/js/privileges.js Fri Nov 18 18:20:37 2016
@@ -73,6 +73,7 @@ function updateNodeLabels(nodename) {
dojo.byId('addChildNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
dojo.byId('deleteNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
dojo.byId('renameNodeName').innerHTML = 'Node: <strong>' + nodename +
'</strong>';
+ dijit.byId('newNodeName').set('value', nodename);
}
function isChildFocused(focusid, nodes) {
Modified: vcl/trunk/web/js/resources.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/resources.js?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/js/resources.js (original)
+++ vcl/trunk/web/js/resources.js Fri Nov 18 18:20:37 2016
@@ -136,9 +136,9 @@ Resource.prototype.updateFieldCookie = f
var data = dojo.cookie(this.restype + 'selfields');
if(typeof data === 'undefined') {
if(selected)
- dojo.cookie(this.restype + 'selfields', field + ':1');
+ dojo.cookie(this.restype + 'selfields', field + ':1',
{expires: 365});
else
- dojo.cookie(this.restype + 'selfields', field + ':0');
+ dojo.cookie(this.restype + 'selfields', field + ':0',
{expires: 365});
}
else {
var items = data.split('|');
@@ -159,7 +159,7 @@ Resource.prototype.updateFieldCookie = f
items.push(field + ':0');
}
data = items.join('|');
- dojo.cookie(this.restype + 'selfields', data);
+ dojo.cookie(this.restype + 'selfields', data, {expires: 365});
}
}
Modified: vcl/trunk/web/js/resources/computer.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/resources/computer.js?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/js/resources/computer.js (original)
+++ vcl/trunk/web/js/resources/computer.js Fri Nov 18 18:20:37 2016
@@ -260,7 +260,7 @@ function initPage() {
buildExtraFilters();
// set width of first column
- resourcegrid.setCellWidth(0, '18px');
+ resourcegrid.setCellWidth(0, '21px');
resourcegrid.layout.cells[0].view.update();
// connect selection
@@ -365,7 +365,7 @@ function buildExtraFilters() {
litem['name'] = cells[i].name;
litem['hidden'] = cells[i].hidden;
if(i == 0)
- litem['width'] = '18px';
+ litem['width'] = '21px';
else if(typeof cells[i].width != 'undefined')
litem['width'] = cells[i].width;
litem['editable'] = false;
@@ -408,7 +408,8 @@ function buildExtraFilters() {
autoComplete: false,
labelFunc: cbformatter,
labelType: 'html',
- searchAttr: 'value'
+ searchAttr: 'value',
+ fetchProperties: {sort:
[{attribute:"value"}]}
});
if(typeof item.width != 'undefined') {
if(item.width.match(/px/))
@@ -923,6 +924,7 @@ function saveResourceCB(data, ioArgs) {
resourcegrid.store.setValue(item,
'platform', data.items.data.platform);
resourcegrid.store.setValue(item,
'schedule', data.items.data.schedule);
resourcegrid.store.setValue(item,
'currentimg', data.items.data.currentimg);
+ resourcegrid.store.setValue(item,
'imagerevision', data.items.data.imagerevision);
resourcegrid.store.setValue(item,
'nextimg', data.items.data.nextimg);
resourcegrid.store.setValue(item,
'ram', data.items.data.ram);
resourcegrid.store.setValue(item,
'procnumber', data.items.data.procnumber);
Modified: vcl/trunk/web/themes/dropdownmenus/page.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/themes/dropdownmenus/page.php?rev=1770419&r1=1770418&r2=1770419&view=diff
==============================================================================
--- vcl/trunk/web/themes/dropdownmenus/page.php (original)
+++ vcl/trunk/web/themes/dropdownmenus/page.php Fri Nov 18 18:20:37 2016
@@ -117,7 +117,7 @@ function getHeader($refresh) {
$rt .= " <li><a href=\"#\"
class=\"dropdown-toggle\" data-toggle=\"dropdown\" data-target=\"#\">" .
i('Manage') . "<b class=\"caret\"></b></a>\n";
$rt .= " <ul class=\"dropdown-menu\">\n";
foreach($menu as $page => $item) {
- if(in_array($page, array('dashboard', 'statistics',
'reservations', 'home', 'authentication', 'codeDocumentation')))
+ if(in_array($page, array('dashboard', 'statistics',
'reservations', 'home', 'authentication', 'codeDocumentation', 'userLookup')))
continue;
$selected = '';
if($item['selected'])
@@ -128,14 +128,13 @@ function getHeader($refresh) {
$rt .= " </li>\n";
$rt .= " <li><a href=\"#\"
class=\"dropdown-toggle\" data-toggle=\"dropdown\" data-target=\"#\">" .
i('Reporting') . "<b class=\"caret\"></b></a>\n";
$rt .= " <ul class=\"dropdown-menu\">\n";
- $selected = '';
- if($menu['dashboard']['selected'])
- $selected = ' class="active"';
- $rt .= " <li$selected><a
href=\"{$menu['dashboard']['url']}\">{$menu['dashboard']['title']}</a></li>\n";
- $selected = '';
- if($menu['statistics']['selected'])
- $selected = ' class="active"';
- $rt .= " <li$selected><a
href=\"{$menu['statistics']['url']}\">{$menu['statistics']['title']}</a></li>\n";
+ $items = array('dashboard', 'statistics', 'userLookup');
+ foreach($items as $item) {
+ $selected = '';
+ if($menu[$item]['selected'])
+ $selected = ' class="active"';
+ $rt .= " <li$selected><a
href=\"{$menu[$item]['url']}\">{$menu[$item]['title']}</a></li>\n";
+ }
$rt .= " </ul>\n";
$rt .= " </li>\n";
$rt .= " <li><a
href=\"{$menu['codeDocumentation']['url']}\">{$menu['codeDocumentation']['title']}</a></li>\n";
