Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Apr 22, 2016
2 parents 931193a + 24dcbda commit 54abd5f
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 56 deletions.
9 changes: 9 additions & 0 deletions build-system/pom.xml
View file
Expand Up @@ -556,6 +556,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- make this dependency explicit to detect conflicts with older versions -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>3.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
Expand Down Expand Up @@ -1403,6 +1409,9 @@
<!-- There is some kind of conflict between these. TODO: clean up -->
<ignoredUnusedDeclaredDependency>xml-apis:xml-apis</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>stax:stax-api</ignoredUnusedDeclaredDependency>

<!-- We are making this dependency explicit to detect conflicts early -->
<ignoredUnusedDeclaredDependency>org.codehaus.woodstox:stax2-api</ignoredUnusedDeclaredDependency>

<!-- The xjc-plugin does not compile without dependency on this -->
<ignoredUnusedDeclaredDependency>org.apache.cxf:cxf-tools-common</ignoredUnusedDeclaredDependency>
Expand Down
5 changes: 4 additions & 1 deletion dist/midpoint-api/pom.xml
View file
Expand Up @@ -101,16 +101,19 @@
<version>2.10.3</version>
<configuration>
<includeDependencySources>true</includeDependencySources>
<includeTransitiveDependencySources>true</includeTransitiveDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>com.evolveum.*:*</dependencySourceInclude>
</dependencySourceIncludes>
<quiet>false</quiet>
<debug>true</debug>
</configuration>
<executions>
<execution>
<id>javadoc-jar</id>
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>jar</goal>
<goal>jar</goal>
</goals>
</execution>
</executions>
Expand Down
14 changes: 7 additions & 7 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html
View file
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2010-2015 Evolveum
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="box" wicket:id="box">
<div class="box boxed-table" wicket:id="box">
<div class="box-header" wicket:id="header"/>
<div wicket:id="tableContainer" class="box-body no-padding">
<table class="table table-striped table-hover table-bordered" wicket:id="table" about="table"/>
Expand All @@ -27,12 +27,12 @@
</wicket:panel>

<wicket:fragment wicket:id="pagingFooter">
<div class="row">
<div class="col-md-6" wicket:id="buttonToolbar"/>
<div wicket:id="footerContainer" class="col-md-6">
<div class="boxed-table-footer">
<div class="boxed-table-footer-button-toolbar" wicket:id="buttonToolbar"/>
<div class="boxed-table-footer-paging" wicket:id="footerContainer">
<div class="dataTables_info" wicket:id="count"/>
<div class="paging_bootstrap" wicket:id="paging" />
<div wicket:id="menu"/>
<div wicket:id="paging" class="dataTables_paginate paging_bootstrap" />
<div class="dataTables_info pull-right" wicket:id="count" style="margin-right: 10px;"/>
</div>
</div>
</wicket:fragment>
Expand Down
2 changes: 1 addition & 1 deletion ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
View file
Expand Up @@ -252,7 +252,7 @@ protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
};
DebugSearchDto search = searchModel.getObject();
ObjectQuery query = search.getSearch().createObjectQuery(getPrismContext());
provider.setQuery(query);
provider.setQuery(createQuery(query));

addOrReplaceTable(provider);

