- Pollen-commits - mailman.cloud.codelutin.com

r3296 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources/i18n
by fdesbois＠users.chorem.org 18 Apr '12

18 Apr '12

Author: fdesbois Date: 2012-04-18 16:51:12 +0200 (Wed, 18 Apr 2012) New Revision: 3296 Url: http://chorem.org/repositories/revision/pollen/3296 Log: fixes #526 : use isRunning method instead of isClosed Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-18 14:51:06 UTC (rev 3295) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-04-18 14:51:12 UTC (rev 3296) @@ -186,11 +186,12 @@ if (!userAllowed) { addActionError(_("pollen.error.userNotAllowed")); - } else if (!poll.isClosed()) { - addActionMessage(_("pollen.error.pollNotClosed")); + + } else if (poll.isRunning(serviceContext.getCurrentTime())) { + addActionMessage(_("pollen.information.pollRunning")); loadResults(); + } else { - loadResults(); } } Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-18 14:51:06 UTC (rev 3295) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-18 14:51:12 UTC (rev 3296) @@ -42,6 +42,7 @@ pollen.action.register=Register pollen.action.send=Send pollen.action.validate=Submit +pollen.banner.newVersion=New version\! pollen.common.aboutPoll=About the poll pollen.common.addingChoices=Adding choices pollen.common.administrator=Admin @@ -169,7 +170,6 @@ pollen.error.poll.votingList.weight.not.valid=The group's weight is not valid (must be greater than 0) pollen.error.pollAccount.not.found=Poll account not found pollen.error.pollAccount.votingId.required=Name mandatory -pollen.error.pollNotClosed=The poll is not closed. Results may change. pollen.error.pollNotFound=The poll you want to count does not exist. pollen.error.pollTabErrorFound=Some errors were found on this tab, please fix them to finalize the poll creation. pollen.error.user.alreadyVoted=Someone has already used the name %s to vote. @@ -221,6 +221,7 @@ pollen.information.pollClosed=This poll is closed. You can not vote anymore. pollen.information.pollFinished=This poll is finished. You can not vote anymore. pollen.information.pollNotStarted=This poll has not started yet. +pollen.information.pollRunning=The poll is not finished. Results may change. pollen.information.user.created=User %s created. pollen.information.user.deleted=User %s deleted. pollen.information.user.updated=User %s updated. @@ -272,4 +273,3 @@ pollen.title.selectPersonListToCreateVotingList=Select a favorite list to import in a new voting list pollen.title.usersList=Users administration vote.anonymous=Anonymous vote -pollen.banner.newVersion=New version! \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-18 14:51:06 UTC (rev 3295) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-18 14:51:12 UTC (rev 3296) @@ -47,6 +47,7 @@ pollen.action.register=S'enregistrer pollen.action.send=Envoyer pollen.action.validate=Valider +pollen.banner.newVersion=Nouvelle version \! pollen.common.aboutPoll=A propos du sondage pollen.common.addingChoices=Ajout des choix pollen.common.administrator=Admin @@ -175,7 +176,6 @@ pollen.error.poll.votingList.weight.not.valid=Poids du groupe votant non valide (doit être une nombre supérieur à 0). pollen.error.pollAccount.not.found=Membre non trouvé pollen.error.pollAccount.votingId.required=Nom obliqatoire -pollen.error.pollNotClosed=Ce sondage n'est pas clos. Les résultats peuvent encore changer. pollen.error.pollNotFound=Le sondage que vous voulez dépouiller n'existe pas. pollen.error.pollTabErrorFound=Des erreurs ont été detectées dans cet onglet, veuillez les corriger pour valider la création du sondage. pollen.error.user.alreadyVoted=Une personne a déjà voté sous le nom %s. @@ -228,6 +228,7 @@ pollen.information.pollClosed=Ce sondage est clos. Vous ne pouvez plus voter. pollen.information.pollFinished=Ce sondage est terminé. Vous ne pouvez plus voter. pollen.information.pollNotStarted=Ce sondage n'a pas encore commencé. +pollen.information.pollRunning=Ce sondage n'est pas terminé. Les résultats peuvent encore changer. pollen.information.user.created=L'utilisateur %s a été créé. pollen.information.user.deleted=L'utilisateur %s a été supprimé. pollen.information.user.updated=L'utilisateur %s a été mis à jour. @@ -280,4 +281,3 @@ pollen.title.usersList=Gestion des utilisateurs title=Création d'un sondage vote.anonymous=Vote anonyme -pollen.banner.newVersion=Nouvelle version !

