improving org unit page (using generated form, should fix MID-2243)

Evolveum · Sep 4, 2015 · 88fd4ff · 88fd4ff
1 parent 352ad00
commit 88fd4ff
Show file tree

Hide file tree

Showing 5 changed files with 1,089 additions and 1,016 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.html
@@ -25,36 +25,43 @@
         -->
 
         <div class="row">
-            <div class="col-md-6">
-                <h3><wicket:message key="PageOrgUnit.title.basic"/></h3>
-                <div class="form-group" wicket:id="name" />
-                <div class="form-group" wicket:id="displayName"/>
-                <div class="form-group" wicket:id="description"/>
+         <div class="col-md-6">
+         <h3><wicket:message key="PageOrgUnit.title.parentOrgUnit"/></h3>
+         <div wicket:id="parentOrgUnits" />
+
+                <div wicket:id="orgForm"/>
+            </div>
+<!--             <div class="col-md-6"> -->
+<!--                 <h3><wicket:message key="PageOrgUnit.title.basic"/></h3> -->
+<!--                 <div class="form-group" wicket:id="name" /> -->
+<!--                 <div class="form-group" wicket:id="displayName"/> -->
+<!--                 <div class="form-group" wicket:id="description"/> -->
 
-                <div class="form-group" wicket:id="parentOrgUnits" />
+
 
-                <div class="form-group" wicket:id="orgType"/>
+<!--                 <div class="form-group" wicket:id="orgType"/> -->
 
-                <div class="form-group" wicket:id="requestable"/>
-                <div class="form-group" wicket:id="tenant"/>
-                <div class="form-group" wicket:id="identifier"/>
-                <div class="form-group" wicket:id="costCenter"/>
-                <div class="form-group" wicket:id="locality"/>
-                <div class="form-group" wicket:id="mailDomain"/>
+<!--                 <div class="form-group" wicket:id="requestable"/> -->
+<!--                 <div class="form-group" wicket:id="tenant"/> -->
+<!--                 <div class="form-group" wicket:id="identifier"/> -->
+<!--                 <div class="form-group" wicket:id="costCenter"/> -->
+<!--                 <div class="form-group" wicket:id="locality"/> -->
+<!--                 <div class="form-group" wicket:id="mailDomain"/> -->
 
-                <h3><wicket:message key="FocusType.activation"/></h3>
-                <div class="form-group" wicket:id="administrativeStatus"/>
-                <div class="form-group" wicket:id="validFrom"/>
-                <div class="form-group" wicket:id="validTo"/>
+<!--                 <h3><wicket:message key="FocusType.activation"/></h3> -->
+<!--                 <div class="form-group" wicket:id="administrativeStatus"/> -->
+<!--                 <div class="form-group" wicket:id="validFrom"/> -->
+<!--                 <div class="form-group" wicket:id="validTo"/> -->
 
-                <!--Extension-->
-                <h3 wicket:id="extensionLabel" style="margin-left: 20px;"></h3>
-                <div class="form-group" wicket:id="extension">
-                    <div wicket:id="property"/>
-                </div>
+<!--                 Extension -->
+<!--                 <h3 wicket:id="extensionLabel" style="margin-left: 20px;"></h3> -->
+<!--                 <div class="form-group" wicket:id="extension"> -->
+<!--                     <div wicket:id="property"/> -->
+<!--                 </div> -->
 
-            </div>
+<!--             </div> -->
             <div class="col-md-6">
+
              <div wicket:id="accounts">
                     <div class="row assignable-header">
                         <div class="col-xs-10">
@@ -66,7 +73,7 @@ <h3><wicket:message key="pageOrgUnit.accounts"/></h3>
                         <div wicket:id="account" />
                     </div>
                 </div>
-
+            	
                 <div wicket:id="inducementsPanel" />
                 <div wicket:id="assignmentsPanel" style="margin-top: 30px;" />
                 <!--