Merge remote-tracking branch 'origin/master'

Evolveum · Apr 14, 2016 · 60de732 · 60de732
2 parents 745825f + fa90fe6
commit 60de732
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 390 deletions.
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/...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/gui/admin-gui/src/main/webapp/WEB-INF/wro.xml b/gui/admin-gui/src/main/webapp/WEB-INF/wro.xml
@@ -16,14 +16,8 @@
   -->
 
 <groups xmlns="http://www.isdc.ro/wro">
-    <!-- this group is obsolete, will be removed -->
-    <group name="all">
-        <css>/less/config.less</css>
-        <css>/less/evolveum-obsolete.less</css>
-        <css>/less/global.less</css>
-        <css>/WEB-INF/classes/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.less</css>
-    </group>
 
+    <!-- obsolete will be removed -->
     <group name="midpoint">
         <css>/less/midpoint/midpoint.less</css>
         <js>/js/midpoint/ace-editor.js</js>

diff --git a/gui/admin-gui/src/main/webapp/less/config.less b/gui/admin-gui/src/main/webapp/less/config.less
diff --git a/gui/admin-gui/src/main/webapp/less/evolveum-obsolete.less b/gui/admin-gui/src/main/webapp/less/evolveum-obsolete.less