1 0

r3295 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by fdesbois＠users.chorem.org 18 Apr '12

18 Apr '12

Author: fdesbois Date: 2012-04-18 16:51:06 +0200 (Wed, 18 Apr 2012) New Revision: 3295 Url: http://chorem.org/repositories/revision/pollen/3295 Log: validation problem on email Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-18 14:51:01 UTC (rev 3294) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-18 14:51:06 UTC (rev 3295) @@ -431,7 +431,7 @@ } String creatorEmail = poll.getCreator().getEmail(); - if (creatorEmail != null && !StringUtil.isEmail(creatorEmail)) { + if (StringUtils.isNotBlank(creatorEmail) && !StringUtil.isEmail(creatorEmail)) { addOptionsError("poll.creator.email", _("pollen.error.email.invalid"));

1 0

r3294 - trunk/pollen-ui-struts2/src/main/webapp/css
by fdesbois＠users.chorem.org 18 Apr '12

18 Apr '12

Author: fdesbois Date: 2012-04-18 16:51:01 +0200 (Wed, 18 Apr 2012) New Revision: 3294 Url: http://chorem.org/repositories/revision/pollen/3294 Log: improve style for input Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-04-18 10:14:00 UTC (rev 3293) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-04-18 14:51:01 UTC (rev 3294) @@ -142,4 +142,12 @@ .buttons input { margin-left: 10px; +} + +#tgeneral .wwlbl { + width: 160px; +} + +#toptions .wwlbl { + width: 260px; } \ No newline at end of file

1 0

r3293 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions resources resources/i18n
by fdesbois＠users.chorem.org 18 Apr '12

18 Apr '12

Author: fdesbois Date: 2012-04-18 12:14:00 +0200 (Wed, 18 Apr 2012) New Revision: 3293 Url: http://chorem.org/repositories/revision/pollen/3293 Log: add DateConverter to format dates Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-04-18 10:14:00 UTC (rev 3293) @@ -0,0 +1,51 @@ +package org.chorem.pollen.ui.actions; + +import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.util.StrutsTypeConverter; +import org.nuiton.i18n.I18n; +import org.nuiton.util.DateUtil; + +import java.text.ParseException; +import java.util.Date; +import java.util.Locale; +import java.util.Map; + +/** + * Created: 18/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public class DateConverter extends StrutsTypeConverter { + + private static final Log log = LogFactory.getLog(DateConverter.class); + + @Override + public Date convertFromString(Map context, String[] values, Class toClass) { + String value = values[0]; + Date result = null; + if (StringUtils.isNotBlank(value)) { + try { + result = DateUtil.parseDate(value, getDatePattern()); + } catch (ParseException e) { + log.error("Error parsing date '" + value + "'", e); + } + } + return result; + } + + @Override + public String convertToString(Map context, Object o) { + Date date = (Date) o; + String formatedDate = DateUtil.formatDate(date, getDatePattern()); + return formatedDate; + } + + protected String getDatePattern() { + Locale locale = ActionContext.getContext().getLocale(); + String result = I18n.l_(locale, "pollen.common.datePattern"); + return result; + } +} Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-18 10:13:55 UTC (rev 3292) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-18 10:14:00 UTC (rev 3293) @@ -60,6 +60,7 @@ pollen.common.commentText=Comment pollen.common.comments=Comments about this poll pollen.common.csvImport=CSV import +pollen.common.datePattern=MM/dd/yyyy HH\:mm a pollen.common.description=Description pollen.common.displayType-group=Results by groups pollen.common.displayType-normal=Results Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-18 10:13:55 UTC (rev 3292) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-18 10:14:00 UTC (rev 3293) @@ -65,6 +65,7 @@ pollen.common.commentText=Commentaire pollen.common.comments=Commentaire à propos du sondage pollen.common.csvImport=Import CSV +pollen.common.datePattern=dd/MM/yyyy HH\:mm pollen.common.description=Description pollen.common.displayType-group=Résultats par groupes pollen.common.displayType-normal=Résultats Modified: trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-04-18 10:13:55 UTC (rev 3292) +++ trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-04-18 10:14:00 UTC (rev 3293) @@ -21,4 +21,5 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -org.chorem.pollen.bean.PollUri=org.chorem.pollen.ui.actions.PollUriConverter \ No newline at end of file +org.chorem.pollen.bean.PollUri=org.chorem.pollen.ui.actions.PollUriConverter +java.util.Date=org.chorem.pollen.ui.actions.DateConverter \ No newline at end of file

