Author: jfthomps
Date: Mon Oct 27 17:12:37 2014
New Revision: 1634604
URL: http://svn.apache.org/r1634604
Log:
VCL-780 - combine new reservation and current reservations pages
serverprofiles.php: modified serverProfiles: added section as placeholder from
previous Deploy Server page to let users know they now need to go to the
Reservations page and click New Reservation
utils.php: modified getNavMenu: also allow users with serverCheckOut (in
addition to serverProfileAdmin) to see link for Server Profiles; changed so
they can see the placeholder page to let them know to go to the Reservations
page to deploy servers now
Modified:
vcl/trunk/web/.ht-inc/serverprofiles.php
vcl/trunk/web/.ht-inc/utils.php
Modified: vcl/trunk/web/.ht-inc/serverprofiles.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/serverprofiles.php?rev=1634604&r1=1634603&r2=1634604&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/serverprofiles.php (original)
+++ vcl/trunk/web/.ht-inc/serverprofiles.php Mon Oct 27 17:12:37 2014
@@ -29,24 +29,37 @@
////////////////////////////////////////////////////////////////////////////////
function serverProfiles() {
global $user;
- if(! in_array("serverProfileAdmin", $user["privileges"])) {
+ /*if(! in_array("serverProfileAdmin", $user["privileges"])) {
print "No access to manage server profiles.<br>\n";
return;
- }
+ }*/
print "<div dojoType=\"dojo.data.ItemFileWriteStore\"
jsId=\"profilesstore\" ";
print "data=\"profilesstoredata\"></div>\n";
print "<div id=\"mainTabContainer\"
dojoType=\"dijit.layout.TabContainer\"\n";
print " style=\"width:630px;height:600px\">\n";
- print "<div id=\"manageprofiles\" dojoType=\"dijit.layout.ContentPane\"
title=\"Manage Profiles\">\n";
- $data = manageProfilesHTML();
- print $data['html'];
- print "</div>\n"; # manageprofiles tab
-
- print "<div id=\"grouping\" dojoType=\"dijit.layout.ContentPane\"
title=\"Manage Grouping\">\n";
- $data = manageGroupingHTML();
- print $data['html'];
- print "</div>\n"; # grouping tab
+ print "<div id=\"deploytab\" dojoType=\"dijit.layout.ContentPane\"
title=\"Deploy Server\">\n";
+ print "<h2>Deploy Server</h2>\n";
+ print "Server deployment has been incorporated into the
<strong>Reservations</strong>";
+ print " part of the site. To deploy a server<br>\n";
+ print "<ol style=\"list-style: decimal;\">\n";
+ print "<li>Click <strong>Reservations</strong></li>\n";
+ print "<li>Click the <strong>New Reservation</strong> button</li>\n";
+ print "<li>Select the <strong>Server Reservation</strong> radio button
at the top of the dialog box</li>\n";
+ print "</ol>\n";
+ print "</div>\n"; # deploytab
+
+ if(in_array("serverProfileAdmin", $user["privileges"])) {
+ print "<div id=\"manageprofiles\"
dojoType=\"dijit.layout.ContentPane\" title=\"Manage Profiles\">\n";
+ $data = manageProfilesHTML();
+ print $data['html'];
+ print "</div>\n"; # manageprofiles tab
+
+ print "<div id=\"grouping\"
dojoType=\"dijit.layout.ContentPane\" title=\"Manage Grouping\">\n";
+ $data = manageGroupingHTML();
+ print $data['html'];
+ print "</div>\n"; # grouping tab
+ }
print "</div>\n"; # tab container
}
Modified: vcl/trunk/web/.ht-inc/utils.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/utils.php?rev=1634604&r1=1634603&r2=1634604&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/utils.php (original)
+++ vcl/trunk/web/.ht-inc/utils.php Mon Oct 27 17:12:37 2014
@@ -12518,7 +12518,8 @@ function getNavMenu($inclogout, $inchome
$rt .= "<a href=\"" . BASEURL . SCRIPT .
"?mode=managementnode\">";
$rt .= _("Management Nodes</a></li>\n");
}
- if(in_array("serverProfileAdmin", $user["privileges"])) {
+ if(in_array("serverProfileAdmin", $user["privileges"]) ||
+ in_array("serverCheckOut", $user["privileges"])) {
$rt .= menulistLI('serverProfiles');
$rt .= "<a href=\"" . BASEURL . SCRIPT;
$rt .= "?mode=serverProfiles\">" . _("Server Profiles") .
"</a></li>\n";
