Author: ymartel Date: 2012-06-11 10:51:58 +0200 (Mon, 11 Jun 2012) New Revision: 181 Url: http://chorem.org/repositories/revision/chorem/181 Log: - Migrate to mavenpom 3.3.3 - Add forgotten CSS for timepicker Added: trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/pom.xml Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-06-06 15:44:15 UTC (rev 180) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-06-11 08:51:58 UTC (rev 181) @@ -1,22 +1,8 @@ package org.chorem.webmotion.actions; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -25,7 +11,6 @@ import org.chorem.entities.Attachment; import org.chorem.entities.Category; import org.chorem.entities.Configuration; -import org.chorem.entities.ConfigurationImpl; import org.chorem.entities.Employee; import org.chorem.entities.Invoice; import org.chorem.entities.Quotation; @@ -38,16 +23,24 @@ import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.render.Render; import org.nuiton.util.ObjectUtil; -import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.entities.ElementField; -import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; -import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; import org.nuiton.wikitty.query.conditions.Aggregate; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Date; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * * @author poussin @@ -647,6 +640,7 @@ start, end, filter)); } String companyId = client.getConfiguration().getDefaultCompany(); + //TODO ymartel 2012/06/07 : manage when companyId is not defined. if (start == null) { start = new Date(); Added: trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css =================================================================== --- trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css 2012-06-11 08:51:58 UTC (rev 181) @@ -0,0 +1,6 @@ +.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; } +.ui-timepicker-div dl { text-align: left; } +.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; } +.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; } +.ui-timepicker-div td { font-size: 90%; } +.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-06 15:44:15 UTC (rev 180) +++ trunk/pom.xml 2012-06-11 08:51:58 UTC (rev 181) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.2-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>org.chorem</groupId>