1 0

r3292 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/decorators css
by fdesbois＠users.chorem.org 18 Apr '12

18 Apr '12

Author: fdesbois Date: 2012-04-18 12:13:55 +0200 (Wed, 18 Apr 2012) New Revision: 3292 Url: http://chorem.org/repositories/revision/pollen/3292 Log: improve some style on messages Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/css/common.css Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-18 10:13:50 UTC (rev 3291) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-18 10:13:55 UTC (rev 3292) @@ -265,8 +265,8 @@ <%--<div t:type="nuiton/feedback" t:id="borderFeedback" t:autoClear="false"/>--%> <s:if test="hasActionMessages()"> - <div class="info_success"> - <ul class="actionMessages"> + <div class="info_success clearfix"> + <ul class="actionMessages fleft"> <s:iterator value="actionMessages" var="message"> <li><span><s:property value="#message" escapeHtml="false"/></span></li> </s:iterator> @@ -275,8 +275,8 @@ </s:if> <s:if test="hasActionErrors()"> - <div class="info_error"> - <ul class="actionErrors"> + <div class="info_error clearfix"> + <ul class="actionErrors fleft"> <s:iterator value="actionErrors" var="message"> <li><span><s:property value="#message" escapeHtml="false"/></span></li> </s:iterator> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-04-18 10:13:50 UTC (rev 3291) +++ trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-04-18 10:13:55 UTC (rev 3292) @@ -113,10 +113,12 @@ border: 2px solid #9FCF9F; width: 970px; margin-bottom: 5px; + margin-top: 10px; } .info_success ul{ margin: 5px; padding-left: 5px; + width: 950px; } .info_success li{ background: url("../img/true.png") no-repeat ; @@ -132,10 +134,12 @@ border: 2px solid #DD0000; width: 970px; margin-bottom: 5px; + margin-top: 10px; } .info_error ul{ margin: 5px; padding-left: 5px; + width: 950px; } .info_error li{ background: url("../img/exclamation.png") no-repeat ;

1 0

r3291 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp
by fdesbois＠users.chorem.org 18 Apr '12

18 Apr '12

Author: fdesbois Date: 2012-04-18 12:13:50 +0200 (Wed, 18 Apr 2012) New Revision: 3291 Url: http://chorem.org/repositories/revision/pollen/3291 Log: fixes #524 : link issue for result page, need the creatorId token to display the page (security for not public results) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-04-18 10:13:45 UTC (rev 3290) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-04-18 10:13:50 UTC (rev 3291) @@ -95,7 +95,7 @@ result += formatLink("${voteUrl}" + id, "${voteImg}", "Vote", "${voteTitle}") } if (cellvalue.indexOf('result') > -1) { - result += formatLink("${resultUrl}" + id, "${resultImg}", "Result", "${resultTitle}") + result += formatLink("${resultUrl}" + adminId, "${resultImg}", "Result", "${resultTitle}") } if (cellvalue.indexOf('edit') > -1) { result += formatLink("${editUrl}" + adminId, "${editImg}", "Edit", "${editTitle}")

1 0

r3290 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/webapp/css pollen-ui-struts2/src/main/webapp/js
by fdesbois＠users.chorem.org 18 Apr '12

18 Apr '12

