More work on summary

Evolveum · Oct 8, 2015 · 0205917 · 0205917
1 parent 42c528b
commit 0205917
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.html
@@ -19,12 +19,23 @@
     		<!-- take care that there are no whitespaces inside the following div -->
             <div wicket:id="summaryIconBox" class="info-box-icon"><span class="user-thumbnail-helper"/><span wicket:id="summaryIcon"/><img wicket:id="summaryPhoto" class="user-thumbnail"/></div>
             <div class="info-box-content">
-            	<span class="info-box-number">
-            		<span wicket:id="summaryDisplayName"/> (<span wicket:id="summaryIdentifier"/>)
-            	</span>
-            	<span class="info-box-text">
-            		<span wicket:id="summaryTitle"/>
-            	</span>
+            	<span class="summary-content-box">
+	            	<span class="summary-text-box">
+		            	<span class="info-box-number">
+		            		<span wicket:id="summaryDisplayName"/> (<span wicket:id="summaryIdentifier"/>)
+		            	</span>
+		            	<span class="summary-panel-title">
+		            		<span wicket:id="summaryTitle"/>
+		            	</span>
+		            	<span class="summary-panel-organization">
+		            		<span wicket:id="summaryOrganization"/>
+		            	</span>
+	            	</span>
+		            <span class="summary-tag-box">
+		            	<span class="summary-tag"><span class="summary-tag-icon"><span wicket:id="summaryTagActivationIcon"/></span> <span wicket:id="summaryTagActivationLabel"/></span>
+		            	<span class="summary-tag"><span class="summary-tag-icon"><span wicket:id="summaryTagSecurityIcon"/></span> <span wicket:id="summaryTagSecurityLabel"/></span>
+		            </span>
+	            </span>
             </div>
         </div>
 </wicket:panel>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
@@ -47,6 +47,11 @@ public abstract class FocusSummaryPanel<F extends FocusType> extends Panel {
 	private static final String ID_DISPLAY_NAME = "summaryDisplayName";
 	private static final String ID_IDENTIFIER = "summaryIdentifier";
 	private static final String ID_TITLE = "summaryTitle";
+	private static final String ID_ORGANIZATION = "summaryOrganization";
+	private static final String ID_TAG_ACTIVATION_ICON = "summaryTagActivationIcon";
+	private static final String ID_TAG_ACTIVATION_LABEL = "summaryTagActivationLabel";
+	private static final String ID_TAG_SECURITY_ICON = "summaryTagSecurityIcon";
+	private static final String ID_TAG_SECURITY_LABEL = "summaryTagSecurityLabel";
 
 	private static final String BOX_CSS_CLASS = "info-box";
 	private static final String ICON_BOX_CSS_CLASS = "info-box-icon";
@@ -66,6 +71,18 @@ public FocusSummaryPanel(String id, final IModel<ObjectWrapper<F>> model) {
 		} else {
 			box.add(new Label(ID_TITLE, new PrismPropertyWrapperModel<>(model, getTitlePropertyName())));
 		}
+		box.add(new Label(ID_ORGANIZATION, "TODO"));
+
+		Label tagActivationIcon = new Label(ID_TAG_ACTIVATION_ICON, "");
+		tagActivationIcon.add(new AttributeModifier("class", "fa fa-check"));
+		box.add(tagActivationIcon);
+		box.add(new Label(ID_TAG_ACTIVATION_LABEL, "TODO"));
+
+		Label tagSecurityIcon = new Label(ID_TAG_SECURITY_ICON, "");
+		tagSecurityIcon.add(new AttributeModifier("class", "fa fa-shield"));
+		box.add(tagSecurityIcon);
+		box.add(new Label(ID_TAG_SECURITY_LABEL, "TODO"));
+
 
 		WebMarkupContainer iconBox = new WebMarkupContainer(ID_ICON_BOX);
 		box.add(iconBox);

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -124,3 +124,32 @@ li.dropdown.user.user-menu {
 	text-align: center;
 	line-height: 0px;
 }
+
+.summary-panel-title {
+}
+
+.summary-panel-organization {
+	font-size: 16px;
+	display: block;
+}
+
+.summary-content-box {
+	display: block;
+}
+
+.summary-text-box {
+	display: inline-block;
+}
+
+.summary-tag-box {
+	float: right;
+	width: 100px;
+}
+
+.summary-tag {
+	display: block;
+}
+
+.summary-tag-icon {
+	width: 20px;
+}