From 1105d3c46de2eac06404b9a6db0f03ca397ac342 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Wed, 23 Oct 2013 08:16:38 +0400 Subject: [PATCH] Resolved issue with checkbox layouts Fixed bug #1242656 Change-Id: I62b0f49a82ecc8c38bbea4b054f8210510c5261c --- muranodashboard/services/LinuxTelnet.yaml | 21 ++++++++++++++++--- .../services/MsSqlClusterServer.yaml | 19 +++++++++-------- muranodashboard/services/MsSqlServer.yaml | 19 +++++++++-------- .../static/muranodashboard/css/checkbox.css | 5 +++++ .../static/muranodashboard/js/mixed-mode.js | 1 - 5 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 muranodashboard/static/muranodashboard/css/checkbox.css diff --git a/muranodashboard/services/LinuxTelnet.yaml b/muranodashboard/services/LinuxTelnet.yaml index 7b9372fe4..84c5a77d0 100644 --- a/muranodashboard/services/LinuxTelnet.yaml +++ b/muranodashboard/services/LinuxTelnet.yaml @@ -1,4 +1,4 @@ -name: Linux Telnet Service +name: Linux Telnet type: linuxTelnetService description: >- @@ -11,11 +11,26 @@ unitTemplates: forms: - serviceConfiguration: fields: + - name: title + type: string + required: false + hidden: true + attributeNames: false + description: Telnet service that can be installed at linux + widgetMedia: + css: {all: [muranodashboard/css/checkbox.css]} - name: name type: string label: Service Name description: >- - To identify your service in logs please specify a service name + Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and + underline are allowed. + minLength: 2 + maxLength: 64 + regexpValidator: '^[-\w]+$' + errorMessages: + invalid: Just letters, numbers, underscores and hyphens are allowed. + helpText: Just letters, numbers, underscores and hyphens are allowed. - name: dcInstances type: instance hidden: true @@ -68,4 +83,4 @@ forms: type: azone label: Availability zone description: Select availability zone where service would be installed. - required: false \ No newline at end of file + required: false diff --git a/muranodashboard/services/MsSqlClusterServer.yaml b/muranodashboard/services/MsSqlClusterServer.yaml index 3c1be0a7f..f8a5ab6d7 100644 --- a/muranodashboard/services/MsSqlClusterServer.yaml +++ b/muranodashboard/services/MsSqlClusterServer.yaml @@ -2,7 +2,7 @@ name: MS SQL Server Cluster type: msSqlClusterServer description: >- - The MS SQL Failover Cluster installs + The MS SQL Failover Cluster installs Microsoft SQL Failover Cluster Server unitTemplates: @@ -28,11 +28,12 @@ forms: # temporaryHack widgetMedia: js: [muranodashboard/js/mixed-mode.js, muranodashboard/js/external-ad.js] + css: {all: [muranodashboard/css/checkbox.css]} - name: name type: string label: Service Name description: >- - Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and + Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and underline are allowed. minLength: 2 maxLength: 64 @@ -46,8 +47,8 @@ forms: descriptionTitle: Passwords description: >- Windows requires strong password for service administration. - Your password should have at least one letter in each - register, a number and a special character. Password length should be + Your password should have at least one letter in each + register, a number and a special character. Password length should be a minimum of 7 characters. - name: externalAD type: boolean @@ -71,7 +72,7 @@ forms: label: Domain enabled: {YAQL: not $.serviceConfiguration.externalAD} description: >- - Service can be joined to the Active Directory domain. If you want to + Service can be joined to the Active Directory domain. If you want to create an AD domain create the AD Service first. helpText: Optional field for a domain to which service can be joined - name: mixedModeAuth @@ -147,8 +148,8 @@ forms: label: Hostname template description: >- For your convenience all instance hostnames can be named - in the same way. Enter a name and use # character for incrementation. - For example, host# turns into host1, host2, etc. Please follow Windows + in the same way. Enter a name and use # character for incrementation. + For example, host# turns into host1, host2, etc. Please follow Windows hostname restrictions. required: false regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$' @@ -214,7 +215,7 @@ forms: type: flavor label: Instance flavor description: >- - Select registered in Openstack flavor. Consider that service performance + Select registered in Openstack flavor. Consider that service performance depends on this parameter. required: false - name: osImage @@ -222,7 +223,7 @@ forms: imageType: windows label: Instance image description: >- - Select valid image for a service. Image should already be prepared and + Select valid image for a service. Image should already be prepared and registered in glance. - name: availabilityZone type: azone diff --git a/muranodashboard/services/MsSqlServer.yaml b/muranodashboard/services/MsSqlServer.yaml index edd06c396..f9f360f19 100644 --- a/muranodashboard/services/MsSqlServer.yaml +++ b/muranodashboard/services/MsSqlServer.yaml @@ -2,7 +2,7 @@ name: MS SQL Server type: msSqlServer description: >- - The MS SQL Service installs an instance of + The MS SQL Service installs an instance of Microsoft SQL Server unitTemplates: @@ -20,11 +20,12 @@ forms: # temporaryHack widgetMedia: js: [muranodashboard/js/mixed-mode.js] + css: {all: [muranodashboard/css/checkbox.css]} - name: name type: string label: Service Name description: >- - Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and + Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and underline are allowed. minLength: 2 maxLength: 64 @@ -43,15 +44,15 @@ forms: descriptionTitle: Passwords description: >- Windows requires strong password for service administration. - Your password should have at least one letter in each - register, a number and a special character. Password length should be + Your password should have at least one letter in each + register, a number and a special character. Password length should be a minimum of 7 characters. - name: domain type: domain label: Domain required: false description: >- - Service can be joined to the Active Directory domain. If you want to + Service can be joined to the Active Directory domain. If you want to create an AD domain create the AD Service first. helpText: Optional field for a domain to which service can be joined - name: mixedModeAuth @@ -75,8 +76,8 @@ forms: label: Hostname template description: >- For your convenience all instance hostnames can be named - in the same way. Enter a name and use # character for incrementation. - For example, host# turns into host1, host2, etc. Please follow Windows + in the same way. Enter a name and use # character for incrementation. + For example, host# turns into host1, host2, etc. Please follow Windows hostname restrictions. required: false regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$' @@ -98,7 +99,7 @@ forms: type: flavor label: Instance flavor description: >- - Select registered in Openstack flavor. Consider that service performance + Select registered in Openstack flavor. Consider that service performance depends on this parameter. required: false - name: osImage @@ -106,7 +107,7 @@ forms: imageType: windows label: Instance image description: >- - Select valid image for a service. Image should already be prepared and + Select valid image for a service. Image should already be prepared and registered in glance. - name: availabilityZone type: azone diff --git a/muranodashboard/static/muranodashboard/css/checkbox.css b/muranodashboard/static/muranodashboard/css/checkbox.css new file mode 100644 index 000000000..72f8a0ec0 --- /dev/null +++ b/muranodashboard/static/muranodashboard/css/checkbox.css @@ -0,0 +1,5 @@ +input[type="checkbox"] { + float: left; + width: auto !important; + margin-right: 10px; +} diff --git a/muranodashboard/static/muranodashboard/js/mixed-mode.js b/muranodashboard/static/muranodashboard/js/mixed-mode.js index 430a2a08c..bb2a0992c 100644 --- a/muranodashboard/static/muranodashboard/js/mixed-mode.js +++ b/muranodashboard/static/muranodashboard/js/mixed-mode.js @@ -24,5 +24,4 @@ $(function() { $("input[id*='mixedModeAuth']").change(check_mixed_mode); check_mixed_mode(); - $(".checkbox").css({'float': 'left', 'width': 'auto', 'margin-right': '10px'}) });