svn commit: r1176502 [3/3] - in /incubator/vcl/trunk/web: .ht-inc/ .ht-inc/authmethods/ css/ js/

[jfthomps]

Modified: incubator/vcl/trunk/web/js/serverprofiles.js
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/serverprofiles.js?rev=1176502&r1=1176501&r2=1176502&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/serverprofiles.js (original)
+++ incubator/vcl/trunk/web/js/serverprofiles.js Tue Sep 27 18:29:22 2011
@@ -208,6 +208,7 @@ function getServerProfileDataDeployCB(da
                alert('You do not have access to apply this server profile.');
                return;
        }
+       dojo.byId('appliedprofileid').value = data.items.id;
        dijit.byId('deployimage').set('value', data.items.imageid);
        dijit.byId('deployfixedIP').set('value', data.items.fixedIP);
        dijit.byId('deployfixedMAC').set('value', data.items.fixedMAC);
@@ -536,23 +537,31 @@ function addRemProfileCB(data, ioArgs) {
 function setStartNow() {
        dijit.byId('deploystarttime').set('required', false);
        dijit.byId('deploystartdate').set('required', false);
+       dojo.addClass('deployerr', 'hidden');
+       dijit.byId('deploybtn').set('label', 'Deploy Server');
 }
 
 function setStartLater() {
        dojo.byId('startlater').checked = true;
        dijit.byId('deploystarttime').set('required', true);
        dijit.byId('deploystartdate').set('required', true);
+       dojo.addClass('deployerr', 'hidden');
+       dijit.byId('deploybtn').set('label', 'Deploy Server');
 }
 
 function setEndIndef() {
        dijit.byId('deployendtime').set('required', false);
        dijit.byId('deployenddate').set('required', false);
+       dojo.addClass('deployerr', 'hidden');
+       dijit.byId('deploybtn').set('label', 'Deploy Server');
 }
 
 function setEndAt() {
        dojo.byId('endat').checked = true;
        dijit.byId('deployendtime').set('required', true);
        dijit.byId('deployenddate').set('required', true);
+       dojo.addClass('deployerr', 'hidden');
+       dijit.byId('deploybtn').set('label', 'Deploy Server');
 }
 
 function submitDeploy() {
@@ -621,7 +630,13 @@ function submitDeploy() {
                        return;
                }
        }
-       var data = {continuation: cont};
+       if(dijit.byId('deploybtn').get('label') == 'View Available Times') {
+               dijit.byId('suggestDlgBtn').set('disabled', true);
+               showSuggestedTimes();
+               return;
+       }
+       var data = {continuation: cont,
+                   profileid: dojo.byId('appliedprofileid').value};
        if(dijit.byId('deployimage'))
                data.imageid = dijit.byId('deployimage').get('value');
        else
@@ -668,16 +683,52 @@ function submitDeploy() {
                                                time.getHours(),
                                                time.getMinutes());
        }
+       dijit.byId('deploybtn').set('label', 'Working...');
+       dijit.byId('deploybtn').set('disabled', true);
        RPCwrapper(data, submitDeployCB, 1);
 }
 
 function submitDeployCB(data, ioArgs) {
        if(data.items.error) {
-               alert(data.items.msg);
+               dojo.byId('deployerr').innerHTML = data.items.msg;
+               dojo.removeClass('deployerr', 'hidden');
                dojo.byId('deploycont').value = data.items.cont;
+               dijit.byId('deploybtn').set('disabled', false);
+               if(data.items.error == 2) {
+                       dijit.byId('deploybtn').set('label', 'View Available 
Times');
+                       dojo.byId('suggestcont').value = data.items.sugcont;
+               }
+               else
+                       dijit.byId('deploybtn').set('label', 'Deploy Server');
                return;
        }
        if(data.items.success) {
                window.location.href = data.items.redirecturl;
        }
 }
+
+function useSuggestedDeploySlot() {
+       var slot = suggestTimeData[dojo.byId('selectedslot').value];
+       dojo.byId('startlater').checked = true;
+       var tmp = parseInt(slot['startts'] + '000');
+       var s = new Date(tmp);
+       var e = new Date(tmp + parseInt(slot['duration'] + '000'));
+       dijit.byId('deploystartdate').set('value', s);
+       dijit.byId('deploystarttime').set('value', s);
+
+       var testend = new Date(2038, 0, 1, 0, 0, 0, 0);
+       if(e >= testend) {
+               dojo.byId('endindef').checked = true;
+       }
+       else {
+               dojo.byId('endat').checked = true;
+               dijit.byId('deployenddate').set('value', e);
+               dijit.byId('deployendtime').set('value', e);
+       }
+
+       //dojo.byId('waittime').className = 'hidden';
+       dijit.byId('suggestedTimes').hide();
+       dijit.byId('deploybtn').set('label', 'Shake & Bake Server');
+       dojo.addClass('deployerr', 'hidden');
+       //updateWaitTime(0);
+}

Modified: incubator/vcl/trunk/web/js/statistics.js
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/js/statistics.js?rev=1176502&r1=1176501&r2=1176502&view=diff
==============================================================================
--- incubator/vcl/trunk/web/js/statistics.js (original)
+++ incubator/vcl/trunk/web/js/statistics.js Tue Sep 27 18:29:22 2011
@@ -62,6 +62,11 @@ function generateGraphs() {
 }
 
 function generateColGraphsCB(data, ioArgs) {
+       if(data.items.nodata) {
+               dojo.byId(data.items.id).innerHTML = data.items.nodata;
+               dojo.removeClass(data.items.id, 'statgraph');
+               return;
+       }
        dojo.byId(data.items.id).innerHTML = '';
        var graph = new dojox.charting.Chart2D(data.items.id);
        if(data.items.maxy <= 50)