Author: jfthomps
Date: Tue May 15 19:49:22 2012
New Revision: 1338861
URL: http://svn.apache.org/viewvc?rev=1338861&view=rev
Log:
VCL-444
time delay the display of the Get RDP File button to allow vcld to grant access
requests.php: modified connectRequest - set Get RDP File button to be displayed
by default and counter to be hidden
requests.js: modified showRDPbutton - added code to hide Get RDP File button
and unhide counter - by showing the button by default and then hiding it, users
do not run in to the issue of not seeing the button at all after an upgrade
while their browser is still using a cached version of the requests.js file
Modified:
incubator/vcl/trunk/web/.ht-inc/requests.php
incubator/vcl/trunk/web/js/requests.js
Modified: incubator/vcl/trunk/web/.ht-inc/requests.php
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/requests.php?rev=1338861&r1=1338860&r2=1338861&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Tue May 15 19:49:22 2012
@@ -3395,8 +3395,8 @@ function connectRequest() {
$res['connectport']);
print preg_replace($froms, $tos,
$method['connecttext']);
if(preg_match('/remote desktop/i',
$method['description'])) {
- print "<div id=\"counterdiv\"></div>\n";
- print "<div id=\"connectdiv\"
class=\"hidden\">\n";
+ print "<div id=\"counterdiv\"
class=\"hidden\"></div>\n";
+ print "<div id=\"connectdiv\">\n";
print "<FORM action=\"" . BASEURL . SCRIPT .
"\" method=post>\n";
$cdata = array('requestid' => $requestid,
'resid' =>
$res['reservationid']);
Modified: incubator/vcl/trunk/web/js/requests.js
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/requests.js?rev=1338861&r1=1338860&r2=1338861&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/requests.js (original)
+++ incubator/vcl/trunk/web/js/requests.js Tue May 15 19:49:22 2012
@@ -760,6 +760,8 @@ function showRDPbutton() {
if(typeof timeInterval === 'undefined' || parseInt(timeInterval) <= 0) {
timeInterval = 1
}
+ dojo.addClass('connectdiv', 'hidden');
+ dojo.removeClass('counterdiv', 'hidden');
if(timeInterval == 1)
dojo.byId('counterdiv').innerHTML = _(' Ready to connect in ')
+ timeInterval + _(' second');
else
