Merge pull request #95 from NethServer/improve_ldap_ui

ui: move ldap field on the top NethServer/dev#7103
NethServer · Dec 5, 2024 · fa8d0dd · fa8d0dd
2 parents f7ac93b + 2c2642d
commit fa8d0dd
Showing 1 changed file with 34 additions and 29 deletions.
diff --git a/ui/src/views/Dashboard.vue b/ui/src/views/Dashboard.vue
@@ -58,6 +58,36 @@
           {{ $t("dashboard.connect_description") }}
         </div>
         <form class="form-horizontal" v-on:submit.prevent="connectionValidate">
+            <!-- ldap_userdomain -->
+            <div v-if="isLdapEnabled && accountProviderConfig.location == 'local' && accountProviderConfig.type == 'ldap'">
+            <div
+              class="alert alert-info alert-dismissable"
+            >
+              <span class="pficon pficon-info"></span>
+              {{
+                $t("dashboard.ldap_user_domain_description")
+              }}
+            </div>
+          </div>
+          <div v-if="isLdapEnabled && accountProviderConfig.location == 'local' && accountProviderConfig.type == 'ldap'">
+            <div :class="['form-group', { 'has-error': error.ldapUserDomain }, 'mg-bottom-40']">
+              <label class="col-sm-2 control-label" for="ldap-userdomain">{{
+                $t("dashboard.ldap_user_domain")
+              }}</label>
+              <div class="col-sm-5">
+                <input
+                  type="text"
+                  v-model="config.ldapUserDomain"
+                  id="ldap-userdomain"
+                  ref="ldapUserDomain"
+                  class="form-control"
+                />
+                <span v-if="error.ldapUserDomain" class="help-block">{{
+                  $t("validation.ldap_user_domain_" + error.ldapUserDomain)
+                }}</span>
+              </div>
+          </div>
+          </div>
           <!-- leader node -->
           <div :class="['form-group', { 'has-error': error.leaderNode }]">
             <label class="col-sm-2 control-label" for="leader-node">{{
@@ -140,35 +170,6 @@
               />
             </div>
           </div>
-          <!-- ldap_userdomain -->
-          <div v-if="isLdapEnabled && accountProviderConfig.location == 'local' && accountProviderConfig.type == 'ldap'">
-            <div
-              class="page-description"
-            >
-              {{
-                $t("dashboard.ldap_user_domain_description")
-              }}
-            </div>
-          </div>
-          <div v-if="isLdapEnabled && accountProviderConfig.location == 'local' && accountProviderConfig.type == 'ldap'">
-            <div :class="['form-group', { 'has-error': error.ldapUserDomain }]">
-              <label class="col-sm-2 control-label" for="ldap-userdomain">{{
-                $t("dashboard.ldap_user_domain")
-              }}</label>
-              <div class="col-sm-5">
-                <input
-                  type="text"
-                  v-model="config.ldapUserDomain"
-                  id="ldap-userdomain"
-                  ref="ldapUserDomain"
-                  class="form-control"
-                />
-                <span v-if="error.ldapUserDomain" class="help-block">{{
-                  $t("validation.ldap_user_domain_" + error.ldapUserDomain)
-                }}</span>
-              </div>
-          </div>
-            </div>
           <!-- connect button -->
           <div class="form-group">
             <label class="col-sm-2 control-label">
@@ -2074,6 +2075,10 @@ export default {
   margin-bottom: 20px;
 }
 
+.mg-bottom-40 {
+  margin-bottom: 40px;
+}
+
 .migration-buttons {
   width: 33%;
   display: flex;