From 31a7f2acc22ab7a7ac5fa6b9d47bccc5f799f21c Mon Sep 17 00:00:00 2001
From: Kálmán Viktor <kviktor@cloud.bme.hu>
Date: Tue, 7 Oct 2014 13:19:41 +0200
Subject: [PATCH] dashboard: fix vm migrate
---
circle/dashboard/static/dashboard/dashboard.css | 4 ++++
circle/dashboard/static/dashboard/dashboard.js | 11 +++++++++++
circle/dashboard/static/dashboard/vm-common.js | 9 ---------
circle/dashboard/templates/dashboard/_vm-migrate.html | 14 ++++++++------
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/circle/dashboard/static/dashboard/dashboard.css b/circle/dashboard/static/dashboard/dashboard.css
index 4e90b8b..c0a12ed 100644
--- a/circle/dashboard/static/dashboard/dashboard.css
+++ b/circle/dashboard/static/dashboard/dashboard.css
@@ -1012,3 +1012,7 @@ textarea[name="new_members"] {
.disk-resize-btn {
margin-right: 5px;
}
+
+#vm-migrate-node-list li {
+ cursor: pointer;
+}
diff --git a/circle/dashboard/static/dashboard/dashboard.js b/circle/dashboard/static/dashboard/dashboard.js
index a497d6b..bc15c45 100644
--- a/circle/dashboard/static/dashboard/dashboard.js
+++ b/circle/dashboard/static/dashboard/dashboard.js
@@ -411,6 +411,17 @@ $(function () {
$(this).removeClass("btn-default").addClass("btn-primary");
return false;
});
+
+ // vm migrate select for node
+ $(document).on("click", "#vm-migrate-node-list li", function(e) {
+ var li = $(this).closest('li');
+ if (li.find('input').attr('disabled'))
+ return true;
+ $('#vm-migrate-node-list li').removeClass('panel-primary');
+ li.addClass('panel-primary').find('input').prop("checked", true);
+ return true;
+ });
+
});
function generateVmHTML(pk, name, host, icon, _status, fav, is_last) {
diff --git a/circle/dashboard/static/dashboard/vm-common.js b/circle/dashboard/static/dashboard/vm-common.js
index c7ea6f2..66d6f71 100644
--- a/circle/dashboard/static/dashboard/vm-common.js
+++ b/circle/dashboard/static/dashboard/vm-common.js
@@ -16,15 +16,6 @@ $(function() {
$('#confirmation-modal').on('hidden.bs.modal', function() {
$('#confirmation-modal').remove();
});
-
- $('#vm-migrate-node-list li').click(function(e) {
- var li = $(this).closest('li');
- if (li.find('input').attr('disabled'))
- return true;
- $('#vm-migrate-node-list li').removeClass('panel-primary');
- li.addClass('panel-primary').find('input').attr('checked', true);
- return false;
- });
$('#vm-migrate-node-list li input:checked').closest('li').addClass('panel-primary');
}
});
diff --git a/circle/dashboard/templates/dashboard/_vm-migrate.html b/circle/dashboard/templates/dashboard/_vm-migrate.html
index 205228a..96918e8 100644
--- a/circle/dashboard/templates/dashboard/_vm-migrate.html
+++ b/circle/dashboard/templates/dashboard/_vm-migrate.html
@@ -18,18 +18,20 @@ Choose a compute node to migrate {{obj}} to.
<li class="panel panel-default"><div class="panel-body">
<label for="migrate-to-{{n.pk}}">
<strong>{{ n }}</strong>
- <div class="label label-primary"><i class="fa {{n.get_status_icon}}"></i>
- {{n.get_status_display}}</div>
+ <div class="label label-primary">
+ <i class="fa {{n.get_status_icon}}"></i> {{n.get_status_display}}</div>
{% if current == n.pk %}<div class="label label-info">{% trans "current" %}</div>{% endif %}
{% if recommended == n.pk %}<div class="label label-success">{% trans "recommended" %}</div>{% endif %}
</label>
<input id="migrate-to-{{n.pk}}" type="radio" name="node" value="{{ n.pk }}" style="float: right;"
- {% if current == n.pk %}disabled="disabled"{% endif %}
- {% if recommended == n.pk %}checked="checked"{% endif %} />
+ {% if current == n.pk %}disabled="disabled"{% endif %}
+ {% if recommended == n.pk %}checked="checked"{% endif %}
+ />
<span class="vm-migrate-node-property">{% trans "CPU load" %}: {{ n.cpu_usage }}</span>
- <span class="vm-migrate-node-property">{% trans "RAM usage" %}: {{ n.byte_ram_usage|filesize }}/{{ n.ram_size|filesize }}</span>
+ <span class="vm-migrate-node-property">
+ {% trans "RAM usage" %}: {{ n.byte_ram_usage|filesize }}/{{ n.ram_size|filesize }}</span>
<div style="clear: both;"></div>
- </div></li>
+ </li>
{% endfor %}
{% endwith %}
</ul>
--
libgit2 0.26.0