Author: fdesbois Date: 2012-04-18 12:13:45 +0200 (Wed, 18 Apr 2012) New Revision: 3290 Url: http://chorem.org/repositories/revision/pollen/3290 Log: add license header (ignored for tiptip) Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-04-18 09:41:14 UTC (rev 3289) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-04-18 10:13:45 UTC (rev 3290) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.services; import org.chorem.pollen.business.persistence.PollAccount; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java 2012-04-18 09:41:14 UTC (rev 3289) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java 2012-04-18 10:13:45 UTC (rev 3290) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.services; import com.google.common.base.Predicate; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-04-18 09:41:14 UTC (rev 3289) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-04-18 10:13:45 UTC (rev 3290) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /* *##% Pollen * Copyright (C) 2010 CodeLutin * Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-04-18 09:41:14 UTC (rev 3289) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-04-18 10:13:45 UTC (rev 3290) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.services.impl; import com.google.common.collect.Iterables; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-04-18 09:41:14 UTC (rev 3289) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-04-18 10:13:45 UTC (rev 3290) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.services.impl; import com.google.common.collect.Lists; Modified: trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css 2012-04-18 09:41:14 UTC (rev 3289) +++ trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css 2012-04-18 10:13:45 UTC (rev 3290) @@ -1,5 +1,23 @@ -/* TipTip CSS - Version 1.2 */ - + /* %%Ignore-License + * TipTip + * Copyright 2010 Drew Wilson + * www.drewwilson.com + * code.drewwilson.com/entry/tiptip-jquery-plugin + * + * Version 1.3 - Updated: Mar. 23, 2010 + * + * This Plug-In will create a custom tooltip to replace the default + * browser tooltip. It is extremely lightweight and very smart in + * that it detects the edges of the browser window and will make sure + * the tooltip stays within the current window size. As a result the + * tooltip will adjust itself to be displayed above, below, to the left + * or to the right depending on what is necessary to stay within the + * browser window. It is completely customizable as well via CSS. + * + * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ #tiptip_holder { display: none; position: absolute; Modified: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js 2012-04-18 09:41:14 UTC (rev 3289) +++ trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js 2012-04-18 10:13:45 UTC (rev 3290) @@ -1,4 +1,4 @@ - /* + /* %%Ignore-License * TipTip * Copyright 2010 Drew Wilson * www.drewwilson.com

1 0

r3289 - in trunk/pollen-ui-struts2/src/main: resources/i18n webapp/WEB-INF/decorators
by athimel＠users.chorem.org 18 Apr '12

18 Apr '12

Author: athimel Date: 2012-04-18 11:41:14 +0200 (Wed, 18 Apr 2012) New Revision: 3289 Url: http://chorem.org/repositories/revision/pollen/3289 Log: Update banner Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-18 09:32:51 UTC (rev 3288) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-18 09:41:14 UTC (rev 3289) @@ -271,3 +271,4 @@ pollen.title.selectPersonListToCreateVotingList=Select a favorite list to import in a new voting list pollen.title.usersList=Users administration vote.anonymous=Anonymous vote +pollen.banner.newVersion=New version! \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-18 09:32:51 UTC (rev 3288) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-18 09:41:14 UTC (rev 3289) @@ -279,3 +279,4 @@ pollen.title.usersList=Gestion des utilisateurs title=Création d'un sondage vote.anonymous=Vote anonyme +pollen.banner.newVersion=Nouvelle version ! Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-18 09:32:51 UTC (rev 3288) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-18 09:41:14 UTC (rev 3289) @@ -43,7 +43,7 @@ <%-- TODO AThimel 24/01/2012 Remove this when refactoring is over --%> <div id="in-progress"> - <a href="http://chorem.org/projects/pollen">Version βeta</a> + <a href="http://chorem.org/projects/pollen"><s:text name="pollen.banner.newVersion"/></a> </div>

1 0

r3288 - trunk/pollen-ui-struts2/src/main/webapp/css
by athimel＠users.chorem.org 18 Apr '12

18 Apr '12

