Merge pull request #12259 from mikedahlgren/patch-3

Fix provider input field lengths to be consistent
ManageIQ · Nov 1, 2016 · 814d77c · 814d77c
2 parents b4916f9 + 4b68b60
commit 814d77c
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/app/views/ems_container/_form.html.haml b/app/views/ems_container/_form.html.haml
@@ -6,7 +6,7 @@
     .form-group{"ng-class" => "{'has-error': angularForm.name.$invalid}"}
       %label.col-md-2.control-label{"for" => "ems_name"}
         = _('Name')
-      .col-md-8
+      .col-md-4
         %input.form-control{"type"           => "text",
                             "id"             => "ems_name",
                             "name"           => "name",
@@ -44,7 +44,7 @@
     .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
       %label.col-md-2.control-label{"for" => "ems_zone"}
         = _("Zone")
-      .col-md-8
+      .col-md-4
         - if @server_zones.length <= 1
           %input.form-control{"type"      => "text",
                               "id"        => "ems_zone",

diff --git a/app/views/ems_container/_form_fields.html.haml b/app/views/ems_container/_form_fields.html.haml
@@ -2,7 +2,7 @@
   .form-group
     %label.control-label.col-md-2
       = _('Hostname or IP address')
-    .col-md-8
+    .col-md-4
       = text_field_tag("hostname",
         @edit[:new][:hostname],
         :maxlength         => MAX_HOSTNAME_LEN,
@@ -12,7 +12,7 @@
   .form-group
     %label.control-label.col-md-2
       = _('Port')
-    .col-md-8
+    .col-md-2
       = text_field_tag("port",
         @edit[:new][:port],
         :maxlength         => 5,

diff --git a/app/views/ems_infra/_form.html.haml b/app/views/ems_infra/_form.html.haml
@@ -6,7 +6,7 @@
     .form-group{"ng-class" => "{'has-error': angularForm.name.$invalid}"}
       %label.col-md-2.control-label{"for" => "ems_name"}
         = _('Name')
-      .col-md-8
+      .col-md-4
         %input.form-control{"type"           => "text",
                             "id"             => "ems_name",
                             "name"           => "name",
@@ -53,7 +53,7 @@
     .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
       %label.col-md-2.control-label{"for" => "ems_zone"}
         = _("Zone")
-      .col-md-8
+      .col-md-4
         - if @server_zones.length <= 1
           %input.form-control{"type"        => "text",
                               "id"          => "ems_zone",

diff --git a/app/views/ems_infra/_form_fields.html.haml b/app/views/ems_infra/_form_fields.html.haml
@@ -2,7 +2,7 @@
   .form-group
     %label.control-label.col-md-2
       = _('Hostname or IP address')
-    .col-md-8
+    .col-md-4
       = text_field_tag("hostname",
         @edit[:new][:hostname],
         :maxlength => MAX_HOSTNAME_LEN,
@@ -25,7 +25,7 @@
       .form-group
         %label.control-label.col-md-2
           = _('Realm')
-        .col-md-8
+        .col-md-6
           = text_field_tag("realm",
                            @edit[:new][:realm],
                            :maxlength => MAX_NAME_LEN,

diff --git a/app/views/ems_middleware/_form_fields.html.haml b/app/views/ems_middleware/_form_fields.html.haml
@@ -2,7 +2,7 @@
   .form-group
     %label.control-label.col-md-2
       = _('Hostname or IP address')
-    .col-md-8
+    .col-md-4
       = text_field_tag("hostname",
         @edit[:new][:hostname],
         :maxlength         => MAX_HOSTNAME_LEN,
@@ -12,7 +12,7 @@
   .form-group
     %label.control-label.col-md-2
       = _('Port')
-    .col-md-8
+    .col-md-2
       = text_field_tag("port",
         @edit[:new][:port],
         :maxlength         => 5,

diff --git a/app/views/host/_form.html.haml b/app/views/host/_form.html.haml
@@ -30,7 +30,7 @@
           .form-group{"ng-class" => "{'has-error': angularForm.hostname.$invalid}"}
             %label.col-md-2.control-label{"for" => "hostname"}
               = _("Hostname (or IPv4 or IPv6 address)")
-            .col-md-8
+            .col-md-4
               %input.form-control{"type"        => "text",
                                   "id"          => "hostname",
                                   "name"        => "hostname",

diff --git a/app/views/layouts/angular-bootstrap/_endpoints_angular.html.haml b/app/views/layouts/angular-bootstrap/_endpoints_angular.html.haml
@@ -7,7 +7,7 @@
   .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_hostname.$invalid}"}
     %label.col-md-2.control-label{"for" => "#{prefix}_hostname"}
       = _('Hostname (or IPv4 or IPv6 address)')
-    .col-md-8
+    .col-md-4
       %input.form-control{"type"                    => "text",
                           "id"                      => "#{prefix}_hostname",
                           "name"                    => "#{prefix}_hostname",
@@ -35,7 +35,7 @@
                          "emsCommonModel.ems_controller == 'ems_container'"} |
     %label.col-md-2.control-label{"for" => "#{prefix}_api_port"}
       = _('API Port')
-    .col-md-8
+    .col-md-2
       %input.form-control{"type"                        => "text",
                           "id"                          => "#{prefix}_api_port",
                           "name"                        => "#{prefix}_api_port",
@@ -61,7 +61,7 @@
     "ng-if" => "emsCommonModel.emstype == 'rhevm'"} |
     %label.col-md-2.control-label{"for" => "#{prefix}_database_name"}
       = _('Database Name')
-    .col-md-8
+    .col-md-4
       %input.form-control{"type"          => "text",
                           "id"            => "#{prefix}_database_name",
                           "name"          => "#{prefix}_database_name",
@@ -117,7 +117,7 @@
             "ng-if" => "emsCommonModel.emstype == 'scvmm' && emsCommonModel.default_security_protocol == 'kerberos'"}
   %label.col-md-2.control-label{"for" => "realm"}
     = _('Realm')
-  .col-md-8
+  .col-md-4
     %input.form-control{"type"          => "text",
                         "id"            => "realm",
                         "name"          => "realm",

diff --git a/app/views/shared/views/ems_common/_form.html.haml b/app/views/shared/views/ems_common/_form.html.haml
@@ -62,7 +62,7 @@
     .form-group
       %label.control-label.col-md-2
         = _('Zone')
-      .col-md-8
+      .col-md-2
         - if @edit[:server_zones].length <= 1
           = text_field_tag("server_zone", @edit[:new][:zone],
                             :maxlength         => 15,

diff --git a/app/views/shared/views/ems_common/angular/_form.html.haml b/app/views/shared/views/ems_common/angular/_form.html.haml
@@ -6,7 +6,7 @@
     .form-group{"ng-class" => "{'has-error': angularForm.name.$invalid}"}
       %label.col-md-2.control-label{"for" => "ems_name"}
         = _('Name')
-      .col-md-8
+      .col-md-4
         %input.form-control{"type"           => "text",
                             "id"             => "ems_name",
                             "name"           => "name",
@@ -60,7 +60,7 @@
     .form-group{"ng-class" => "{'has-error': angularForm.project.$invalid}", "ng-if" => "emsCommonModel.emstype == 'gce'"}
       %label.col-md-2.control-label{"for" => "ems_project"}
         = _('Project')
-      .col-md-8
+      .col-md-4
         %input.form-control{"type"        => "text",
                             "id"          => "ems_project",
                             "name"        => "project",
@@ -130,7 +130,7 @@
                 "ng-if"    => "emsCommonModel.emstype == 'openstack' || emsCommonModel.emstype == 'openstack_infra'"}
       %label.col-md-2.control-label{"for" => "ems_region_input"}
         = _('Region')
-      .col-md-8
+      .col-md-4
         %input.form-control{"type"                    => "text",
                             "id"                      => "ems_region_input",
                             "name"                    => "provider_region",
@@ -172,7 +172,7 @@
     .form-group{"ng-class" => "{'has-error': angularForm.zone.$invalid}"}
       %label.col-md-2.control-label{"for" => "ems_zone"}
         = _("Zone")
-      .col-md-8
+      .col-md-4
         - if @server_zones.length <= 1
           %input.form-control{"type"        => "text",
                               "id"          => "ems_zone",