Commit d52728df authored by Vangelis Koukis's avatar Vangelis Koukis
Browse files

Merge branch 'ui-refactor'

parents 57cb017e f25a2188
......@@ -28,10 +28,14 @@ div.confirm_single button {
position: relative;
}
.firewall .cont-toggler {
.single .cont-toggler, .firewall .cont-toggler {
float: left;
}
.network-machines .cont-toggler {
float: left;
}
.overlay-networks-create .form-actions {
float: none;
}
......@@ -21,8 +21,8 @@
var settings = $.extend({
maxFields: 5,
removeImgSrc: "/static/cross.png",
spacerImgSrc: "/static/spacer.gif",
removeImgSrc: "/static/invitations/cross.png",
spacerImgSrc: "/static/invitations/spacer.gif",
addTriggerClass: "add-field-trigger",
removeImgClass: "remove-field-trigger",
hideClass: "hide",
......
......@@ -48,7 +48,7 @@
'vms': '.single-container',
'vm': '#single-vm-',
'view': '#machinesview-single',
'tpl': 'div.single-container#machine-container-template',
'tpl': '.single-container-template',
'spinner': '.large-spinner',
'vm_spinner': '#single-vm-{0} .state .spinner',
'vm_wave': '#single-vm-{0} img.wave',
......@@ -151,6 +151,7 @@
// stuff to do when a new vm has been created.
// - create vm subviews
post_add: function(vm) {
this.vm(vm).removeClass("single-container-template");
this.show_vm_menu();
this.show_current();
......
......@@ -34,7 +34,7 @@
<script src="{{ SYNNEFO_JS_LIB_URL}}json2.js"></script>
<script src="{{ SYNNEFO_JS_LIB_URL}}stacktrace.js"></script>
<!--[if (gte IE 6)&(lte IE 7)]>
<!--[if (lt IE 7)]>
<script src="{{ SYNNEFO_JS_LIB_URL}}selectivizr.js"></script>
<! [endif] -->
......
{% load i18n %}
<div id="machinesview-single" class="single">
<div class="large-spinner"></div>
<div class="single-container" id="machine-container-template" style="display:none;" >
<div class="single-container single-container-template" id="machine-container-template" style="display:none;" >
<div class="clearfix upper">
<div class="column1">
<div class='connect-border' title='{% trans 'Connect to machine' %}'></div>
<div class='connect-arrow' title='{% trans 'Connect to machine' %}'></div>
<div class="connect-border" title="{% trans 'Connect to machine' %}"></div>
<div class="connect-arrow" title="{% trans 'Connect to machine' %}"></div>
<div class="single-image logo"></div>
<div class="state">
<span class="state-label">{% trans "Running" %}</span>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment