You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2016/05/16 18:47:20 UTC
svn commit: r1744109 - in /vcl/trunk/web/.ht-inc: authentication.php
blockallocations.php groups.php privileges.php requests.php resource.php
userpreferences.php
Author: jfthomps
Date: Mon May 16 18:47:20 2016
New Revision: 1744109
URL: http://svn.apache.org/viewvc?rev=1744109&view=rev
Log:
added DOM ids and css classes to many elements to allow for better control of the look of the site from theme/skin css; changed width of a few elements
authentication.php:
-modified selectAuth: added id=loginlayout to main layout table
-modified printLoginPage: added new div with id=loginbox around login content; added id=loginlayout to main layout table
blockallocations.php: modified getCurrentBlockHTML: changed width of Date field of viewtimesDialog from 60px to 65px
groups.php:
-modified viewGroups: changed width of edit button column for both user and resource groups from 3em to 3.5em
-modified editOrAddGroup: added id=groupmembershiptbl to layout table of section to edit user group membership
privileges.php:
-modified viewNodes, selectNode, printUserPrivRow, getUserPrivRowHTML, and getResourcePrivRowHTML: added css classes privBlock and privCascade to cells table cells where bgcolor=gray and bgcolor=#008000 were assigned
-modified viewNodes: added css class=noborder to tables containing buttons
-modified userLookup: added div with id=userlookupdata to wrap data about user looked up; added div with id=userlookupresdata to wrap data about user's reservations
requests.php: modified newReservationHTML: changed width for environment drop down in new reservation dialog from 400px to 95% to work with mobile devices better
resource.php: modified viewResources: changed width of edit button column from 3em to 3.5em
userpreferences.php: modified userpreferences: changed definition for width of separator table cell from width=50px to style="width: 5em;"; added id=uipreffieldsets to table cell containing fieldsets of data to be modified
Modified:
vcl/trunk/web/.ht-inc/authentication.php
vcl/trunk/web/.ht-inc/blockallocations.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/userpreferences.php
Modified: vcl/trunk/web/.ht-inc/authentication.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/authentication.php?rev=1744109&r1=1744108&r2=1744109&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/authentication.php (original)
+++ vcl/trunk/web/.ht-inc/authentication.php Mon May 16 18:47:20 2016
@@ -155,7 +155,7 @@ function selectAuth() {
print $HTMLheader;
$printedHTMLheader = 1;
print "<H2>" . i("Welcome to the Virtual Computing Lab") . "</H2>\n";
- print "<TABLE>\n";
+ print "<TABLE id=\"loginlayout\">\n";
print "<TR>\n";
print "<TD nowrap class=rightborder>\n";
print i("Please select an authentication method to use:") . "<br><br>\n";
@@ -284,11 +284,12 @@ function printLoginPage($servertimeout=0
$text1 = i("Login with") . " $authtype";
$text2 = "";
#}
+ print "<div id=\"loginbox\">\n";
print "<H2 style=\"display: block\">$text1</H2>\n";
print "<FORM action=\"" . BASEURL . SCRIPT . "\" method=post name=loginform>\n";
if(strlen($userid))
print "<font color=red>" . i("Login failed") . " $extrafailedmsg</font>\n";
- print "<TABLE>\n";
+ print "<TABLE id=\"loginlayout\">\n";
print " <TR>\n";
print " <TH align=right>$useridLabel:</TH>\n";
print " <TD><INPUT type=text name=userid value=\"$userid\"></TD>\n";
@@ -306,6 +307,7 @@ function printLoginPage($servertimeout=0
print "<INPUT type=hidden name=continuation value=\"$cont\">\n";
print "</FORM>\n";
print "$text2<br>\n";
+ print "</div>\n";
print getFooter();
}
Modified: vcl/trunk/web/.ht-inc/blockallocations.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/blockallocations.php?rev=1744109&r1=1744108&r2=1744109&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/blockallocations.php (original)
+++ vcl/trunk/web/.ht-inc/blockallocations.php Mon May 16 18:47:20 2016
@@ -1427,7 +1427,7 @@ function getCurrentBlockHTML($listonly=0
$rt .= "</script>\n";
$rt .= "<thead>\n";
$rt .= "<tr>\n";
- $rt .= "<th field=\"start\" width=\"60px\" formatter=\"blockTimesGridDate\">" . i("Date") . "</th>\n";
+ $rt .= "<th field=\"start\" width=\"65px\" formatter=\"blockTimesGridDate\">" . i("Date") . "</th>\n";
$rt .= "<th field=\"start\" width=\"54px\" formatter=\"blockTimesGridStart\">" . i("Start") . "</th>\n";
$rt .= "<th field=\"end\" width=\"54px\" formatter=\"blockTimesGridEnd\">" . i("End") . "</th>\n";
$rt .= "<th field=\"delbtn\" width=\"60px\">" . i("Skip") . "</th>\n";
Modified: vcl/trunk/web/.ht-inc/groups.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/groups.php?rev=1744109&r1=1744108&r2=1744109&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/groups.php (original)
+++ vcl/trunk/web/.ht-inc/groups.php Mon May 16 18:47:20 2016
@@ -146,7 +146,7 @@ function viewGroups() {
preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']))
$w = array('54px', '38px', '200px', '142px', '65px', '142px', '59px', '58px', '63px', '73px');
else
- $w = array('4.5em', '3em', '17em', '12em', '5em', '12em', '5em', '5em', '5.6em', '6.3em');
+ $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";
print "<th field=\"id\" width=\"{$w[1]}\" formatter=\"fmtUserGroupEditBtn\"> </th>\n";
print "<th field=\"name\" width=\"{$w[2]}\">Name</th>\n";
@@ -268,7 +268,7 @@ function viewGroups() {
preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']))
$w = array('54px', '38px', '108px', '240px', '250px', '24px');
else
- $w = array('4.5em', '3em', '9em', '20em', '21em', '1.6em');
+ $w = array('4.5em', '3.5em', '9em', '20em', '21em', '1.6em');
print "<th field=\"id\" width=\"{$w[0]}\" formatter=\"fmtResourceGroupDeleteBtn\"> </th>\n";
print "<th field=\"id\" width=\"{$w[1]}\" formatter=\"fmtResourceGroupEditBtn\"> </th>\n";
@@ -916,7 +916,7 @@ function editOrAddGroup($state) {
$edit = 0;
if(empty($groupmembers) && ! $edit)
print "(empty group)<br>\n";
- print "<TABLE border=1>\n";
+ print "<TABLE border=1 id=\"groupmembershiptbl\">\n";
if($edit) {
print " <TR>\n";
print " <FORM action=\"" . BASEURL . SCRIPT . "\" method=post>\n";
Modified: vcl/trunk/web/.ht-inc/privileges.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/privileges.php?rev=1744109&r1=1744108&r2=1744109&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/privileges.php (original)
+++ vcl/trunk/web/.ht-inc/privileges.php Mon May 16 18:47:20 2016
@@ -151,8 +151,8 @@ function viewNodes() {
print "<TABLE border=1 summary=\"\">\n";
print " <TR>\n";
print " <TD></TD>\n";
- print " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
- print " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
+ print " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
+ print " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
foreach($usertypes["users"] as $type) {
if($type == 'configAdmin')
continue;
@@ -200,8 +200,8 @@ function viewNodes() {
print "<TABLE border=1 summary=\"\">\n";
print " <TR>\n";
print " <TD></TD>\n";
- print " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
- print " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
+ print " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
+ print " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
foreach($usertypes["users"] as $type) {
if($type == 'configAdmin')
continue;
@@ -261,8 +261,8 @@ function viewNodes() {
print " <TR>\n";
print " <TH>Group<br>Name</TH>\n";
print " <TH>Group<br>Type</TH>\n";
- print " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
- print " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
+ print " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
+ print " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
foreach($resourcetypes as $type) {
if($type == 'block' || $type == 'cascade')
continue;
@@ -325,8 +325,8 @@ function viewNodes() {
print "<TABLE border=1 summary=\"\">\n";
print " <TR>\n";
print " <TD></TD>\n";
- print " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
- print " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
+ print " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
+ print " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
foreach($usertypes["users"] as $type) {
$img = getImageText($type);
print " <TD>$img</TD>\n";
@@ -338,11 +338,11 @@ function viewNodes() {
# block rights
$count = count($usertypes) + 1;
- print " <TD align=center bgcolor=gray><INPUT type=checkbox ";
+ print " <TD class=\"privBlock\" align=center bgcolor=gray><INPUT type=checkbox ";
print "dojoType=dijit.form.CheckBox id=blockchk name=block></TD>\n";
#cascade rights
- print " <TD align=center bgcolor=\"#008000\" id=usercell0:0>";
+ print " <TD class=\"privCascade\" align=center bgcolor=\"#008000\" id=usercell0:0>";
print "<INPUT type=checkbox dojoType=dijit.form.CheckBox id=userck0:0 ";
print "name=cascade></TD>\n";
@@ -356,7 +356,7 @@ function viewNodes() {
print " </TR>\n";
print "</TABLE>\n";
print "<div id=addUserPrivStatus></div>\n";
- print "<TABLE summary=\"\"><TR>\n";
+ print "<TABLE class=\"noborder\" summary=\"\"><TR>\n";
print "<TD>\n";
print " <button id=submitAddUserBtn dojoType=\"dijit.form.Button\">\n";
print " Submit New User\n";
@@ -391,8 +391,8 @@ function viewNodes() {
print "<TABLE border=1 summary=\"\">\n";
print " <TR>\n";
print " <TD></TD>\n";
- print " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
- print " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
+ print " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
+ print " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
foreach($usertypes["users"] as $type) {
$img = getImageText($type);
print " <TD>$img</TD>\n";
@@ -406,11 +406,11 @@ function viewNodes() {
print " </TD>\n";
# block rights
- print " <TD align=center bgcolor=gray><INPUT type=checkbox ";
+ print " <TD class=\"privBlock\" align=center bgcolor=gray><INPUT type=checkbox ";
print "dojoType=dijit.form.CheckBox id=blockgrpchk name=blockgrp></TD>\n";
#cascade rights
- print " <TD align=center bgcolor=\"#008000\" id=grpcell0:0>";
+ print " <TD class=\"privCascade\" align=center bgcolor=\"#008000\" id=grpcell0:0>";
print "<INPUT type=checkbox dojoType=dijit.form.CheckBox id=usergrpck0:0 ";
print "name=cascadegrp></TD>\n";
@@ -424,7 +424,7 @@ function viewNodes() {
print " </TR>\n";
print "</TABLE>\n";
print "<div id=addUserGroupPrivStatus></div>\n";
- print "<TABLE summary=\"\"><TR>\n";
+ print "<TABLE class=\"noborder\" summary=\"\"><TR>\n";
print "<TD>\n";
print " <button id=submitAddGroupBtn dojoType=\"dijit.form.Button\">\n";
print " Submit New User Group\n";
@@ -459,8 +459,8 @@ function viewNodes() {
print "<TABLE border=1 summary=\"\">\n";
print " <TR>\n";
print " <TD></TD>\n";
- print " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
- print " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
+ print " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>\n";
+ print " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>\n";
foreach($resourcetypes as $type) {
if($type == 'block' || $type == 'cascade')
continue;
@@ -483,11 +483,11 @@ function viewNodes() {
print " </TD>\n";
# block rights
- print " <TD align=center bgcolor=gray><INPUT type=checkbox ";
+ print " <TD class=\"privBlock\" align=center bgcolor=gray><INPUT type=checkbox ";
print "dojoType=dijit.form.CheckBox id=blockresgrpck name=blockresgrp></TD>\n";
#cascade rights
- print " <TD align=center bgcolor=\"#008000\" id=resgrpcell0:0>";
+ print " <TD class=\"privCascade\" align=center bgcolor=\"#008000\" id=resgrpcell0:0>";
print "<INPUT type=checkbox dojoType=dijit.form.CheckBox id=resgrpck0:0 ";
print "name=cascaderesgrp></TD>\n";
@@ -503,7 +503,7 @@ function viewNodes() {
print " </TR>\n";
print "</TABLE>\n";
print "<div id=addResourceGroupPrivStatus></div>\n";
- print "<TABLE summary=\"\"><TR>\n";
+ print "<TABLE class=\"noborder\" summary=\"\"><TR>\n";
print "<TD>\n";
print " <button dojoType=\"dijit.form.Button\">\n";
print " Submit New Resource Group\n";
@@ -781,8 +781,8 @@ function selectNode() {
$text .= "<TABLE border=1 summary=\"\">";
$text .= " <TR>";
$text .= " <TD></TD>";
- $text .= " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>";
- $text .= " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>";
+ $text .= " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>";
+ $text .= " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>";
foreach($usertypes["users"] as $type) {
$img = getImageText($type);
$text .= " <TD>$img</TD>";
@@ -831,8 +831,8 @@ function selectNode() {
$text .= "<TABLE border=1 summary=\"\">";
$text .= " <TR>";
$text .= " <TD></TD>";
- $text .= " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>";
- $text .= " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>";
+ $text .= " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>";
+ $text .= " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>";
foreach($usertypes["users"] as $type) {
$img = getImageText($type);
$text .= " <TH>$img</TH>";
@@ -893,8 +893,8 @@ function selectNode() {
$text .= " <TR>";
$text .= " <TH>Group<br>Name</TH>";
$text .= " <TH>Group<br>Type</TH>";
- $text .= " <TH bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>";
- $text .= " <TH bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>";
+ $text .= " <TH class=\"privBlock\" bgcolor=gray style=\"color: black;\">Block<br>Cascaded<br>Rights</TH>";
+ $text .= " <TH class=\"privCascade\" bgcolor=\"#008000\" style=\"color: black;\">Cascade<br>to Child<br>Nodes</TH>";
foreach($resourcetypes as $type) {
if($type == 'block' || $type == 'cascade')
continue;
@@ -1282,6 +1282,7 @@ function userLookup() {
}
}
$userdata["groups"] = getUsersGroups($userdata["id"], 1, 1);
+ print "<div id=\"userlookupdata\">\n";
print "<TABLE>\n";
if(! empty($userdata['unityid'])) {
print " <TR>\n";
@@ -1430,6 +1431,7 @@ function userLookup() {
print "</TABLE>\n";
}
}
+ print "</div>\n";
print "<table>\n";
print " <tr>\n";
print " <th>Images User Has Access To:<th>\n";
@@ -1522,6 +1524,7 @@ function userLookup() {
$requests = array_reverse($requests);
if(! empty($requests)) {
print "<h3>User's last " . count($requests) . " reservations:</h3>\n";
+ print "<div id=\"userlookupresdata\">\n";
print "<table>\n";
$first = 1;
foreach($requests as $req) {
@@ -1572,6 +1575,7 @@ function userLookup() {
}
}
print "</table>\n";
+ print "</div>\n";
}
else
print "User made no reservations in the past week.<br>\n";
@@ -1786,7 +1790,7 @@ function printUserPrivRow($privname, $ro
$usergroup = 2;
$name = "privrow[$privname:block]";
}
- print " <TD align=center bgcolor=gray>\n";
+ print " <TD class=\"privBlock\" align=center bgcolor=gray>\n";
print "<INPUT type=checkbox dojoType=dijit.form.CheckBox id=ck$rownum:block ";
print "name=\"$name\" onClick=\"changeCascadedRights(this.checked, $rownum, ";
print "$count, 1, $usergroup);\" $checked $disabled></TD>\n";
@@ -1801,7 +1805,7 @@ function printUserPrivRow($privname, $ro
else
$checked = "";
$name = "privrow[$privname:cascade]";
- print " <TD align=center bgcolor=\"#008000\" id=cell$rownum:0>";
+ print " <TD class=\"privCascade\" align=center bgcolor=\"#008000\" id=cell$rownum:0>";
print "<INPUT type=checkbox dojoType=dijit.form.CheckBox id=ck$rownum:0 ";
print "name=\"$name\" onClick=\"privChange(this.checked, $rownum, 0, ";
print "$usergroup);\" $checked $disabled></TD>\n";
@@ -1820,7 +1824,7 @@ function printUserPrivRow($privname, $ro
in_array($type, $cascadeprivs[$privname])) ||
($usergroup == 2 &&
in_array($type, $cascadeprivs[$privname]['privs'])))) {
- $bgcolor = "bgcolor=\"#008000\"";
+ $bgcolor = "class=\"privCascade\" bgcolor=\"#008000\"";
$checked = "checked";
$value = "value=cascade";
$cascaded = 1;
@@ -1916,7 +1920,7 @@ function getUserPrivRowHTML($privname, $
elseif($usergroup == 'group')
$usergroup = 2;
$name = "privrow[$privname:block]";
- $text .= " <TD align=center bgcolor=gray><INPUT type=checkbox ";
+ $text .= " <TD class=\"privBlock\" align=center bgcolor=gray><INPUT type=checkbox ";
$text .= "dojoType=dijit.form.CheckBox id=ck$rownum:block name=\"$name\" ";
$text .= "$checked $disabled onClick=\"changeCascadedRights";
$text .= "(this.checked, $rownum, $count, 1, $usergroup)\"></TD>";
@@ -1931,7 +1935,7 @@ function getUserPrivRowHTML($privname, $
else
$checked = "";
$name = "privrow[$privname:cascade]";
- $text .= " <TD align=center bgcolor=\"#008000\" id=cell$rownum:0>";
+ $text .= " <TD class=\"privCascade\" align=center bgcolor=\"#008000\" id=cell$rownum:0>";
$text .= "<INPUT type=checkbox dojoType=dijit.form.CheckBox id=ck$rownum:0 ";
$text .= "name=\"$name\" onClick=\"privChange(this.checked, $rownum, 0, ";
$text .= "$usergroup);\" $checked $disabled></TD>";
@@ -1948,7 +1952,7 @@ function getUserPrivRowHTML($privname, $
in_array($type, $cascadeprivs[$privname])) ||
($usergroup == 2 &&
in_array($type, $cascadeprivs[$privname]['privs'])))) {
- $bgcolor = "bgcolor=\"#008000\"";
+ $bgcolor = "class=\"privCascade\" bgcolor=\"#008000\"";
$checked = "checked";
$value = "value=cascade";
$cascaded = 1;
@@ -2089,7 +2093,7 @@ function getResourcePrivRowHTML($privnam
}
$count = count($types) + 1;
$name = "privrow[" . $privname . ":block]";
- $text .= " <TD align=center bgcolor=gray><INPUT type=checkbox ";
+ $text .= " <TD class=\"privBlock\" align=center bgcolor=gray><INPUT type=checkbox ";
$text .= "dojoType=dijit.form.CheckBox id=ck$rownum:block name=\"$name\" ";
$text .= "$checked $disabled onClick=\"changeCascadedRights";
$text .= "(this.checked, $rownum, $count, 1, 3)\"></TD>\n";
@@ -2101,7 +2105,7 @@ function getResourcePrivRowHTML($privnam
else
$checked = "";
$name = "privrow[" . $privname . ":cascade]";
- $text .= " <TD align=center bgcolor=\"#008000\" id=cell$rownum:0>";
+ $text .= " <TD class=\"privCascade\" align=center bgcolor=\"#008000\" id=cell$rownum:0>";
$text .= "<INPUT type=checkbox dojoType=dijit.form.CheckBox id=ck$rownum:0 ";
$text .= "onClick=\"privChange(this.checked, $rownum, 0, 3);\" ";
$text .= "name=\"$name\" $checked $disabled></TD>\n";
@@ -2117,7 +2121,7 @@ function getResourcePrivRowHTML($privnam
$cascaded = 0;
if(array_key_exists($privname, $cascadeprivs) &&
in_array($type, $cascadeprivs[$privname])) {
- $bgcolor = "bgcolor=\"#008000\"";
+ $bgcolor = "class=\"privCascade\" bgcolor=\"#008000\"";
$checked = "checked";
$value = "value=cascade";
$cascaded = 1;
Modified: vcl/trunk/web/.ht-inc/requests.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1744109&r1=1744108&r2=1744109&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Mon May 16 18:47:20 2016
@@ -1486,7 +1486,7 @@ function newReservationHTML() {
$h .= "<div dojoType=\"dojo.data.ItemFileWriteStore\" data=\"images\" ";
$h .= "jsId=\"imagestore\"></div>\n";
$h .= "<select dojoType=\"dijit.form.FilteringSelect\" id=\"deployimage\" ";
- $h .= "style=\"width: 400px\" required=\"true\" store=\"imagestore\" ";
+ $h .= "style=\"width: 95%;\" required=\"true\" store=\"imagestore\" ";
$h .= "queryExpr=\"*\${0}*\" ";
if($forimaging)
$h .= "query=\"{imaging: 1}\" ";
Modified: vcl/trunk/web/.ht-inc/resource.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/resource.php?rev=1744109&r1=1744108&r2=1744109&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/resource.php (original)
+++ vcl/trunk/web/.ht-inc/resource.php Mon May 16 18:47:20 2016
@@ -309,7 +309,7 @@ class Resource {
preg_match('/Trident/i', $_SERVER['HTTP_USER_AGENT']))
$w = array('64px', '38px', '200px');
else
- $w = array('5em', '3em', '17em');
+ $w = array('5em', '3.5em', '17em');
$h .= "<th field=\"id\" id=\"delcolth\" width=\"{$w[0]}\" formatter=\"resource.DeleteBtn\" styles=\"text-align: center;\"> </th>\n";
$h .= "<th field=\"id\" width=\"{$w[1]}\" formatter=\"resource.EditBtn\" styles=\"text-align: center;\"> </th>\n";
$h .= "<th field=\"name\" width=\"{$w[2]}\">" . i("Name") . "</th>\n";
Modified: vcl/trunk/web/.ht-inc/userpreferences.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/userpreferences.php?rev=1744109&r1=1744108&r2=1744109&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/userpreferences.php (original)
+++ vcl/trunk/web/.ht-inc/userpreferences.php Mon May 16 18:47:20 2016
@@ -79,8 +79,8 @@ function userpreferences() {
print " </ul>\n";
print " </div>\n";
print " </TD>\n";
- print " <TD rowspan=2 width=50px></TD>\n";
- print " <TD rowspan=2>\n";
+ print " <TD rowspan=2 style=\"width: 5em;\"></TD>\n";
+ print " <TD rowspan=2 id=\"uipreffieldsets\">\n";
if($showpersonal) {
print " <fieldset id=personal class=shown>\n";
print " <legend>" . i("Personal") . "</legend>\n";