Author: jfthomps
Date: Tue Sep 23 20:14:26 2014
New Revision: 1627147
URL: http://svn.apache.org/r1627147
Log:
VCL-780 - combine new reservation and current reservations pages
requests.php: modified newReservationHTML: fixed placement of two <br> tags
requests.js: modified selectResType: added check for dojo.byId('endduration')
existing before setting it to checked
Modified:
vcl/trunk/web/.ht-inc/requests.php
vcl/trunk/web/js/requests.js
Modified: vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/requests.php?rev=1627147&r1=1627146&r2=1627147&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/requests.php (original)
+++ vcl/trunk/web/.ht-inc/requests.php Tue Sep 23 20:14:26 2014
@@ -1574,7 +1574,7 @@ function newReservationHTML() {
$h .= "<span id=\"endlbl\"";
if(! $openend)
$h .= " class=\"hidden\"";
- $h .= ">" . _("Ending:") . "</span><br>\n";
+ $h .= ">" . _("Ending:") . "<br></span>\n";
# ending by duration
$h .= "<span id=\"durationend\">\n";
@@ -1620,9 +1620,9 @@ function newReservationHTML() {
$h .= "style=\"width: 88px\"></div>\n";
$h .= "<div type=\"text\" id=\"deployendtime\"
dojoType=\"dijit.form.TimeTextBox\" ";
$h .= "style=\"width: 88px\" onChange=\"setEndAt();\"></div>\n";
- $h .= "<small>(" . date('T') . ")</small><br><br>\n";
+ $h .= "<small>(" . date('T') . ")</small><br>\n";
}
- $h .= "</span>\n";
+ $h .= "</span><br>\n";
$h .= "<div id=\"deployerr\" class=\"rederrormsg\"></div>\n";
$h .= "<div id=\"waittime\"></div><br>\n";
Modified: vcl/trunk/web/js/requests.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/requests.js?rev=1627147&r1=1627146&r2=1627147&view=diff
==============================================================================
--- vcl/trunk/web/js/requests.js (original)
+++ vcl/trunk/web/js/requests.js Tue Sep 23 20:14:26 2014
@@ -158,7 +158,8 @@ function selectResType() {
dojo.addClass('endlbl', 'hidden');
dojo.addClass('specifyend', 'hidden');
}
- if(dojo.byId('endat') && ! dojo.byId('endat').checked) {
+ if(dojo.byId('endat') && ! dojo.byId('endat').checked &&
+ dojo.byId('endduration')) {
dojo.byId('endduration').checked = true;
delayedUpdateWaitTime(0, 50);
}
