Better end-user dashboard (home) styles (MID-2868)

Evolveum · Apr 22, 2016 · 3efd56a · 3efd56a
1 parent 439ea88
commit 3efd56a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 41 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2015 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 <wicket:extend>
     <div class="row">
         <div class="col-md-6">
-            <div wicket:id="searchPanel" class="box box-solid"/>
+            <div class="quicksearch-panel" wicket:id="searchPanel"/>
             <div wicket:id="linksPanel"/>
         </div>
         <div class="col-md-6">

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html b/...gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,25 +15,23 @@
   ~ limitations under the License.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-    <div class="box-body">
-        <form wicket:id="searchForm">
-           <div class="input-group">
-                <input wicket:id="searchInput" class="form-control" type="text" />
-                <div class="input-group-btn">
-                    <button wicket:id="searchButton" class="btn btn-primary">
-                        <i class="fa fa-search"/>&nbsp;
-                        <span wicket:id="buttonLabel"/>
-                    </button>
-                    <button aria-expanded="false" type="button" class="btn btn-primary dropdown-toggle"
-                            data-toggle="dropdown">
-                        <span class="caret"></span>
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <ul class="dropdown-menu" role="menu" wicket:id="searchTypes">
-                        <li><a wicket:id="searchTypeItem" href="#"><span wicket:id="linkLabel"/></a></li>
-                    </ul>
-                </div>
-            </div>
-        </form>
-    </div>
+	<form wicket:id="searchForm">
+	   <div class="input-group">
+	        <input wicket:id="searchInput" class="form-control" type="text" />
+	        <div class="input-group-btn">
+	            <button wicket:id="searchButton" class="btn btn-primary">
+	                <i class="fa fa-search"/>&nbsp;
+	                <span wicket:id="buttonLabel"/>
+	            </button>
+	            <button aria-expanded="false" type="button" class="btn btn-primary dropdown-toggle"
+	                    data-toggle="dropdown">
+	                <span class="caret"></span>
+	                <span class="sr-only">Toggle Dropdown</span>
+	            </button>
+	            <ul class="dropdown-menu" role="menu" wicket:id="searchTypes">
+	                <li><a wicket:id="searchTypeItem" href="#"><span wicket:id="linkLabel"/></a></li>
+	            </ul>
+	        </div>
+	    </div>
+	</form>
 </wicket:panel>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -16,21 +16,19 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <table width="100%">
-        <tr wicket:id="linksRow" class="row">
-            <td wicket:id="linksColumn" class="col-sm-6">
-                <a href="#" wicket:id="link">
-                    <div class="info-box">
-                        <div class="info-box-icon bg-blue fa fa-tasks" wicket:id="imageId"/>
-
-                        <div class="info-box-content">
-                            <span class="info-box-number" wicket:id="labelId"/>
-                            <span wicket:id="descriptionId"/>
-                        </div>
-                    </div>
-                </a>
-            </td>
-        </tr>
-    </table>
+	<div class="row" wicket:id="linksRow">
+	    <div class="col-sm-6" wicket:id="linksColumn">
+	        <a href="#" wicket:id="link">
+	            <div class="info-box">
+	                <div class="info-box-icon bg-blue fa fa-tasks" wicket:id="imageId"/>
+
+	                <div class="info-box-content">
+	                    <span class="info-box-number" wicket:id="labelId"/>
+	                    <span wicket:id="descriptionId"/>
+	                </div>
+	            </div>
+	        </a>
+	    </div>
+	</div>
 </wicket:panel>
 </html>
diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -363,6 +363,12 @@ th.cog, td.cog {
 	#info-box-icon-summary-panel(@object-resource-color);
 }
 
+// End-user home (PageSelfDashboard)
+
+.quicksearch-panel {
+	margin-bottom: 20px;
+}
+
 // Datables/lists (BoxedTablePanel)
 
 .boxed-table {