Merge branch 'master' of https://code.grnet.gr/git/synnefo

ui/static/synnefo.js

@@ -30,16 +30,6 @@ function update_confirmations(){
 	// if more than one pending action show multiple confirm box
 	if (pending_actions.length>1 || $.cookie("list") == '1' && pending_actions.length == 1){ 
 		$('div.confirm_multiple span.actionLen').text(pending_actions.length);
-        // set the label of the buttons in list view
-        if ($.cookie("list") == '1') {
-            $('div.confirm_multiple button.yes').text('Confirm');
-            $('div.confirm_multiple button.no').text('Cancel');
-        }
-        // set the label of the buttons in standard view
-        else {
-            $('div.confirm_multiple button.yes').text('Confirm All');
-            $('div.confirm_multiple button.no').text('Cancel All');
-        }
 		$('div.confirm_multiple').show();
 	}
 }

ui/templates/list.html

@@ -270,6 +270,10 @@ if (flavors.length == 0) {
     // configure flavors
     update_flavors(); 
 }
+// set the label of the multiple buttons 
+$('div.confirm_multiple button.yes').text('Confirm');
+$('div.confirm_multiple button.no').text('Cancel');
+// start updating vm list
 update_vms(UPDATE_INTERVAL);
 
 </script>

ui/templates/standard.html

@@ -256,7 +256,6 @@ function display_failure(serverID, status, action) {
     
 }
 
-
 if (images.length == 0) {
     // populate image list
     update_images();
@@ -265,6 +264,9 @@ if (flavors.length == 0) {
     // configure flavors
     update_flavors(); 
 }
-
+// set the label of the multiple buttons 
+$('div.confirm_multiple button.yes').text('Confirm All');
+$('div.confirm_multiple button.no').text('Cancel All');
+// start updating vm list
 update_vms(UPDATE_INTERVAL);
 </script>