MID-2478 css styling

Evolveum · Jun 10, 2016 · b095205 · b095205
1 parent 2433eed
commit b095205
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.html b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.html
@@ -21,8 +21,7 @@
 	<span wicket:id="summaryTagExecutionStatus"/>
 	<span wicket:id="summaryTagResult"/>
 	<span wicket:id="wfOutcomeTag"/>
-	<span wicket:id="emptyTag" style="display: block"/>
-	<span wicket:id="refreshTag"/>
+	<span wicket:id="refreshTag" style="margin-top: 6px;"/>
 </wicket:extend>
 </body>
 </html>
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
@@ -120,15 +120,6 @@ public boolean isVisible() {
 		});
 		addTag(tagOutcome);
 
-		final Component emptyTag = new Label(ID_TAG_EMPTY, new Model("<span style=\"display: block; padding-bottom: 5px\"/>")).setEscapeModelStrings(false);
-		emptyTag.add(new VisibleEnableBehaviour() {
-			@Override
-			public boolean isVisible() {
-				return parentPage.getTaskDto().getWorkflowOutcome() == null;
-			}
-		});
-		addTag(emptyTag);
-
 		final AutoRefreshPanel refreshTag = new AutoRefreshPanel(ID_TAG_REFRESH, refreshModel, parentPage, true);
 		refreshTag.setOutputMarkupId(true);
 		refreshTag.add(new VisibleEnableBehaviour() {
@@ -142,15 +133,15 @@ public boolean isVisible() {
 
 	private String getIconForExecutionStatus(TaskDtoExecutionStatus status) {
 		if (status == null) {
-			return "fa fa-fw fa-question-circle fa-lg text-warning";
+			return "fa fa-fw fa-question-circle text-warning";
 		}
 		switch (status) {
-			case RUNNING: return "fa fa-fw fa-lg fa-spinner";
-			case RUNNABLE: return "fa fa-fw fa-lg fa-hand-o-up";
-			case SUSPENDED: return "fa fa-fw fa-lg fa-bed";
-			case SUSPENDING: return "fa fa-fw fa-lg fa-bed";
-			case WAITING: return "fa fa-fw fa-lg fa-clock-o";
-			case CLOSED: return "fa fa-fw fa-lg fa-power-off";
+			case RUNNING: return "fa fa-fw fa-spinner";
+			case RUNNABLE: return "fa fa-fw fa-hand-o-up";
+			case SUSPENDED: return "fa fa-fw fa-bed";
+			case SUSPENDING: return "fa fa-fw fa-bed";
+			case WAITING: return "fa fa-fw fa-clock-o";
+			case CLOSED: return "fa fa-fw fa-power-off";
 			default: return "";
 		}
 	}

diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less b/gui/admin-gui/src/main/webapp/less/admin-lte/less/info-box.less
@@ -48,6 +48,14 @@
   display: block;
   font-weight: bold;
   font-size: 18px;
+
+  & > .summary-panel-display-name {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    display: block;
+    max-width: 800px;
+  }
 }
 .progress-description,
 .info-box-text {