Skip to content

Gelencsér Szabolcs / circlestack

Go to a project
Commit 8d0363a3 by Kálmán Viktor
Options

dashboard: remove additional disk add function in vm create

parent 1069d8d0
Showing with 32 additions and 37 deletions
circle/dashboard/forms.py
...@@ -185,32 +185,36 @@ class VmCustomizeForm(forms.Form): ...@@ -185,32 +185,36 @@ class VmCustomizeForm(forms.Form):
HTML(_("No disks are added!")), HTML(_("No disks are added!")),
css_id="vm-create-disk-list", css_id="vm-create-disk-list",
), ),
AnyTag(
"h3",
Div(
AnyTag(
"select",
css_class="form-control",
css_id="vm-create-disk-add-select",
),
Div( Div(
AnyTag( HTML(""),
"a", style="clear: both;",
AnyTag( ),
"i", # AnyTag(
css_class="icon-plus-sign", # "h3",
), # Div(
href="#", # AnyTag(
css_id="vm-create-disk-add-button", # "select",
css_class="btn btn-success", # css_class="form-control",
), # css_id="vm-create-disk-add-select",
css_class="input-group-btn" # ),
), # Div(
css_class="input-group", # AnyTag(
style="max-width: 330px;", # "a",
), # AnyTag(
css_id="vm-create-disk-add", # "i",
), # css_class="icon-plus-sign",
# ),
# href="#",
# css_id="vm-create-disk-add-button",
# css_class="btn btn-success",
# ),
# css_class="input-group-btn"
# ),
# css_class="input-group",
# style="max-width: 330px;",
# ),
# css_id="vm-create-disk-add",
# ),
css_class="no-js-hidden", css_class="no-js-hidden",
), ),
css_class="col-sm-8", css_class="col-sm-8",
......
circle/dashboard/static/dashboard/vm-create.js
...@@ -202,23 +202,13 @@ function vmCustomizeLoaded() { ...@@ -202,23 +202,13 @@ function vmCustomizeLoaded() {
/* remove disk */ /* remove disk */
// event for disk remove button (icon, X) // event for disk remove button (icon, X)
$('body').on('click', '.vm-create-remove-disk', function() { $('body').on('click', '.vm-create-remove-disk', function() {
var disk_pk = ($(this).parent('span').prop('id')).replace('vlan-', '') var disk_pk = ($(this).parent('span').prop('id')).replace('disk-', '')
$(this).parent('span').fadeOut(500, function() { $(this).parent('span').fadeOut(500, function() {
/* if ther are no more disks disabled the add button */
if($('#vm-create-disk-add-select option')[0].value == -1) {
$('#vm-create-disk-add-button').attr('disabled', false);
$('#vm-create-disk-add-select').html('');
}
/* remove the disk label */ /* remove the disk label */
$(this).remove(); $(this).remove();
var disk_name = $(this).text(); var disk_name = $(this).text();
$('#vm-create-disk-add-select').append($('<option>', {
value: disk_pk,
text: disk_name
}));
/* remove the selection from the multiple select */ /* remove the selection from the multiple select */
$('#vm-create-disk-add-form option[value="' + disk_pk + '"]').prop('selected', false); $('#vm-create-disk-add-form option[value="' + disk_pk + '"]').prop('selected', false);
...@@ -300,5 +290,6 @@ function vmCreateNetworkLabel(pk, name, managed) { ...@@ -300,5 +290,6 @@ function vmCreateNetworkLabel(pk, name, managed) {
function vmCreateDiskLabel(pk, name) { function vmCreateDiskLabel(pk, name) {
return '<span id="vlan-' + pk + '" class="label label-primary"><i class="icon-file"></i> ' + name + ' <a href="#" class="hover-black vm-create-remove-disk"><i class="icon-remove-sign"></i></a></span> '; var style = "float: left; margin: 5px;";
return '<span id="disk-' + pk + '" class="label label-primary" style="' + style + '"><i class="icon-file"></i> ' + name + ' <a href="#" class="hover-black vm-create-remove-disk"><i class="icon-remove-sign"></i></a></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 sign in to comment