4:22 a.m.
From: Rajat Gupta <rajggupta(a)linux.vnet.ibm.com>
For s390x Virtualization under Edit Template display "Storage"
as header instead of "Storage Pool"
Signed-off-by: Rajat Gupta <rajggupta(a)linux.vnet.ibm.com>
---
ui/css/kimchi.css | 23 ++++++++++++-----------
ui/css/src/modules/_templates.scss | 3 +++
ui/js/src/kimchi.template_edit_main.js | 2 ++
ui/pages/template-edit.html.tmpl | 1 +
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css
index ba66785..de23053 100644
--- a/ui/css/kimchi.css
+++ b/ui/css/kimchi.css
@@ -96,7 +96,7 @@
#guest-add-window.modal-content label.box-iso-outer span.box-iso-border {
display: block;
border: 3px solid transparent;
- transition: all 0.1s ease-in-out;
+ transition: all .1s ease-in-out;
}
#template-add-window.modal-content label.box-iso-outer .iso-radio-hidden:checked +
span.box-iso-border,
@@ -118,7 +118,7 @@
display: block;
border: 1px solid transparent;
background: #fff;
- transition: all 0.1s ease-in-out;
+ transition: all .1s ease-in-out;
}
#template-add-window.modal-content label.box-iso-outer span.box-iso-inner
.tooltip-inner,
@@ -1456,7 +1456,7 @@ body.wok-gallery {
border: 1px solid #eee !important;
margin-bottom: 3px;
display: block;
- padding: 0.2em 0.6em 0.3em;
+ padding: .2em .6em .3em;
font-weight: 700;
line-height: 1;
text-align: left;
@@ -1687,6 +1687,10 @@ body.wok-gallery {
width: 180px !important;
}
+#template-edit-window .template-storage-cell.storage {
+ width: 180px !important;
+}
+
#template-edit-window .template-storage-cell.storage-path {
width: 180px !important;
}
@@ -1750,7 +1754,7 @@ body.wok-gallery {
height: 664px;
width: 2164px;
left: 0;
- transition: left 0.2s ease-in-out;
+ transition: left .2s ease-in-out;
}
#template-add-window.modal-content p {
@@ -2137,9 +2141,7 @@ body.wok-gallery {
font-size: 32px;
}
-#templates-root-container .wok-vm-gallery .item-hidden.column-type,
-#templates-root-container .wok-vm-gallery .item-hidden.column-version,
-#templates-root-container .wok-vm-gallery .item-hidden.column-processors {
+#templates-root-container .wok-vm-gallery .item-hidden.column-type,
#templates-root-container .wok-vm-gallery .item-hidden.column-version,
#templates-root-container .wok-vm-gallery .item-hidden.column-processors {
padding-bottom: 11px;
}
@@ -2565,7 +2567,7 @@ body.wok-gallery {
border-style: solid;
border-color: transparent;
border-color: rgba(255, 255, 255, 0);
- transition: border-color 0.1s ease-in-out;
+ transition: border-color .1s ease-in-out;
}
#storage-root-container .volumes .wok-gallery .volume-box-inner {
@@ -2579,7 +2581,7 @@ body.wok-gallery {
border-style: solid;
border-color: #fff;
background: #fff;
- transition: border-color 0.1s ease-in-out;
+ transition: border-color .1s ease-in-out;
}
#storage-root-container .volumes .wok-gallery span.column-name,
@@ -3060,8 +3062,7 @@ body.wok-gallery {
white-space: nowrap;
}
-.storage-modal .filter-select.popable .popover ul li:hover,
-.storage-modal .filter-select.popable .popover ul li:focus,
+.storage-modal .filter-select.popable .popover ul li:hover, .storage-modal
.filter-select.popable .popover ul li:focus,
.storage-modal .storage-target-input .popover ul li:hover,
.storage-modal .storage-target-input .popover ul li:focus,
.storage-modal .storage-add-input .popover ul li:hover,
diff --git a/ui/css/src/modules/_templates.scss b/ui/css/src/modules/_templates.scss
index be7e5bc..eec5878 100644
--- a/ui/css/src/modules/_templates.scss
+++ b/ui/css/src/modules/_templates.scss
@@ -160,6 +160,9 @@ $kimchi-icon-path: '../images';
.template-storage-cell.storage-pool {
width: 180px !important;
}
+ .template-storage-cell.storage {
+ width: 180px !important;
+ }
.template-storage-cell.storage-path {
width: 180px !important;
}
diff --git a/ui/js/src/kimchi.template_edit_main.js
b/ui/js/src/kimchi.template_edit_main.js
index 3e4ae29..31cb8d9 100644
--- a/ui/js/src/kimchi.template_edit_main.js
+++ b/ui/js/src/kimchi.template_edit_main.js
@@ -307,6 +307,8 @@ kimchi.template_edit_main = function() {
$(storageRow + ' #diskFormat').val('raw');
$(storageRow + ' #diskFormat').prop('disabled',
true).change();
}
+ $('#form-template-storage .template-tab-header
span.storage-pool').hide();
+ $('#form-template-storage .template-tab-header
span.storage').show();
//set source
$('#form-template-storage span.source').show();
diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl
index 10532be..88454dc 100644
--- a/ui/pages/template-edit.html.tmpl
+++ b/ui/pages/template-edit.html.tmpl
@@ -122,6 +122,7 @@
<div class="template-tab-header">
<span class="template-storage-cell source"
style="display:none">$_("Source")</span>
<span class="template-storage-cell
storage-pool">$_("Storage Pool")</span>
+ <span class="template-storage-cell storage"
style="display:none">$_("Storage")</span>
<span class="template-storage-cell
type">$_("Type")</span>
<span class="template-storage-cell
disk">$_("Disk(GB)")</span>
<span class="template-storage-cell
format">$_("Disk Format")</span>
--
2.1.0