Author: athimel Date: 2012-04-18 11:32:51 +0200 (Wed, 18 Apr 2012) New Revision: 3288 Url: http://chorem.org/repositories/revision/pollen/3288 Log: Update style in vote/result fieldset Modified: trunk/pollen-ui-struts2/src/main/webapp/css/results.css trunk/pollen-ui-struts2/src/main/webapp/css/vote.css Modified: trunk/pollen-ui-struts2/src/main/webapp/css/results.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-04-18 08:59:12 UTC (rev 3287) +++ trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-04-18 09:32:51 UTC (rev 3288) @@ -44,6 +44,10 @@ text-align: left; } +#resultTop fieldset .wwlbl { + width: 210px; +} + #resultChart { width: 400px; margin: auto; Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-04-18 08:59:12 UTC (rev 3287) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-04-18 09:32:51 UTC (rev 3288) @@ -44,6 +44,10 @@ text-align: left; } +#pollTop fieldset .wwlbl { + width: 210px; +} + #pollZone { /*padding: 10px;*/ text-align: center;

1 0

r3287 - in trunk/src/site: . resources
by tchemit＠users.chorem.org 18 Apr '12

18 Apr '12

Author: tchemit Date: 2012-04-18 10:59:12 +0200 (Wed, 18 Apr 2012) New Revision: 3287 Url: http://chorem.org/repositories/revision/pollen/3287 Log: fixes #527: Improve documentation site Removed: trunk/src/site/resources/maven-site-chorem.org.js Modified: trunk/src/site/site_fr.xml Deleted: trunk/src/site/resources/maven-site-chorem.org.js =================================================================== --- trunk/src/site/resources/maven-site-chorem.org.js 2012-04-17 16:34:08 UTC (rev 3286) +++ trunk/src/site/resources/maven-site-chorem.org.js 2012-04-18 08:59:12 UTC (rev 3287) @@ -1,82 +0,0 @@ -/* - * #%L - * EchoBase - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -$(document).ready(function () { - - var metas = $('#projectMetas'); - var piwikEnabled = metas.attr('piwikEnabled'); - if (piwikEnabled) { - //Piwik Tracking Code - var piwikId = metas.attr('piwikId'); - if (!piwikId) { - - // default piwikId for chorem.org - piwikId = 3; - } - - console.log("use Piwik with id = " + piwikId); - var pkBaseURL = "https:" == document.location.protocol ? - "https://piwik.codelutin.com/" : - "http://piwik.codelutin.com/"; - $.getScript(pkBaseURL + "piwik.js", function (data, textStatus, jqxhr) { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", piwikId); - piwikTracker.trackPageView(); - piwikTracker.enableLinkTracking(); - console.log("piwikTracker loaded = " + piwikTracker); - }); - //Piwik Tracking Code - } - var scmwebeditorenabled = metas.attr('scmwebeditorenabled'); - var scm = metas.attr('scm'); - if (scmwebeditorenabled && scm.indexOf("/trunk") > -1) { - - // allow scmwebeditor is enabled and on trunk - - var scmurl = metas.attr('scmwebeditorurl'); - var projectId = metas.attr('projectId'); - var siteSourcesType = metas.attr('siteSourcesType'); - var path; - var pathname = document.location.pathname; - if (pathname.indexOf('target/site') > 0) { - path = pathname.substr(pathname.indexOf('/site')). - replace('/site/', ''); - } else { - if (pathname == '/' + projectId + '/') { - // on / page - path = 'index.html'; - } else { - path = pathname.substr(pathname.indexOf('/' + projectId)). - replace('/' + projectId + '/', ''); - } - } - path = path.replace('.html', '.' + siteSourcesType); - var url = scmurl + "?address=" + scm + "/src/site/" + siteSourcesType + "/" + path; - console.log("Add scmwebeditor with url = " + url); - var html = "<li class='pull-right'><a href='" + url + - "'>Éditer la page</a></li>" + - "<li class='divider pull-right'>|</li>"; - var ul = $('#publishDate'); - ul.prepend(html); - - } -}); \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-17 16:34:08 UTC (rev 3286) +++ trunk/src/site/site_fr.xml 2012-04-18 08:59:12 UTC (rev 3287) @@ -111,7 +111,7 @@ <footer> - <script type="text/javascript" src="./maven-site-chorem.org.js"> + <script type="text/javascript" src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> </script> <div id='projectMetas'

1 0