Expand Down
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2015 Evolveum
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@
<wicket:extend>
<div class="row">
<div class="col-md-6">
<div wicket:id="searchPanel" class="box box-solid"/>
<div class="quicksearch-panel" wicket:id="searchPanel"/>
<div wicket:id="linksPanel"/>
</div>
<div class="col-md-6">
Expand Down
42 changes: 20 additions & 22 deletions ...gui/src/main/java/com/evolveum/midpoint/web/page/self/component/DashboardSearchPanel.html
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
~ Copyright (c) 2010-2013 Evolveum
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -15,25 +15,23 @@
~ limitations under the License.
-->
<wicket:panel xmlns:wicket="http://wicket.apache.org">
<div class="box-body">
<form wicket:id="searchForm">
<div class="input-group">
<input wicket:id="searchInput" class="form-control" type="text" />
<div class="input-group-btn">
<button wicket:id="searchButton" class="btn btn-primary">
<i class="fa fa-search"/>&nbsp;
<span wicket:id="buttonLabel"/>
</button>
<button aria-expanded="false" type="button" class="btn btn-primary dropdown-toggle"
data-toggle="dropdown">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu" wicket:id="searchTypes">
<li><a wicket:id="searchTypeItem" href="#"><span wicket:id="linkLabel"/></a></li>
</ul>
</div>
</div>
</form>
</div>
<form wicket:id="searchForm">
<div class="input-group">
<input wicket:id="searchInput" class="form-control" type="text" />
<div class="input-group-btn">
<button wicket:id="searchButton" class="btn btn-primary">
<i class="fa fa-search"/>&nbsp;
<span wicket:id="buttonLabel"/>
</button>
<button aria-expanded="false" type="button" class="btn btn-primary dropdown-toggle"
data-toggle="dropdown">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu" wicket:id="searchTypes">
<li><a wicket:id="searchTypeItem" href="#"><span wicket:id="linkLabel"/></a></li>
</ul>
</div>
</div>
</form>
</wicket:panel>
32 changes: 15 additions & 17 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/LinksPanel.html
View file
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2010-2013 Evolveum
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -16,21 +16,19 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<table width="100%">
<tr wicket:id="linksRow" class="row">
<td wicket:id="linksColumn" class="col-sm-6">
<a href="#" wicket:id="link">
<div class="info-box">
<div class="info-box-icon bg-blue fa fa-tasks" wicket:id="imageId"/>

<div class="info-box-content">
<span class="info-box-number" wicket:id="labelId"/>
<span wicket:id="descriptionId"/>
</div>
</div>
</a>
</td>
</tr>
</table>
<div class="row" wicket:id="linksRow">
<div class="col-sm-6" wicket:id="linksColumn">
<a href="#" wicket:id="link">
<div class="info-box">
<div class="info-box-icon bg-blue fa fa-tasks" wicket:id="imageId"/>

<div class="info-box-content">
<span class="info-box-number" wicket:id="labelId"/>
<span wicket:id="descriptionId"/>
</div>
</div>
</a>
</div>
</div>
</wicket:panel>
</html>
36 changes: 36 additions & 0 deletions gui/admin-gui/src/main/webapp/less/midpoint-theme.less
View file
Expand Up @@ -363,6 +363,42 @@ th.cog, td.cog {
#info-box-icon-summary-panel(@object-resource-color);
}

// End-user home (PageSelfDashboard)

.quicksearch-panel {
margin-bottom: 20px;
}

// Datables/lists (BoxedTablePanel)

.boxed-table {
margin-bottom: 0px;
}

.boxed-table-footer-button-toolbar {
display: inline-block;
}

.boxed-table-footer-paging {
display: block;
float: right;

.btn-group {
margin-left: 10px;
vertical-align: top;
}

.paging_bootstrap {
display: inline-block;
}

.dataTables_info {
margin-right: 10px;
display: inline-block;
vertical-align: top;
}
}

// capability buttons in resource details page
.btn-resource-capability {
width: 90px;
Expand Down
5 changes: 5 additions & 0 deletions infra/prism/pom.xml
View file
Expand Up @@ -111,6 +111,11 @@
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics-runtime</artifactId>
</dependency>
<dependency>
<!-- make this dependency explicit to detect conflicts with older versions -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</dependency>

<!-- Xtext for schema IDE tooling (experimental) -->
<!-- <dependency>
Expand Down
13 changes: 7 additions & 6 deletions samples/model-client-sample/pom.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2015 Evolveum
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -24,6 +24,7 @@
<version>3.4-SNAPSHOT</version>
<properties>
<project.source.version>1.7</project.source.version>
<cxf.version>3.1.6</cxf.version>
</properties>
<organization>
<name>Evolveum</name>
Expand All @@ -41,7 +42,7 @@
<developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
<url>https://fisheye.evolveum.com/browse/midPoint</url>
</scm>

<distributionManagement>
<repository>
<id>evolveum-nexus</id>
Expand Down Expand Up @@ -149,22 +150,22 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>3.0.0</version>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>3.0.0</version>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>3.0.0</version>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>3.0.0</version>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down

0 comments on commit 54abd5f

Please sign in to comment.