diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 5735ccd5a38..c4dbc41f27d 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -14,6 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +label.root.disk.size=Root disk size label.s3.nfs.server=S3 NFS Server label.s3.nfs.path=S3 NFS Path label.delete.events=Delete events diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index b5222cb8a5e..783b33e5e7a 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -5977,11 +5977,11 @@ label.error { margin-top: 9px !important; } -.multi-wizard.instance-wizard .data-disk-offering.required.custom-disk-size .select-container { +.multi-wizard.instance-wizard .custom-disk-size .select-container { height: 279px; } -.multi-wizard.instance-wizard .data-disk-offering.custom-disk-size .select-container { +.multi-wizard.instance-wizard .custom-disk-size .select-container { height: 213px; margin: -7px 6px 0 8px; /*+border-radius:6px;*/ @@ -5992,21 +5992,21 @@ label.error { border-radius: 6px 6px 6px 6px; } -.multi-wizard.instance-wizard .data-disk-offering .content .section input { +.multi-wizard.instance-wizard .content .section input { float: left; } -.multi-wizard.instance-wizard .data-disk-offering .content .section input[type=radio] { +.multi-wizard.instance-wizard .content .section input[type=radio] { margin: 8px 2px 0 17px; } -.multi-wizard.instance-wizard .data-disk-offering .content .section label { +.multi-wizard.instance-wizard .content .section label { display: block; float: left; margin: 10px 7px 7px; } -.multi-wizard.instance-wizard .data-disk-offering .content .section label.size { +.multi-wizard.instance-wizard .content .section label.size { color: #647A8E; font-weight: bold; /*+text-shadow:0px 1px 1px #FFFFFF;*/ @@ -6016,21 +6016,24 @@ label.error { text-shadow: 0px 1px 1px #FFFFFF; } -.multi-wizard.instance-wizard .data-disk-offering .content .section.custom-size { +.multi-wizard.instance-wizard .section.custom-size { position: relative; + background: white; + padding: 7px; + border-radius: 4px; } -.multi-wizard.instance-wizard .data-disk-offering .content .section.custom-size input[type=radio] { +.multi-wizard.instance-wizard .section.custom-size input[type=radio] { float: left; } -.multi-wizard.instance-wizard .data-disk-offering .content .section.custom-size input[type=text] { +.multi-wizard.instance-wizard .section.custom-size input[type=text] { float: left; width: 28px; margin: 6px -1px 0 8px; } -.multi-wizard.instance-wizard .data-disk-offering .content .section.custom-size label.error { +.multi-wizard.instance-wizard .section.custom-size label.error { position: absolute; top: 29px; left: 242px; diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 9ab644b966a..32313d8265b 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,7 @@ under the License. <% long now = System.currentTimeMillis(); %>