Revision b495fe50

b/ui/static/main.css
902 902
    padding-bottom: 15px;
903 903
    width: 699px;
904 904
    min-height: 50px;
905
    padding-top: 60px;
906 905
}
907 906

  
908 907
.running-state .indicator1, .running-state .indicator2, .running-state .indicator3, .running-state .indicator4 {
......
1809 1808
    border-bottom: 5px solid #4085A5;
1810 1809
    min-height: 150px;
1811 1810
    top: 120px !important;
1811
    position: absolute !important;
1812 1812
}
1813 1813

  
1814 1814
#error-success p {
......
2024 2024
    position: absolute;
2025 2025
    width: 698px;
2026 2026
    height: 28px;
2027
    margin: 15px 0 10px -35px;
2027
    margin-top: 15px;
2028 2028
}
2029 2029

  
2030 2030
div.confirm_multiple p {
b/ui/templates/home.html
136 136
            'CREATE_VM_SUCCESS_FOUR' : '{% trans "After closing this window you will NOT be able to retrieve it again." %}'
137 137
        };
138 138

  
139
        var VARIOUS = {
140
            'CONFIRM' : '{% trans "Confirm" %}',
141
            'CANCEL' : '{% trans "Cancel" %}'
142
        };
143

  
139 144
        // ajax error checking
140 145
        function ajax_error(status, serverID, action, responseText) {
141 146
            $('#error-success').addClass('error');
......
330 335
                    <div id="networks-pane" class="pane"></div>
331 336
                    <div id="disks-pane" class="pane"></div>
332 337
                </div>
333
                <!-- base notification for error/success reporting -->
334
                <a id="notification" rel="#error-success" href="#"></a>
335

  
336
                <div class="modal" id="error-success">
337
                    <h3 class="popup-header">
338
                        <span class="header-box"></span>
339
                    </h3>
340
                    <div class="popup-body">
341
                        <div class="popup-body-inner">
342
                            <div class="machine-now-building"></div>
343
                            <div class="popup-separator"></div>
344
                            <div class="password-container">
345
                                <div class="password-header"></div>
346
                                <div class="password"></div>
347
                            </div>
348
                            <div class="popup-details">
349
                                <div class="write-password"></div>
350
                                <div class="write-password-details">{% trans "More details about the result"%}</div>
351
                            </div>
352
                        </div>
353
                    </div>
354
                </div>
355 338
            </div>
356 339
        </div>
357 340
        {% include "footer.html" %}
......
397 380
        );
398 381
        
399 382
    </script>
383
    <!-- base notification for error/success reporting -->
384
    <a id="notification" rel="#error-success" href="#"></a>
385

  
386
    <div class="modal" id="error-success">
387
        <h3 class="popup-header">
388
            <span class="header-box"></span>
389
        </h3>
390
        <div class="popup-body">
391
            <div class="popup-body-inner">
392
                <div class="machine-now-building"></div>
393
                <div class="popup-separator"></div>
394
                <div class="password-container">
395
                    <div class="password-header"></div>
396
                    <div class="password"></div>
397
                </div>
398
                <div class="popup-details">
399
                    <div class="write-password"></div>
400
                    <div class="write-password-details">{% trans "More details about the result"%}</div>
401
                </div>
402
            </div>
403
        </div>
404
    </div>
400 405
</body>
401 406
</html>
b/ui/templates/machines_list.html
253 253
        // check server status to select the appropriate OS icon, defaults to on state
254 254
        osTag = os_icon(server.metadata);
255 255
        var osIcon = osTag + "-on.png", imgStr, imgSrc;
256

  
257 256
        // check if the server already exists in the datatable
258
        tableData.forEach(function(row,index){
259

  
260
            if (row[0].split(' ')[2].replace('id=','') == server.id){
261
                current = index;
262
            }
263
        });
257
        if (tableData.length > 0) {
258
            tableData.forEach(function(row,index){
259
                if (row[0].split(' ')[2].replace('id=','') == server.id){
260
                    current = index;
261
                }
262
            });
263
        }
264 264
        if (current != -1) { // if it's there, update the values
265 265
            // get current status description, including non api states
266 266
            var server_row = $('#machinesview .list #' + server.id).parent().parent();
......
382 382

  
383 383
    $('#machinesview .list .dataTables_scrollHeadInner table').attr('style','');
384 384
    $('#machinesview .list .dataTables_scrollHeadInner th').attr('style','');
385

  
386 385
}
387 386

  
388 387
function display_success(serverID) {
......
438 437
});
439 438

  
440 439
// set the label of the multiple buttons
441
$('.confirm_multiple button.yes').text({% trans 'Confirm' %});
442
$('.confirm_multiple button.no').text({% trans 'Cancel' %});
440
$('.confirm_multiple button.yes').text(VARIOUS["CONFIRM"]);
441
$('.confirm_multiple button.no').text(VARIOUS["CANCEL"]);
443 442
</script>

Also available in: Unified diff