Procházet zdrojové kódy

修正冲突的id名称。调整合适的ICON。

James Iter před 8 roky
rodič
revize
855f8a2539
2 změnil soubory, kde provedl 6 přidání a 6 odebrání
  1. 3 3
      templates/guest_detail.html
  2. 3 3
      templates/guests_show.html

+ 3 - 3
templates/guest_detail.html

@@ -1004,7 +1004,7 @@
 
     $(function() { "use strict";
         $("#bps").TouchSpin({
-            max: {{ config_ret.data.bps_cap / 1024 / 1024 | int }},
+            max: {{ (config_ret.data.bps_cap / 1024 / 1024) | int }},
             min: 1,
             verticalbuttons: true,
             verticalupclass: 'glyph-icon icon-plus',
@@ -1208,12 +1208,12 @@
             <div class="modal-body" style="padding-left: 8%;">
                 <form id="change_disk_quota_form" class="form-horizontal">
                     <div class="form-group" style="margin-bottom: 0;">
-                        <label class="col-sm-2 control-label"><span class="glyph-icon icon-elusive-th-list"></span>&nbsp;&nbsp;IOPS</label>
+                        <label class="col-sm-2 control-label"><span class="glyph-icon icon-exchange" style="transform: rotate(90deg); display: inline-flex;"></span>&nbsp;&nbsp;IOPS</label>
                         <div class="col-sm-3">
                             <input id="iops" title="IOPS" class="form-control" type="text" value="{{ config_ret.data.iops_base }}" name="iops">
                         </div>
                         <span class="col-sm-1"></span>
-                        <label class="col-sm-2 control-label"><span class="glyph-icon icon-elusive-th-list"></span>&nbsp;&nbsp;BPS(MiB)</label>
+                        <label class="col-sm-2 control-label"><span class="glyph-icon icon-openid"></span>&nbsp;&nbsp;BPS(MiB)</label>
                         <div class="col-sm-3">
                             <input id="bps" title="BPS" class="form-control" type="text" value="{{ config_ret.data.bps_base / 1024 / 1024 | int }}" name="bps">
                         </div>

+ 3 - 3
templates/guests_show.html

@@ -136,7 +136,7 @@
         });
 
         $('#edit_remark_modal').on('show.bs.modal', function (me) {
-            $('#instance_uuid').val($(me.relatedTarget).parent().parent().prev().prev().text());
+            $('#edit_remark_instance_uuid').val($(me.relatedTarget).parent().parent().prev().prev().text());
             $('#edit_remark').val($(me.relatedTarget).prev().text());
         });
 
@@ -216,7 +216,7 @@
     }
 
     function remark_update(me) {
-        var uuid = $('#instance_uuid').val();
+        var uuid = $('#edit_remark_instance_uuid').val();
         var remark = $('#edit_remark').val();
         $('#edit_remark_modal').modal('hide');
         $.ajax({
@@ -870,7 +870,7 @@
                 <h4 class="modal-title">编辑实例名称:</h4>
             </div>
             <div class="modal-body">
-                <input id="instance_uuid" title="实例 UUID" class="form-control" name="uuid" hidden>
+                <input id="edit_remark_instance_uuid" title="实例 UUID" class="form-control" name="uuid" hidden>
                 <input id="edit_remark" title="实例名称" class="form-control" name="remark">
             </div>
             <div class="modal-footer">