diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html index 499dd3e..2c314bf 100644 --- a/instances/templates/create_instance_w2.html +++ b/instances/templates/create_instance_w2.html @@ -178,12 +178,6 @@
-
- -
- -
-
@@ -206,6 +200,12 @@
+
+ +
+ +
+
{% if dom_caps.graphics_support == 'yes' %}
@@ -396,7 +396,6 @@ {% endfor %}
-
@@ -602,17 +601,14 @@
- -
+ +
-
- -
@@ -814,39 +810,21 @@ let input_value = toggleValue($('#networks').val(), element.val(), checked); $('#networks').val(input_value); let selected_list_html = ''; - mac_array = []; - net_counter = 0; + let counter = 0; if (input_value != '') { $.each(input_value.split(','), function (index, value) { - let li = '
  • ' + - ' eth' + net_counter + + let li = '
  • eth' + counter + ' -> ' + value + ' ' + '
  • '; - random_mac(net_counter); selected_list_html += li; - net_counter++; + counter++; }); - } $('#net-list').html(selected_list_html); } }); }); - var mac_array = []; - function random_mac(c) { - $.getJSON("{% url 'instances:random_mac_address' %}", function (data) { - mac_array[c] = data['mac']; - $('input[name="mac' + c + '"').val(data['mac']); - populate_mac(c); - }); - } - - function populate_mac(c){ - mac_array[c] = $('input[name="mac' + c + '"').val(); - $('input[name="mac"').val(mac_array.join(",")); - } - $("id[vcpu_mode]").multiselect(); function get_cust_vols(compute_id, pool) { @@ -888,7 +866,7 @@ {% if request.user.is_superuser %} diff --git a/static/css/webvirtcloud.css b/static/css/webvirtcloud.css index 5767098..d1fbdf7 100644 --- a/static/css/webvirtcloud.css +++ b/static/css/webvirtcloud.css @@ -173,11 +173,3 @@ p { a { outline: 0; } - -.input-xs { - height: 22px; - padding: 2px 5px; - font-size: 12px; - line-height: 1.5; /* If Placeholder of the input is moved up, rem/modify this. */ - border-radius: 2px; - } \ No newline at end of file diff --git a/vrtManager/create.py b/vrtManager/create.py index fcae692..9cdaca4 100644 --- a/vrtManager/create.py +++ b/vrtManager/create.py @@ -338,12 +338,10 @@ class wvmCreate(wvmConnect): xml += """""" % (vd_disk_letters.pop(0), "virtio") xml += """""" - if mac: - macs = mac.split(',') - for idx, net in enumerate(networks.split(",")): + for net in networks.split(","): xml += """""" if mac: - xml += f"""""" + xml += f"""""" xml += f"""""" if nwfilter: xml += f""""""