Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 2, 2016 · 6eeb98f · 6eeb98f
2 parents 42f5fe0 + 6924ab0
commit 6eeb98f
Show file tree

Hide file tree

Showing 8 changed files with 437 additions and 16 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.html
@@ -18,18 +18,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:extend>
-    <div wicket:id="deleteTasksPopup" />
-    <div wicket:id="deleteAllClosedTasksPopup" />
-
-    <div wicket:id="refreshPanel" class="pull-right"/>
-    <br/>       <!-- fixme -->
-    <form wicket:id="mainForm" class="form-inline">
-        <div wicket:id="taskTable"/>
-
-        <h3><wicket:message key="pageTasks.nodes"/></h3>
-        <div wicket:id="nodeTable"/>
-    </form>
-
+	<div class="main-form-panel">
+	    <div wicket:id="deleteTasksPopup" />
+	    <div wicket:id="deleteAllClosedTasksPopup" />
+
+	    <div wicket:id="refreshPanel" class="pull-right"/>
+	    <br/>       <!-- fixme -->
+	    <form wicket:id="mainForm" class="form-inline">
+	        <div wicket:id="taskTable"/>
+
+	        <h3><wicket:message key="pageTasks.nodes"/></h3>
+	        <div wicket:id="nodeTable"/>
+	    </form>
+	</div>
+
     <div class="main-button-bar">
         <a class="btn btn-danger" wicket:id="deactivateServiceThreads"/>
         <a class="btn btn-success" wicket:id="reactivateServiceThreads"/>

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.html b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances.html
@@ -19,7 +19,9 @@
 <body>
 <wicket:extend>
     <form wicket:id="mainForm">
-        <div wicket:id="processInstancesTable"/>
+    	<div class="main-form-panel">
+        	<div wicket:id="processInstancesTable"/>
+        </div>
 
         <div class="main-button-bar">
             <span class="button-group">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.html
@@ -19,7 +19,9 @@
 <body>
 <wicket:extend>
     <form wicket:id="mainForm">
-        <div wicket:id="workItemsPanel"/>
+    	<div class="main-form-panel">
+        	<div wicket:id="workItemsPanel"/>
+        </div>
 
         <div class="main-button-bar">
             <span class="button-group">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html
@@ -20,7 +20,9 @@
 <body>
 <wicket:extend>
     <form wicket:id="mainForm" class="form-horizontal">
-        <div wicket:id="mainPanel"/>
+    	<div class="main-form-panel">
+        	<div wicket:id="mainPanel"/>
+        </div>
         <div class="main-button-bar">
             <a class="btn btn-default" wicket:id="cancel"/>
             <a class="btn btn-primary" wicket:id="save"/>

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -798,6 +798,12 @@ th.cog, td.cog {
 	background-color: #ffcaca;
 }
 
+.main-form-panel { // Used on pages where there is just one main panel and it does not
+                   // provide formatting by itself. E.g. pages that are both object lists
+                   // and forms (such as workitems, requests).
+	margin-bottom: 20px;
+}
+
 .options-container {
 
 }