From 439ea88f97ea058c3348f5d0e124850ef04c038b Mon Sep 17 00:00:00 2001 From: Radovan Semancik Date: Fri, 22 Apr 2016 16:45:10 +0200 Subject: [PATCH 1/4] More compact and better aligned boxed table (buttons, paging) --- .../web/component/data/BoxedTablePanel.html | 14 ++++----- .../src/main/webapp/less/midpoint-theme.less | 30 +++++++++++++++++++ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html index 7215b81e4f8..c111ff96ed7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html @@ -1,5 +1,5 @@ -
-
-
- -
- - - -
-
- -
+
+
+ +
+ + + +
+
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.html index 44a895a1153..818f1c54b4f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.html @@ -1,5 +1,5 @@ + org.codehaus.woodstox + stax2-api + 3.1.4 + org.apache.felix org.osgi.core @@ -1403,6 +1409,9 @@ xml-apis:xml-apis stax:stax-api + + + org.codehaus.woodstox:stax2-api org.apache.cxf:cxf-tools-common diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml index d86b820737e..524cadfb28e 100644 --- a/dist/midpoint-api/pom.xml +++ b/dist/midpoint-api/pom.xml @@ -101,16 +101,19 @@ 2.10.3 true + true com.evolveum.*:* + false + true javadoc-jar package - jar + jar diff --git a/infra/prism/pom.xml b/infra/prism/pom.xml index 7187d2a4567..0230d6b3529 100644 --- a/infra/prism/pom.xml +++ b/infra/prism/pom.xml @@ -111,6 +111,11 @@ org.jvnet.jaxb2_commons jaxb2-basics-runtime + + + org.codehaus.woodstox + stax2-api +