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

Evolveum · Jul 14, 2014 · e9fb86c · e9fb86c
2 parents 2a47e8a + 710e55f
commit e9fb86c
Show file tree

Hide file tree

Showing 102 changed files with 3,854 additions and 1,255 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -65,7 +65,7 @@
         <h2.version>1.3.171</h2.version>
         <jdbc.postgres>9.1-901.jdbc4</jdbc.postgres>
         <jdbc.mysql>5.1.25</jdbc.mysql>
-        <wicket.version>6.14.0</wicket.version>
+        <wicket.version>6.16.0</wicket.version>
         <groovy.version>1.8.6</groovy.version>
         <activiti-engine.version>5.15.1</activiti-engine.version>
         <activiti-spring.version>5.15.1</activiti-spring.version>

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -124,7 +124,7 @@
         	<groupId>org.webjars</groupId>
     		<artifactId>webjars-locator</artifactId>
     		<version>0.15</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>ro.isdc.wro4j</groupId>
             <artifactId>wro4j-extensions</artifactId>
@@ -141,7 +141,7 @@
                 <exclusion>
                     <!-- unused library (13mb) -->
                     <groupId>org.jruby</groupId>
-                    <artifactId>jruby-complete</artifactId>
+                    <artifactId>jruby-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <!-- unused library (500kb) -->
@@ -158,13 +158,43 @@
                     <groupId>com.google.javascript</groupId>
                     <artifactId>closure-compiler</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- unused library -->
+                    <groupId>org.webjars</groupId>
+                    <artifactId>coffee-script</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- unused library -->
+                    <groupId>org.codehaus.gmaven.runtime</groupId>
+                    <artifactId>gmaven-runtime-1.7</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- unused library -->
+                    <groupId>com.github.lltyk</groupId>
+                    <artifactId>dojo-shrinksafe</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- unused library -->
+                    <groupId>org.webjars</groupId>
+                    <artifactId>emberjs</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- unused library -->
+                    <groupId>org.webjars</groupId>
+                    <artifactId>handlebars</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- unused library -->
+                    <groupId>org.webjars</groupId>
+                    <artifactId>json2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <!-- unused library -->
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
-            <version>1.7R4</version>
-        </dependency>
 
         <!-- MIDPOINT LOCALIZATION -->
         <dependency>
@@ -349,10 +379,6 @@
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-atmosphere</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-devutils</artifactId>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
@@ -24,7 +24,7 @@
 import com.evolveum.midpoint.web.page.admin.configuration.component.ChooseTypeDialog;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
@@ -207,7 +207,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 
     private void initModalWindows(){
         ModalWindow assignWindow = createModalWindow(ID_MODAL_ASSIGN,
-                createStringResource("AssignmentTablePanel.modal.title.selectAssignment"), 1100, 520);
+                createStringResource("AssignmentTablePanel.modal.title.selectAssignment"), 1100, 560);
         assignWindow.setContent(new AssignablePopupContent(assignWindow.getContentId()){
 
             @Override

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.java
diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessageFilter.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessageFilter.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
@@ -20,6 +20,7 @@
     <tr>
         <td wicket:id="td" style="text-align: right;">
             <span wicket:id="count"/>
+            <div wicket:id="pageSize"/>
         </td>
     </tr>
 </wicket:panel>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java
@@ -1,7 +1,9 @@
 package com.evolveum.midpoint.web.component.data;
 
 import com.evolveum.midpoint.web.component.util.LoadableModel;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractToolbar;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -19,6 +21,7 @@ public class CountToolbar extends AbstractToolbar {
 
     private static final String ID_TD = "td";
     private static final String ID_COUNT = "count";
+    private static final String ID_PAGE_SIZE = "pageSize";
 
     public CountToolbar(DataTable<?, ?> table) {
         super(table);
@@ -41,6 +44,22 @@ public String getObject() {
         Label count = new Label(ID_COUNT, createModel());
         count.setRenderBodyOnly(true);
         td.add(count);
+
+        PageSizePopover popover = new PageSizePopover(ID_PAGE_SIZE) {
+
+            @Override
+            protected void pageSizeChanged(AjaxRequestTarget target) {
+                CountToolbar.this.pageSizeChanged(target);
+            }
+        };
+        popover.add(new VisibleEnableBehaviour() {
+
+            @Override
+            public boolean isVisible() {
+                return CountToolbar.this.isPageSizePopupVisible();
+            }
+        });
+        td.add(popover);
     }
 
     private IModel<String> createModel() {
@@ -84,4 +103,11 @@ protected String load() {
             }
         };
     }
+
+    protected void pageSizeChanged(AjaxRequestTarget target) {
+    }
+
+    protected boolean isPageSizePopupVisible() {
+        return true;
+    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.html
@@ -0,0 +1,42 @@
+<!--
+  ~ Copyright (c) 2010-2013 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+    <button wicket:id="popButton" type="button" class="btn btn-xs btn-default">
+        <i class="fa fa-cog"></i>
+    </button>
+
+    <div wicket:id="popover" class="popover fade left in">
+        <div class="arrow"></div>
+        <h3 class="popover-title"><wicket:message key="PageSizePopover.title"/></h3>
+        <div class="popover-content">
+            <form wicket:id="form">
+                <div class="input-group">
+                    <input wicket:id="input" type="text" size="1" style="display: inline-block; width: auto;"
+                           class="form-control input-sm">
+                    <span class="input-group-btn">
+                        <button wicket:id="button" type="button" class="btn btn-sm btn-success">
+                            <i class="fa fa-check"></i>
+                        </button>
+                    </span>
+                </div>
+            </form>
+        </div>
+    </div>
+</wicket:panel>
+</html>