Revision e357c9f0 ui/templates/standard.html

b/ui/templates/standard.html
241 241
                           [STATUS_MESSAGES['ACTIVE'], STATUS_MESSAGES['BUILD'], STATUS_MESSAGES['REBOOT'],
242 242
                            'Shutting down'].indexOf(existing.find(".status").text()) >= 0) {
243 243
                    // from active, building, rebooting, or shutting down to stopped or on error
244
                    // shutting down is not an api state, it means the vm is active
244
                    // shutting down is not an api state, it means the server is active
245 245
                    moved = existing.clone().appendTo(".terminated");
246 246
                    moved.find("img.logo").attr("src","static/machines/" + server_image + '-off.png');
247 247
                    existing.remove();
......
250 250
                } else if (['BUILD','ACTIVE','REBOOT'].indexOf(server.status) >= 0 && 
251 251
                            [STATUS_MESSAGES['ACTIVE'], STATUS_MESSAGES['BUILD'],
252 252
                             STATUS_MESSAGES['REBOOT']].indexOf(existing.find(".status").text()) >= 0) {
253
                    // the vm changes status, but remains in running list
253
                    // the server changes status, but remains in running list
254 254
                    existing.find(".status").text(STATUS_MESSAGES[server.status]); 
255 255
                } else if (['STOPPED','ERROR'].indexOf(server.status) >= 0 &&
256 256
                    [STATUS_MESSAGES['STOPPED'], 
257 257
                     STATUS_MESSAGES['ERROR']].indexOf(existing.find(".status").text()) >= 0) {
258
                    // the vm changes status, but remains in terminated list
258
                    // the server changes status, but remains in terminated list
259 259
                    existing.find(".status").text(STATUS_MESSAGES[server.status]); 
260 260
                }        
261 261
                existing.find('.spinner').hide();
262 262
                existing.find(' .wave').attr('src','static/wave.gif').show();
263 263
                setTimeout("$('#" + server.id +" .wave').attr('src','').hide()", 3000);
264
                // show spinner while machine is rebooting, starting or shutting down  
264
                // show spinner while the server is rebooting, starting or shutting down  
265 265
                if ([STATUS_MESSAGES['REBOOT'], 
266 266
                    'Starting', 'Shutting down'].indexOf(existing.find(".status").text()) >= 0 ) {
267 267
                    existing.find(' .wave').hide();

Also available in: Unified diff