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

Evolveum · Apr 15, 2016 · 78f03e1 · 78f03e1
2 parents 79be93f + d4fc227
commit 78f03e1
Show file tree

Hide file tree

Showing 57 changed files with 1,078 additions and 1,681 deletions.
diff --git a/cli/ninja/pom.xml b/cli/ninja/pom.xml
@@ -134,6 +134,16 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                        	<filters>
+						        <filter>
+						            <artifact>*:*</artifact>
+						            <excludes>
+						                <exclude>META-INF/*.SF</exclude>
+						                <exclude>META-INF/*.DSA</exclude>
+						                <exclude>META-INF/*.RSA</exclude>
+						            </excludes>
+						        </filter>
+						    </filters>
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

diff --git a/cli/seppuku/pom.xml b/cli/seppuku/pom.xml
@@ -95,6 +95,16 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                        	<filters>
+						        <filter>
+						            <artifact>*:*</artifact>
+						            <excludes>
+						                <exclude>META-INF/*.SF</exclude>
+						                <exclude>META-INF/*.DSA</exclude>
+						                <exclude>META-INF/*.RSA</exclude>
+						            </excludes>
+						        </filter>
+						    </filters>
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -111,7 +111,7 @@ public void onClick(AjaxRequestTarget target) {
             };
             add(newObjectIcon);
 
-            AjaxIconButton importObject = new AjaxIconButton(ID_IMPORT_OBJECT, new Model<>("fa fa-download"),
+            AjaxIconButton importObject = new AjaxIconButton(ID_IMPORT_OBJECT, new Model<>("fa fa-upload"),
                     mainObjectListPanel.createStringResource("MainObjectListPanel.import")) {
 
                 @Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -51,7 +51,6 @@
 
     <!-- OBSOLETE START -->
     <link type="text/css" rel="stylesheet" href="css/silk.css"/>
-    <link type="text/css" rel="stylesheet" href="wro/all.css"/>
     <link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>
     <!-- OBSOLETE END -->
     <link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -61,6 +61,7 @@
 import com.evolveum.midpoint.web.page.admin.users.PageOrgUnit;
 import com.evolveum.midpoint.web.page.admin.users.PageUser;
 import com.evolveum.midpoint.web.security.MidPointApplication;
+import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
@@ -78,6 +79,7 @@
 import org.apache.wicket.extensions.markup.html.tabs.ITab;
 import org.apache.wicket.feedback.IFeedback;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.markup.html.form.TextField;
@@ -1190,4 +1192,10 @@ protected void onSubmit(AjaxRequestTarget target,
 		return tabPanel;
 	}
 
+	public static Component createHelp(String id) {
+		Label helpLabel = new Label(id);
+		helpLabel.add(new InfoTooltipBehavior());
+		return helpLabel;
+	}
+
 }
diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.less b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.less
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
@@ -47,7 +47,6 @@
 
     <!-- OBSOLETE START -->
     <link type="text/css" rel="stylesheet" href="css/silk.css"/>
-    <link type="text/css" rel="stylesheet" href="wro/all.css"/>
     <link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>
     <!-- OBSOLETE END -->
     <link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>

diff --git a/...n/certification/StageDefinitionPanel.html → ...n/certification/DefinitionStagePanel.html b/...n/certification/StageDefinitionPanel.html → ...n/certification/DefinitionStagePanel.html
diff --git a/...n/certification/StageDefinitionPanel.java → ...n/certification/DefinitionStagePanel.java b/...n/certification/StageDefinitionPanel.java → ...n/certification/DefinitionStagePanel.java
@@ -31,7 +31,7 @@
 /**
  * Created by Kate Honchar.
  */
-public class StageDefinitionPanel extends SimplePanel<StageDefinitionDto> {
+public class DefinitionStagePanel extends SimplePanel<StageDefinitionDto> {
     private static final String ID_NAME = "name";
     private static final String ID_DESCRIPTION = "description";
     private static final String ID_DURATION = "duration";
@@ -56,7 +56,7 @@ public class StageDefinitionPanel extends SimplePanel<StageDefinitionDto> {
     private static final String ID_STOP_REVIEW_ON = "stopReviewOn";
 
     // TODO remove pageBase from the constructor -- replace with delayed layout initialization
-    public StageDefinitionPanel(String id, IModel<StageDefinitionDto> model, PageBase pageBase) {
+    public DefinitionStagePanel(String id, IModel<StageDefinitionDto> model, PageBase pageBase) {
         super(id, model);
         initLayoutDeferred(pageBase);
     }

diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html b/...c/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.html
@@ -17,14 +17,19 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <!--<h2><wicket:message key="PageCertDefinition.xmlDefinition"/></h2>-->
-        <span wicket:id="stageList" class="row">
-    <div wicket:id="stageEditor"/>
-        </span>
-           <span class="btn-group">
-                        <a class="btn btn-primary btn-sm" wicket:id="addNewStage" style="margin-left: 30px; margin-top:30px;" />
 
-                <!--<a class="btn btn-success btn-sm" wicket:id="addNewStage"><i class="glyphicon glyphicon-plus"/></a>-->
-            </span>
+    <div wicket:id="confirmDeletePopup" />
+
+    <div class="box">
+        <div class="box-body no-padding">
+            <a class="btn btn-primary btn-sm" wicket:id="addNewStage" style="margin-left: 10px; margin-top: 10px; margin-bottom: 10px" />
+            <a class="btn btn-sm" wicket:id="moveStageRight" style="margin-top: 10px; margin-bottom: 10px" />
+            <a class="btn btn-sm" wicket:id="moveStageLeft" style="margin-top: 10px; margin-bottom: 10px" />
+            <a class="btn btn-danger btn-sm" wicket:id="deleteStage" style="margin-top: 10px; margin-bottom: 10px" />
+        </div>
+    </div>
+
+    <div wicket:id="tabPanel" class="nav-tabs-custom" />
+
 </wicket:panel>
 </html>