More prism*panel styling. Stripes.

Evolveum · Apr 18, 2016 · 8578fa5 · 8578fa5
1 parent dd71bf4
commit 8578fa5
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 18 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
@@ -16,7 +16,7 @@
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
 <ul class="nav nav-tabs" wicket:id="tabs-container">
-	<li wicket:id="tabs"><a class="tab-label" href="#" wicket:id="link"><span wicket:id="title"/><small class="label pull-right bg-yellow" wicket:id="count"/></a></li>
+	<li wicket:id="tabs"><a class="tab-label" href="#" wicket:id="link"><span wicket:id="title"/><small class="label pull-right bg-green" wicket:id="count"/></a></li>
     <wicket:remove><!-- TODO fix the style for rightSideTabItem --></wicket:remove>
     <li wicket:id="rightSideTabItem" class="pull-right" style="border-radius: 0; margin: 10px"><div wicket:id="rightSideTab"/></li>
 </ul>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
@@ -177,6 +177,20 @@ boolean isItemVisible(ItemWrapper item) {
         }
     }
 
+    public void computeStripes() {
+    	int visibleProperties = 0;
+    	for (ItemWrapper item: properties) {
+    		if (item.isVisible()) {
+    			visibleProperties++;
+    		}
+    		if (visibleProperties % 2 == 0) {
+    			item.setStripe(true);
+    		} else {
+    			item.setStripe(false);
+    		}
+    	}
+    }
+
 	public boolean isShowInheritedObjectAttributes() {
 		return showInheritedObjectAttributes;
 	}
@@ -422,4 +436,15 @@ public String debugDump(int indent) {
         return sb.toString();
     }
 
+	@Override
+	public boolean isStripe() {
+		// Does not make much sense, but it is given by the interface
+		return false;
+	}
+
+	@Override
+	public void setStripe(boolean isStripe) {
+		// Does not make much sense, but it is given by the interface
+	}
+
 }
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
@@ -91,6 +91,8 @@ public <T extends PrismContainer> ContainerWrapper createContainerWrapper(Object
         List<ItemWrapper> properties = createProperties(cWrapper, result);
         cWrapper.setProperties(properties);
 
+        cWrapper.computeStripes();
+
         return cWrapper;
     }
 
@@ -102,6 +104,8 @@ public <T extends PrismContainer> ContainerWrapper createContainerWrapper(T cont
 
 		List<ItemWrapper> properties = createProperties(cWrapper, result);
 		cWrapper.setProperties(properties);
+
+		cWrapper.computeStripes();
 
 		return cWrapper;
 	}

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapper.java
@@ -50,6 +50,10 @@ public interface ItemWrapper<I extends Item, ID extends ItemDefinition> extends
 
     public boolean isVisible();
 
+    public boolean isStripe();
+
+    void setStripe(boolean isStripe);
+
     ContainerWrapper getContainer();
 
     public void addValue();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
@@ -225,6 +225,7 @@ public boolean isShowEmpty() {
 
     public void setShowEmpty(boolean showEmpty) {
         this.showEmpty = showEmpty;
+        computeStripes();
     }
 
     public boolean isSelectable() {
@@ -309,9 +310,16 @@ public void sort() {
     	if (main != null) {
     		main.sort(isSorted());
     	}
+    	computeStripes();
     }
 
-    public ObjectDelta<O> getObjectDelta() throws SchemaException {
+    private void computeStripes() {
+		for (ContainerWrapper<? extends Containerable> container: containers) {
+			container.computeStripes();
+		}
+	}
+
+	public ObjectDelta<O> getObjectDelta() throws SchemaException {
     	if (LOGGER.isTraceEnabled()) {
     		LOGGER.trace("Wrapper before creating delta:\n{}", this.debugDump());
     	}

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
@@ -137,24 +137,28 @@ private IModel<String> createStyleClassModel(final IModel<ItemWrapper> wrapper)
             @Override
             public String getObject() {
             	ItemWrapper property = wrapper.getObject();
-                return property.isVisible() ? "visible" : null;
+                return property.isStripe() ? "stripe" : null;
             }
         };
     }
 
     private void addOrReplaceProperties(IModel<ContainerWrapper> model, final Form form, boolean isToBeReplaced){
         ListView<ItemWrapper> properties = new ListView<ItemWrapper>("properties",
                 new PropertyModel(model, "properties")) {
+			private static final long serialVersionUID = 1L;
 
-            @Override
-            protected void populateItem(ListItem<ItemWrapper> item) {
-//            	if (item.getModel().getObject() instanceof PropertyWrapper){
+			@Override
+            protected void populateItem(final ListItem<ItemWrapper> item) {
                 item.add(new PrismPropertyPanel("property", item.getModel(), form, pageBase));
+                item.add(new VisibleEnableBehaviour() {
+                	private static final long serialVersionUID = 1L;
+
+                	@Override
+                	public boolean isVisible() {
+                		return item.getModel().getObject().isVisible();
+                	}
+                });
                 item.add(AttributeModifier.append("class", createStyleClassModel(item.getModel())));
-//            	} else if (item.getModel().getObject() instanceof ReferenceWrapper){
-//            		 item.add(new PrismReferencePanel("property", item.getModel(), form, pageBase));
-// 	                item.add(AttributeModifier.append("class", createStyleClassModel(item.getModel())));
-//            	}
             }
         };
         properties.setReuseItems(true);

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java b/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
@@ -43,6 +43,7 @@ public abstract class PropertyOrReferenceWrapper<I extends Item<? extends PrismV
 	protected List<ValueWrapper> values;
 	protected String displayName;
 	protected boolean readonly;
+	private boolean isStripe;
 
 	public PropertyOrReferenceWrapper(@Nullable ContainerWrapper container, I item, boolean readonly, ValueStatus status) {
 		Validate.notNull(item, "Item must not be null.");
@@ -93,6 +94,14 @@ public boolean isVisible() {
 		}
 	}
 
+	public boolean isStripe() {
+		return isStripe;
+	}
+
+	public void setStripe(boolean isStripe) {
+		this.isStripe = isStripe;
+	}
+
 	public ContainerWrapper getContainer() {
 	        return container;
 	    }

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -539,7 +539,14 @@ div.dashAssignmentHeader {
 }
 
 .prism-properties {
-	padding-left: 30px;
+
+	& > div {
+		padding-left: 30px;
+	}
+
+	.stripe {
+		background-color: @table-stripe-bg-color;
+	}
 }
 
 .prism-header {
@@ -554,14 +561,13 @@ div.dashAssignmentHeader {
 }
 
 .prism-property {
+	padding-top: 5px;
+	padding-bottom: 5px;
 
-	&.visible { 
-    border-bottom: 1px solid @table-divider-color;
-  }
-
-  &.striped {
-    background-color: @table-stripe-bg-color;
-  }
+	&.visible {
+		// DEPRECATED 
+		border-bottom: 1px solid @table-divider-color;
+	}
 
 }