April 2011 - Bow-commits - mailman.cloud.codelutin.com

r276 - in trunk: . bow-ui/src/main/java/org/chorem/bow/action bow-ui/src/main/java/org/chorem/bow/interceptor bow-ui/src/main/resources
by bpoussin＠users.chorem.org April 29, 2011

April 29, 2011

Author: bpoussin Date: 2011-04-29 23:02:55 +0200 (Fri, 29 Apr 2011) New Revision: 276 Url: http://chorem.org/repositories/revision/bow/276 Log: ca remarche a peu pres, il reste des petites choses il faut penser a mettre a jour ses url bookmarke et son opensearch (en gros avant: ?action=quelqueChose&, maintenant: quelqueChose.action?) le Token permanent a sans doute aussi chang?\195?\169 suite a la migration Added: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java Removed: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java trunk/bow-ui/src/main/resources/struts.xml trunk/pom.xml Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java 2011-04-28 15:26:48 UTC (rev 275) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java 2011-04-29 21:02:55 UTC (rev 276) @@ -56,7 +56,7 @@ @Override public void setServletRequest(HttpServletRequest request) { - this.request = request; + this.request = request; } /** @@ -65,12 +65,12 @@ public String execute() { try { BowPreference user = getBowSession().getPreference(); - + BowInit.initHomePage(request, user); } catch (Exception e) { addActionError(getText(n_("bow.error.internal"))); log.error(e.getMessage(), e); } - return SUCCESS; + return SUCCESS; } } \ No newline at end of file Deleted: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java 2011-04-28 15:26:48 UTC (rev 275) +++ trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java 2011-04-29 21:02:55 UTC (rev 276) @@ -1,67 +0,0 @@ -/* - * #%L - * bow - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 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.bow.interceptor; - -import java.util.Map; - -import org.apache.struts2.ServletActionContext; -import org.chorem.bow.BowUser; - -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import org.chorem.bow.BowSession; - -/** - * Interceptor used to redirect a logged user if he tries to access a page on - * which you mustn't be logged (example : login / register page) - */ -public class AldyLoggedInterceptor extends AbstractInterceptor { - private static final long serialVersionUID = -2411549996072421471L; - protected String redirect; - - /** - * @param redirect the redirect to set - */ - public void setRedirect(String redirect) { - this.redirect = redirect; - } - - @Override - public String intercept(ActionInvocation invocation) throws Exception { - Map<String, Object> session = ActionContext.getContext().getSession(); - - BowSession bowSession = BowSession.getBowSession(session); - BowUser user = bowSession.getUser(); - String result = invocation.invoke(); - - //If the user is logged - if (user != null) { - ServletActionContext.getResponse().sendRedirect(redirect); - result = null; - } - return result; - } - -} Modified: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-04-28 15:26:48 UTC (rev 275) +++ trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-04-29 21:02:55 UTC (rev 276) @@ -72,13 +72,12 @@ //Authenticates the user bowSession.setUser(user); } - } else { - //If the token is empty - ServletActionContext.getResponse().sendRedirect(redirect); } } - if (user != null) { + if (user == null) { + ServletActionContext.getResponse().sendRedirect(redirect); + } else { result = invocation.invoke(); } Added: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java (rev 0) +++ trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java 2011-04-29 21:02:55 UTC (rev 276) @@ -0,0 +1,46 @@ +/* + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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.bow.interceptor; + +import java.util.Map; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.chorem.bow.BowSession; + +/** + * Interceptor used to remove all trace of user in session. Used for login page + */ +public class LogoutInterceptor extends AbstractInterceptor { + private static final long serialVersionUID = -7520186185205372272L; + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + Map<String, Object> session = ActionContext.getContext().getSession(); + BowSession.invalidate(session); + String result = invocation.invoke(); + return result; + } +} Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-28 15:26:48 UTC (rev 275) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-29 21:02:55 UTC (rev 276) @@ -31,42 +31,72 @@ <constant name="struts.ognl.allowStaticMethodAccess" value="true"/> <constant name="struts.enable.SlashesInActionNames" value="true"/> -  - <package name="alias" extends="struts-default"> +  + <package name="publicArea" extends="struts-default"> + <interceptors> + <interceptor-stack name="publicAreaStack"> + <interceptor-ref name="defaultStack"> + <param name="store.operationMode">AUTOMATIC</param> + <param name="fileUpload.allowedExtensions">.html</param> + </interceptor-ref> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="publicAreaStack"/> + </package> + +  + <package name="loginArea" extends="publicArea"> + <interceptors> + <interceptor name="logout" class="org.chorem.bow.interceptor.LogoutInterceptor"/> + <interceptor-stack name="loginAreaStack"> + <interceptor-ref name="logout"/> + <interceptor-ref name="publicAreaStack"/> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="loginAreaStack"/> + </package> + +  + <package name="restrictedArea" extends="publicArea"> + <interceptors> + <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> + <param name="redirect">login_input.action</param> + </interceptor> + <interceptor-stack name="restrictedAreaStack"> + <interceptor-ref name="login"/> + <interceptor-ref name="publicAreaStack"/> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="restrictedAreaStack"/> + </package> + + <package name="alias" extends="publicArea"> <action name="alias/*" class="org.chorem.bow.action.AliasAction"> <param name="alias">{1}</param> <result name="success" type="redirect">${redirectTo}</result> <result name="error" type="redirectAction">home</result> </action> - <action name="*Alias" class="org.chorem.bow.action.AliasAction" method="{1}"> - <result name="success" type="redirectAction">home</result> - <result name="error" type="redirectAction">home</result> - </action> </package> -  - <package name="login" extends="struts-default"> - <interceptors> - <interceptor name="aldyLogged" class="org.chorem.bow.interceptor.AldyLoggedInterceptor"> - <param name="redirect">home.action</param> - </interceptor> - <interceptor-stack name="aldyLoggedStack"> - <interceptor-ref name="aldyLogged"/> - <interceptor-ref name="defaultStack"/> - </interceptor-stack> - </interceptors> + <package name="login" extends="loginArea"> <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> - <interceptor-ref name="aldyLoggedStack"/> <result name="input">/jsp/register.jsp</result> <result type="redirectAction">home</result> </action> <action name="forgotPassword_*" method="{1}" class="org.chorem.bow.action.ForgotPasswordAction"> - <interceptor-ref name="aldyLoggedStack"/> <result name="input">/jsp/forgotPassword.jsp</result> <result type="redirectAction">login_input</result> </action> <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> - <interceptor-ref name="aldyLoggedStack"/> <result name="input">/jsp/login.jsp</result> <result name="login" type="redirectAction">home</result> <result type="redirectAction">home</result> @@ -76,45 +106,12 @@ </action> </package> - <package name="bookmark" extends="struts-default"> - <interceptors> - <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> - <param name="redirect">login_input.action</param> - </interceptor> - <interceptor-stack name="loginStack"> - <interceptor-ref name="login"/> - <interceptor-ref name="defaultStack"/> - </interceptor-stack> - </interceptors> + <package name="bookmark" extends="restrictedArea"> <action name="importBookmarks" class="org.chorem.bow.action.ImportBookmarksAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="login"/> - <interceptor-ref name="exception"/> - <interceptor-ref name="alias"/> - <interceptor-ref name="servletConfig"/> - <interceptor-ref name="i18n"/> - <interceptor-ref name="prepare"/> - <interceptor-ref name="chain"/> - <interceptor-ref name="debugging"/> - -  - <interceptor-ref name="fileUpload"> - <param name="allowedExtensions">.html</param> - </interceptor-ref> - <interceptor-ref name="staticParams"/> - <interceptor-ref name="actionMappingParams"/> - <interceptor-ref name="params"> - <param name="excludeParams">dojo\..*,^struts\..*</param> - </interceptor-ref> - <interceptor-ref name="conversionError"/> - <result type="redirectAction">preferences</result> <result name="error">/jsp/preferences.jsp</result> </action> <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction"> - <interceptor-ref name="loginStack"/> <result type="stream"> <param name="contentType">application/octet-stream</param> <param name="inputName">inputStream</param> @@ -122,85 +119,39 @@ </result> </action> <action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result type="redirect">${redirectTo}</result> </action> <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result type="redirectAction">preferences</result> </action> <action name="addUrl" class="org.chorem.bow.action.AddUrlAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result type="redirect">${redirectTo}</result> </action> </package> - <package name="search" extends="struts-default"> - <interceptors> - <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> - <param name="redirect">login_input.action</param> - </interceptor> - <interceptor-stack name="loginStack"> - <interceptor-ref name="login"/> - <interceptor-ref name="defaultStack"/> - </interceptor-stack> - </interceptors> + <package name="search" extends="restrictedArea"> <action name="search" class="org.chorem.bow.action.SearchAction"> - <interceptor-ref name="store"> - <param name="operationMode">RETRIEVE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result>/jsp/search.jsp</result> </action> <action name="fullText" class="org.chorem.bow.action.FullTextSearchAction"> - <interceptor-ref name="loginStack"/> <result>/jsp/search.jsp</result> </action> <action name="order" class="org.chorem.bow.action.OrderAction"> - <interceptor-ref name="loginStack"/> <result>/jsp/search.jsp</result> </action> <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> - <interceptor-ref name="loginStack"/> <result type="redirect">${redirectTo}</result> </action> <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> - <interceptor-ref name="loginStack"/> <result>/jsp/suggestions.jsp</result> </action> <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result type="redirectAction">home</result> </action> </package> - <package name="misc" extends="struts-default"> - <interceptors> - <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> - <param name="redirect">login_input.action</param> - </interceptor> - <interceptor-stack name="loginStack"> - <interceptor-ref name="login"/> - <interceptor-ref name="defaultStack"/> - </interceptor-stack> - </interceptors> + <package name="misc" extends="restrictedArea"> <action name="home" class="org.chorem.bow.action.HomeAction"> - <interceptor-ref name="store"> - <param name="operationMode">RETRIEVE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result>/jsp/home.jsp</result> <result name="input" type="redirectAction">home</result> </action> @@ -208,14 +159,9 @@ <result type="redirect">/jsp/login.jsp</result> </action> <action name="regenPermToken" class="org.chorem.bow.action.GenerateTokenAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result type="redirectAction">preferences</result> </action> <action name="redirectToUrl" class="org.chorem.bow.action.RedirectToUrlAction"> - <interceptor-ref name="loginStack"/> <result name="error" type="redirectAction">home</result> <result type="redirect">${link}</result> </action> @@ -228,35 +174,21 @@ </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="store"> - <param name="operationMode">RETRIEVE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result name="update" type="redirectAction">preferences</result> <result name="error">/jsp/preferences.jsp</result> <result>/jsp/preferences.jsp</result> </action> <action name="admin"> - <interceptor-ref name="loginStack"/> <result name="error">/jsp/login.jsp</result> <result>/jsp/admin.jsp</result> </action> <action name="reIndexation" class="org.chorem.bow.action.ReIndexationAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> <result>/jsp/admin.jsp</result> </action> <action name="migrate04To05" class="org.chorem.bow.action.Migrate04To05Action"> - <interceptor-ref name="loginStack"/> <result>/jsp/admin.jsp</result> </action> <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> - <interceptor-ref name="loginStack"/> <result>/jsp/editBookmark.jsp</result> </action> </package> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-28 15:26:48 UTC (rev 275) +++ trunk/pom.xml 2011-04-29 21:02:55 UTC (rev 276) @@ -122,7 +122,7 @@ <eugenePluginVersion>2.3.2</eugenePluginVersion> <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.1</wikittyVersion> + <wikittyVersion>3.1.1-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.1.8.1</struts2Version> <xWorkCoreVersion>2.1.6</xWorkCoreVersion>

1 0

r275 - trunk/bow-extension-chromium/src/main/webapp
by bpoussin＠users.chorem.org April 28, 2011

April 28, 2011

Author: bpoussin Date: 2011-04-28 17:26:48 +0200 (Thu, 28 Apr 2011) New Revision: 275 Url: http://chorem.org/repositories/revision/bow/275 Log: mise a jour de l'url d'envoi pour etre utilisable avec struts Modified: trunk/bow-extension-chromium/src/main/webapp/popup.html Modified: trunk/bow-extension-chromium/src/main/webapp/popup.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-04-28 10:44:50 UTC (rev 274) +++ trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-04-28 15:26:48 UTC (rev 275) @@ -54,10 +54,10 @@ var tagsValue = tagsInput.value; //BOW_URL is defined in properties.js - var link = BOW_URL + "/bow?action=addUrl&token=" + tokenId - + "&url=" + encodeURIComponent(url) + var link = BOW_URL + "/addUrl?token=" + tokenId + + "&link=" + encodeURIComponent(url) + "&name=" + encodeURIComponent(nameValue) - + "&alias=" + encodeURIComponent(aliasValue) + + "&privateAlias=" + encodeURIComponent(aliasValue) + "&tags=" + encodeURIComponent(tagsValue); var xhr = new XMLHttpRequest();

1 0

r274 - trunk/bow-ui/src/main/java/org/chorem/bow/interceptor
by bpoussin＠users.chorem.org April 28, 2011

April 28, 2011

Author: bpoussin Date: 2011-04-28 12:44:50 +0200 (Thu, 28 Apr 2011) New Revision: 274 Url: http://chorem.org/repositories/revision/bow/274 Log: si on appelle l'action avant de checker le token, l'interceptor ne sert a rien :( Modified: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-04-28 10:44:13 UTC (rev 273) +++ trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-04-28 10:44:50 UTC (rev 274) @@ -55,8 +55,8 @@ BowSession bowSession = BowSession.getBowSession(session); BowUser user = bowSession.getUser(); - String result = invocation.invoke(); - + String result = null; + //If the user isn't logged in if (user == null) { Map<String, Object> params = ActionContext.getContext().getParameters(); @@ -75,9 +75,13 @@ } else { //If the token is empty ServletActionContext.getResponse().sendRedirect(redirect); - result = null; } } + + if (user != null) { + result = invocation.invoke(); + } + return result; } }

1 0

r273 - trunk/bow-ui/src/main/java/org/chorem/bow/action
by bpoussin＠users.chorem.org April 28, 2011

April 28, 2011

Author: bpoussin Date: 2011-04-28 12:44:13 +0200 (Thu, 28 Apr 2011) New Revision: 273 Url: http://chorem.org/repositories/revision/bow/273 Log: les zones de recherche par defaut sont vide et non pas 'null' Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-27 08:56:17 UTC (rev 272) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-28 10:44:13 UTC (rev 273) @@ -52,8 +52,8 @@ protected String tags; protected String nameAndTags; protected String redirectTo; - protected String searchLine; - protected String fullTextLine; + protected String searchLine = ""; + protected String fullTextLine = ""; public String getBookmarkId() { return bookmarkId;

1 0

r272 - in trunk: . bow-extension-chromium bow-ui
by sletellier＠users.chorem.org April 27, 2011

April 27, 2011

Author: sletellier Date: 2011-04-27 10:56:17 +0200 (Wed, 27 Apr 2011) New Revision: 272 Url: http://chorem.org/repositories/revision/bow/272 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/bow-extension-chromium/pom.xml trunk/bow-ui/pom.xml trunk/pom.xml Modified: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml 2011-04-27 08:56:16 UTC (rev 271) +++ trunk/bow-extension-chromium/pom.xml 2011-04-27 08:56:17 UTC (rev 272) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-04-27 08:56:16 UTC (rev 271) +++ trunk/bow-ui/pom.xml 2011-04-27 08:56:17 UTC (rev 272) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 08:56:16 UTC (rev 271) +++ trunk/pom.xml 2011-04-27 08:56:17 UTC (rev 272) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <modules> <module>bow-extension-chromium</module> @@ -108,11 +108,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.5</connection> + <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.5 + scm:svn:http://svn.chorem.org/svn/bow/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/tags/bow-0.5</url> + <url>http://www.chorem.org/repositories/browse/bow/trunk</url> </scm> <properties>

1 0

r271 - tags
by sletellier＠users.chorem.org April 27, 2011

April 27, 2011

Author: sletellier Date: 2011-04-27 10:56:16 +0200 (Wed, 27 Apr 2011) New Revision: 271 Url: http://chorem.org/repositories/revision/bow/271 Log: [maven-release-plugin] copy for tag bow-0.5 Added: tags/bow-0.5/

1 0

r270 - in trunk: . bow-extension-chromium bow-ui
by sletellier＠users.chorem.org April 27, 2011

April 27, 2011

Author: sletellier Date: 2011-04-27 10:56:14 +0200 (Wed, 27 Apr 2011) New Revision: 270 Url: http://chorem.org/repositories/revision/bow/270 Log: [maven-release-plugin] prepare release bow-0.5 Modified: trunk/bow-extension-chromium/pom.xml trunk/bow-ui/pom.xml trunk/pom.xml Modified: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml 2011-04-27 08:51:22 UTC (rev 269) +++ trunk/bow-extension-chromium/pom.xml 2011-04-27 08:56:14 UTC (rev 270) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <artifactId>bow-extension-chromium</artifactId> Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-04-27 08:51:22 UTC (rev 269) +++ trunk/bow-ui/pom.xml 2011-04-27 08:56:14 UTC (rev 270) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <artifactId>bow-ui</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 08:51:22 UTC (rev 269) +++ trunk/pom.xml 2011-04-27 08:56:14 UTC (rev 270) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> <modules> <module>bow-extension-chromium</module> @@ -108,11 +108,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.5</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/bow/trunk + scm:svn:http://svn.chorem.org/svn/bow/tags/bow-0.5 </developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/trunk</url> + <url>http://www.chorem.org/repositories/browse/bow/tags/bow-0.5</url> </scm> <properties>

1 0

r269 - trunk
by sletellier＠users.chorem.org April 27, 2011

April 27, 2011

Author: sletellier Date: 2011-04-27 10:51:22 +0200 (Wed, 27 Apr 2011) New Revision: 269 Url: http://chorem.org/repositories/revision/bow/269 Log: - Up to wikitty 3.1 - Up to nuiton-utils 2.1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 07:11:04 UTC (rev 268) +++ trunk/pom.xml 2011-04-27 08:51:22 UTC (rev 269) @@ -120,9 +120,9 @@ <projectId>bow</projectId> <eugenePluginVersion>2.3.2</eugenePluginVersion> - <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.1-SNAPSHOT</wikittyVersion> + <wikittyVersion>3.1</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.1.8.1</struts2Version> <xWorkCoreVersion>2.1.6</xWorkCoreVersion>

1 0

r268 - in trunk: bow-extension-chromium/src/main/webapp bow-extension-chromium/src/main/webapp/_locales/en bow-extension-chromium/src/main/webapp/_locales/fr bow-ui bow-ui/src/license bow-ui/src/main/java/org/chorem/bow/action bow-ui/src/main/webapp/css bow-ui/src/main/webapp/js bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org April 27, 2011

April 27, 2011

Author: sletellier Date: 2011-04-27 09:11:04 +0200 (Wed, 27 Apr 2011) New Revision: 268 Url: http://chorem.org/repositories/revision/bow/268 Log: - Update headers - Remove unused dependency - Fix third-party Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json trunk/bow-extension-chromium/src/main/webapp/manifest.json trunk/bow-extension-chromium/src/main/webapp/properties.js trunk/bow-ui/pom.xml trunk/bow-ui/src/license/THIRD-PARTY.properties trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css trunk/bow-ui/src/main/webapp/js/bookmark.js trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ { "extensionName": { "message": "BOW extension", Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ { "extensionName" : { "message" : "Extension pour BOW", Modified: trunk/bow-extension-chromium/src/main/webapp/manifest.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ { "name": "__MSG_extensionName__", "version": "1.0", Modified: trunk/bow-extension-chromium/src/main/webapp/properties.js =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1 +1,24 @@ +/* + * #%L + * BOW :: Chromium extension + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ var BOW_URL = "http://bow.chorem.org/bow"; Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/pom.xml 2011-04-27 07:11:04 UTC (rev 268) @@ -71,12 +71,6 @@ </dependency> <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </dependency> - - <dependency> <groupId>org.htmlparser</groupId> <artifactId>htmlparser</artifactId> </dependency> Modified: trunk/bow-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-04-27 07:11:04 UTC (rev 268) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 @@ -15,11 +15,10 @@ # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 -# - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain -# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -28,12 +27,16 @@ # Please fill the missing licenses for dependencies : # # -#Wed Feb 16 01:05:46 CET 2011 +#Tue Apr 26 16:51:54 CEST 2011 +antlr--antlr--2.7.2--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +dom4j--dom4j--1.1--jar=BSD License +jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 javax.servlet--jsp-api--2.0--jar=Common Development and Distribution License (CDDL) v1.0 javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0 ognl--ognl--2.7.3--jar=The OpenSymphony Software License 1.1 -woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme! Lab Software License, vesion 1.1.1 +org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 +xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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.bow.action; import org.apache.commons.lang.StringUtils; Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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.bow.action; import org.chorem.bow.BowBookmark; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-27 07:11:04 UTC (rev 268) @@ -8,7 +8,7 @@ * %% * Copyright (C) 2010 CodeLutin * %% -* This program is free software: you can redistribute it and/or modify + * 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. @@ -176,4 +176,4 @@ -moz-border-radius: 0.5em; padding:10px; -} \ No newline at end of file +} Modified: trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-27 07:11:04 UTC (rev 268) @@ -1,4 +1,27 @@ /* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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% + */ +/* * jQuery UI CSS Framework 1.8.11 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) Modified: trunk/bow-ui/src/main/webapp/js/bookmark.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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% + */ function modify(name, alias, tags, link, action, id) { var form = $("#bookmarkForm")[0]; form.link.value = link; Modified: trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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% + */ /*! * jQuery JavaScript Library v1.5.2 * http://jquery.com/ Modified: trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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% + */ /*! * jQuery UI 1.8.11 * Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ + <%@ page import="static org.nuiton.i18n.I18n._" %> <%-- Document : popupAddUrl Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-26 15:04:35 UTC (rev 267) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-27 07:11:04 UTC (rev 268) @@ -1,3 +1,26 @@ + <%-- Document : popupPublicAlias Created on : 20 avr. 2011, 17:03:37

1 0

r267 - trunk
by echatellier＠users.chorem.org April 26, 2011

April 26, 2011

Author: echatellier Date: 2011-04-26 17:04:35 +0200 (Tue, 26 Apr 2011) New Revision: 267 Url: http://chorem.org/repositories/revision/bow/267 Log: Fix contributors Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 14:49:16 UTC (rev 266) +++ trunk/pom.xml 2011-04-26 15:04:35 UTC (rev 267) @@ -89,7 +89,6 @@ <contributors> <contributor> - <id>bbrossaud</id> <name>Benoit Brossaud</name> <organization>CodeLutin</organization> <timezone>+1</timezone> @@ -99,7 +98,6 @@ </contributor> <contributor> - <id>vbriand</id> <name>Valentin Brillant</name> <organization>CodeLutin</organization> <timezone>+1</timezone> @@ -107,7 +105,6 @@ <role>Developer</role> </roles> </contributor> - </contributors> <scm>

1 0

r266 - trunk
by sletellier＠users.chorem.org April 26, 2011

April 26, 2011

Author: sletellier Date: 2011-04-26 16:49:16 +0200 (Tue, 26 Apr 2011) New Revision: 266 Url: http://chorem.org/repositories/revision/bow/266 Log: - Add tony as developer - Add bbrossau and vbriand as contributor Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 13:47:31 UTC (rev 265) +++ trunk/pom.xml 2011-04-26 14:49:16 UTC (rev 266) @@ -74,8 +74,42 @@ <role>Debian packager</role> </roles> </developer> + + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> + <contributors> + <contributor> + <id>bbrossaud</id> + <name>Benoit Brossaud</name> + <organization>CodeLutin</organization> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </contributor> + + <contributor> + <id>vbriand</id> + <name>Valentin Brillant</name> + <organization>CodeLutin</organization> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </contributor> + + </contributors> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection>

1 0

r265 - trunk
by sletellier＠users.chorem.org April 26, 2011

April 26, 2011

Author: sletellier Date: 2011-04-26 15:47:31 +0200 (Tue, 26 Apr 2011) New Revision: 265 Url: http://chorem.org/repositories/revision/bow/265 Log: Add developers Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 13:38:57 UTC (rev 264) +++ trunk/pom.xml 2011-04-26 13:47:31 UTC (rev 265) @@ -37,6 +37,45 @@ </license> </licenses> + <developers> + <developer> + <id>sletellier</id> + <name>Sylvain Letellier</name> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + + <developer> + <id>kmorin</id> + <name>Kevin Morin</name> + <email>morin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + + <developer> + <id>bpoussin</id> + <name>Benjamin Poussin</name> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Developer</role> + <role>Debian packager</role> + </roles> + </developer> + </developers> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection>

1 0

r264 - trunk/bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org April 26, 2011

April 26, 2011

Author: sletellier Date: 2011-04-26 15:38:57 +0200 (Tue, 26 Apr 2011) New Revision: 264 Url: http://chorem.org/repositories/revision/bow/264 Log: - Forward to bookmark edition when create public alias without javascript Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-26 13:17:07 UTC (rev 263) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-26 13:38:57 UTC (rev 264) @@ -67,6 +67,9 @@ <s:property value="%{#wikittyId}" /> </s:a> --%> + <s:url var="editBookmark" action="editBookmark"> + <s:param name="id" value="%{#wikittyId}"/> + </s:url> <s:if test="%{!#publicAliasUrl.empty}"> <s:a cssClass="alias" href="%{#aliasServlet + #publicAliasUrl}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> <s:property value="%{#publicAliasUrl}" /> @@ -77,7 +80,7 @@ <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> <s:param name="alias">irock</s:param> </s:url> - <s:a cssClass="addAlias" onclick="return openPublicAliasForm('%{#wikittyId}')"> + <s:a cssClass="addAlias" href="%{editBookmark}" onclick="return openPublicAliasForm('%{#wikittyId}')"> <img style="border:none;" src="img/add.png" alt="Set alias" title="Set alias" /> </s:a> </s:else> @@ -94,9 +97,6 @@  - <s:url var="editBookmark" action="editBookmark"> - <s:param name="id" value="%{#wikittyId}"/> - </s:url> <s:a cssClass="edit" href="%{editBookmark}" onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(#request.bookmark.description)}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> </s:a>

1 0

r263 - in trunk/bow-ui/src/main: java/org/chorem/bow java/org/chorem/bow/action resources/i18n webapp/css webapp/jsp webapp/jsp/inc
by sletellier＠users.chorem.org April 26, 2011

April 26, 2011

Author: sletellier Date: 2011-04-26 15:17:07 +0200 (Tue, 26 Apr 2011) New Revision: 263 Url: http://chorem.org/repositories/revision/bow/263 Log: - Fix i18n in popupPublicAlias - Allow to modify alias to null or empty - Add padding for ul in preference - Remove delete alias code - Fix test in bookmark if public alias is empty Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-26 13:17:07 UTC (rev 263) @@ -337,12 +337,12 @@ addTagsToBookmark(tags, bookmark); if (privateAlias != null) { privateAlias = privateAlias.trim(); - bookmark.setPrivateAlias(privateAlias); } + bookmark.setPrivateAlias(privateAlias); if (publicAlias != null) { publicAlias = publicAlias.trim(); - bookmark.setPublicAlias(publicAlias); } + bookmark.setPublicAlias(publicAlias); } public static String getBookmarkTagsString(BowBookmark bookmark) { Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-26 13:17:07 UTC (rev 263) @@ -195,6 +195,7 @@ if (name != null) { // Si l'alias prive souhaite est deja utilise on ne l'accept pas // Si l'alias public souhaite est deja utilise on ne l'accept pas + // TODO sletellier 20110416 : return error message when public or private alias is already used Criteria privateAliasCriteria = null; Criteria publicAliasCriteria = null; if (privateAlias != null && !privateAlias.isEmpty()) { Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-26 13:17:07 UTC (rev 263) @@ -135,9 +135,10 @@ bow.token.generate.successful=The token has been regenerated successfully popup.addurl.alias.private=Private alias popup.addurl.alias.public=Public alias -popup.addurl.cancel=Cancel popup.addurl.link=Url popup.addurl.name=Description -popup.addurl.submit=Validate popup.addurl.tags=Tags popup.addurl.title=Add or modify URL +popup.commons.cancel=Cancel +popup.commons.submit=Validate +popup.setPublicAliasPopup.title=Enter the public alias Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-26 13:17:07 UTC (rev 263) @@ -135,9 +135,10 @@ bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s popup.addurl.alias.private=Alias priv\u00E9 popup.addurl.alias.public=Alias public -popup.addurl.cancel=Annuler popup.addurl.link=Url popup.addurl.name=Description -popup.addurl.submit=Valider popup.addurl.tags=Tags popup.addurl.title=Ajouter ou modifier une URL +popup.commons.cancel=Annuler +popup.commons.submit=Valider +popup.setPublicAliasPopup.title=Entrer un alias public Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-26 13:17:07 UTC (rev 263) @@ -380,6 +380,10 @@ padding-right:70px; } +.formFrame ul{ + padding-left:10px; +} + .formFrame h1{ color:#804561; width:225px; Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -54,7 +54,7 @@ <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " value="%{bookmark.publicAlias}" /><br /> <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> </p> - <s:submit key="popup.addurl.submit" name="submit" /> + <s:submit key="popup.commons.submit" name="submit" /> </s:form> </div> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -67,23 +67,10 @@ <s:property value="%{#wikittyId}" /> </s:a> --%> - <s:if test="%{#publicAliasUrl != null}"> + <s:if test="%{!#publicAliasUrl.empty}"> <s:a cssClass="alias" href="%{#aliasServlet + #publicAliasUrl}.action" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> <s:property value="%{#publicAliasUrl}" /> </s:a> - <s:url var="deleteAlias" action="deleteAlias"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - </s:url> - <s:if test="%{!(formBookmarkId == null || !formBookmarkId.equals(wikittyId))}"> - <s:a cssStyle="text-decoration:none;" href="%{#deleteAlias}"> - <img style="border:none;" src="img/delete.png" alt="Delete alias" title="Delete" /> - </s:a> - </s:if> - <s:else> - <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteAlias}"> - <img style="border:none;" src="img/delete.png" alt="Delete alias" title="Delete" /> - </s:a> - </s:else> </s:if> <s:else> <s:url var="addAlias" action="createAlias"> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -51,7 +51,7 @@ } </script> -<s:set id="title"> +<s:set id="title"> <s:text name="popup.addurl.title"/> </s:set> @@ -68,7 +68,7 @@ <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /><br /> <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " /><br /> </p> - <a class="button" onclick="submitAddUrl()"><s:text name="popup.addurl.submit"/></a> - <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.addurl.cancel"/></a> + <a class="button" onclick="submitAddUrl()"><s:text name="popup.commons.submit"/></a> + <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.commons.cancel"/></a> </s:form> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-22 16:28:18 UTC (rev 262) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-26 13:17:07 UTC (rev 263) @@ -19,26 +19,42 @@ autoOpen: false, width: 300, modal: true, - buttons: { - "Validate": function() { - $("#setPublicAliasForm").submit(); - $( this ).dialog( "close" ); - }, - Cancel: function() { - $( this ).dialog( "close" ); - } - }, +// buttons: { +// "Validate": function() { +// $("#setPublicAliasForm").submit(); +// $( this ).dialog( "close" ); +// }, +// Cancel: function() { +// $( this ).dialog( "close" ); +// } +// }, close: function() { //allFields.val( "" ).removeClass( "ui-state-error" ); } }); - }); + }); + function submitPublicAlias() { + $("#setPublicAliasForm").submit(); + closePopupAddUrl(); + } + + function closePopupPublicAlias() { + $( "#setPublicAliasPopup" ).dialog( "close" ) + } </script> +<s:set id="title"> + <s:text name="popup.setPublicAliasPopup.title"/> +</s:set> + <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - id="setPublicAliasPopup" title="Enter the public alias"> + id="setPublicAliasPopup" title="${title}"> <s:form id="setPublicAliasForm" action="createAlias"> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> - <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> + <p> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> + <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> + </p> + <a class="button" onclick="submitPublicAlias()"><s:text name="popup.commons.submit"/></a> + <a class="button" onclick="closePopupPublicAlias()"><s:text name="popup.commons.cancel"/></a> </s:form> </div>

1 0

r262 - trunk/bow-ui/src/main/java/org/chorem/bow/action
by bpoussin＠users.chorem.org April 22, 2011

April 22, 2011

Author: bpoussin Date: 2011-04-22 18:28:18 +0200 (Fri, 22 Apr 2011) New Revision: 262 Url: http://chorem.org/repositories/revision/bow/262 Log: ajout information javadoc Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-22 16:27:49 UTC (rev 261) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-22 16:28:18 UTC (rev 262) @@ -10,7 +10,8 @@ import static org.nuiton.i18n.I18n.n_; /** - * Load a bookmark to display it on modification page + * Load a bookmark to display it on modification page, used when javascript + * is not available on client * * @author sletellier */

1 0

r261 - in trunk/bow-ui/src/main: resources/i18n webapp/css webapp/jsp/inc
by bpoussin＠users.chorem.org April 22, 2011

April 22, 2011

Author: bpoussin Date: 2011-04-22 18:27:49 +0200 (Fri, 22 Apr 2011) New Revision: 261 Url: http://chorem.org/repositories/revision/bow/261 Log: diminution des textes de recherches Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 16:27:49 UTC (rev 261) @@ -108,12 +108,12 @@ bow.rightMenu.chromiumExtension=Chromium extension bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Find -bow.rightMenu.fullTextSearch=Full text search +bow.rightMenu.fullTextSearch=Full text bow.rightMenu.help=Help bow.rightMenu.import.submit=Import bow.rightMenu.importBookmarks=Import bookmarks bow.rightMenu.logout=Logout -bow.rightMenu.search=Search +bow.rightMenu.search.tags=by tags bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id bow.search.ascclick=Asc. clicks nb Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 16:27:49 UTC (rev 261) @@ -108,12 +108,12 @@ bow.rightMenu.chromiumExtension=Extension pour chromium bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Rechercher -bow.rightMenu.fullTextSearch=Recherche full text +bow.rightMenu.fullTextSearch=Full text bow.rightMenu.help=Aide bow.rightMenu.import.submit=Importer bow.rightMenu.importBookmarks=Importer des marque-pages bow.rightMenu.logout=D\u00E9connexion -bow.rightMenu.search=Recherche +bow.rightMenu.search.tags=Par tags bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session bow.search.ascclick=Nb clics asc. Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 16:27:49 UTC (rev 261) @@ -475,12 +475,14 @@ .input label{ color:#804561; +/* font-size:20px; font-weight:normal; font-style:normal; float:left; margin-bottom:20px; width:100%; +*/ } #bookmarkForm label{ Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 16:27:49 UTC (rev 261) @@ -58,11 +58,11 @@ padding-top:20px; padding-right:15%; } - +/* #header .input{ width:250px; } - +*/ .button{ margin-top:20px; background:url('../img/fdboutonV.jpg') repeat-x; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 16:26:55 UTC (rev 260) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 16:27:49 UTC (rev 261) @@ -39,6 +39,20 @@ </div> <s:if test="%{#session.BowSession.user != null}"> <div class="recherche right"> + <h5>Recherche</h5> + <s:form action="search"> + <div class="input"> + <s:textfield key="bow.rightMenu.search.tags" name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + <s:form action="fullText"> + <div class="input"> + <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> +<%-- <div class="right"> <s:form action="search"> <div class="input"> @@ -55,6 +69,7 @@ </div> </s:form> </div> +--%> </div> </s:if> <div id="msg">

1 0

r260 - trunk/bow-ui/src/main/webapp
by bpoussin＠users.chorem.org April 22, 2011

April 22, 2011

Author: bpoussin Date: 2011-04-22 18:26:55 +0200 (Fri, 22 Apr 2011) New Revision: 260 Url: http://chorem.org/repositories/revision/bow/260 Log: remplacement des tabulations Modified: trunk/bow-ui/src/main/webapp/index.jsp Modified: trunk/bow-ui/src/main/webapp/index.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/index.jsp 2011-04-22 14:43:21 UTC (rev 259) +++ trunk/bow-ui/src/main/webapp/index.jsp 2011-04-22 16:26:55 UTC (rev 260) @@ -24,8 +24,8 @@ <%@page import="org.chorem.bow.BowSession"%> <% if (BowSession.getBowSession(session).getUser() == null) { - response.sendRedirect("login_input.action"); + response.sendRedirect("login_input.action"); } else { - response.sendRedirect("home.action"); + response.sendRedirect("home.action"); } %> \ No newline at end of file

1 0

r259 - trunk/bow-ui/src/main/webapp/jsp/inc
by bpoussin＠users.chorem.org April 22, 2011

April 22, 2011

Author: bpoussin Date: 2011-04-22 16:43:21 +0200 (Fri, 22 Apr 2011) New Revision: 259 Url: http://chorem.org/repositories/revision/bow/259 Log: changement des dimensions de la fenetre pour que tout s'affiche convenablement Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-22 14:42:51 UTC (rev 258) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-04-22 14:43:21 UTC (rev 259) @@ -17,8 +17,7 @@ $(function() { $( "#setPublicAliasPopup" ).dialog({ autoOpen: false, - height: 100, - width: 200, + width: 300, modal: true, buttons: { "Validate": function() {

1 0

r258 - in trunk/bow-ui/src/main: java/org/chorem/bow/action resources webapp/jsp/inc
by bpoussin＠users.chorem.org April 22, 2011

April 22, 2011

Author: bpoussin Date: 2011-04-22 16:42:51 +0200 (Fri, 22 Apr 2011) New Revision: 258 Url: http://chorem.org/repositories/revision/bow/258 Log: suppression de l'action DeleteTag qui ne sert plus maintenant qu'on a une popup d'edition Removed: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java Modified: trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Deleted: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-04-22 12:59:26 UTC (rev 257) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-04-22 14:42:51 UTC (rev 258) @@ -1,129 +0,0 @@ -/* - * #%L - * bow - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 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.bow.action; - -import org.chorem.bow.BowBookmark; -import org.chorem.bow.BowUtils; -import org.nuiton.wikitty.WikittyProxy; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Supprime un tag d'un bookmark - * - * @author poussin - */ -public class DeleteTagAction extends BowBaseAction { - private static final long serialVersionUID = -6174966873862161966L; - protected String bookmarkId; - protected String deleteTag; - protected String redirectTo; - protected String searchLine; - protected String fullTextLine; - - /** - * @return the bookmarkId - */ - public String getBookmarkId() { - return bookmarkId; - } - /** - * @param bookmarkId the bookmarkId to set - */ - public void setBookmarkId(String bookmarkId) { - this.bookmarkId = bookmarkId; - } - /** - * @return the deleteTag - */ - public String getDeleteTag() { - return deleteTag; - } - /** - * @param deleteTag the deleteTag to set - */ - public void setDeleteTag(String deleteTag) { - this.deleteTag = deleteTag; - } - - /** - * @return the searchLine - */ - public String getSearchLine() { - return searchLine; - } - - /** - * @param searchLine the searchLine to set - */ - public void setSearchLine(String searchLine) { - this.searchLine = searchLine; - } - - /** - * @return the fullTextLine - */ - public String getFullTextLine() { - return fullTextLine; - } - - /** - * @param fullTextLine the fullTextLine to set - */ - public void setFullTextLine(String fullTextLine) { - this.fullTextLine = fullTextLine; - } - - /** - * @return the redirectTo - */ - public String getRedirectTo() { - return redirectTo; - } - - /** - * Deletes a bookmark's tag - */ - public String execute() { - try { - if (deleteTag != null && bookmarkId != null) { - if (!bookmarkId.isEmpty()) { - WikittyProxy proxy = getBowProxy(); - BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); - - if (bookmark != null) { - bookmark.removeLabels(deleteTag); - proxy.store(bookmark); - addActionMessage(getText(n_("bow.bookmark.tag.deleted"))); - } - } - } - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); - } catch (Exception e) { - addActionError(getText(n_("bow.error.internal"))); - log.error(e.getMessage(), e); - } - return SUCCESS; - } -} \ No newline at end of file Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-22 12:59:26 UTC (rev 257) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-22 14:42:51 UTC (rev 258) @@ -214,13 +214,6 @@ <interceptor-ref name="loginStack"/> <result type="redirectAction">preferences</result> </action> - <action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack"/> - <result type="redirect">${redirectTo}</result> - </action> <action name="redirectToUrl" class="org.chorem.bow.action.RedirectToUrlAction"> <interceptor-ref name="loginStack"/> <result name="error" type="redirectAction">home</result> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-22 12:59:26 UTC (rev 257) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-22 14:42:51 UTC (rev 258) @@ -137,22 +137,6 @@ <p class="tags"> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#request.bookmark.labels"> - <s:url var="deleteTag" action="deleteTag"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="deleteTag"><s:property /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> - </s:url> - <s:if test="%{!(formBookmarkId == null || !formBookmarkId.equals(wikittyId))}"> - <s:a cssStyle="text-decoration:none;" href="%{deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - </s:if> - <s:else> - <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - </s:else> <s:url var="search" action="search"> <s:param name="searchLine"><s:property /></s:param> </s:url>

1 0

r257 - in trunk/bow-ui/src/main: resources/i18n webapp/jsp
by sletellier＠users.chorem.org April 22, 2011

April 22, 2011

Author: sletellier Date: 2011-04-22 14:59:26 +0200 (Fri, 22 Apr 2011) New Revision: 257 Url: http://chorem.org/repositories/revision/bow/257 Log: Move preference tags edition to own section Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/webapp/jsp/preferences.jsp Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 12:58:14 UTC (rev 256) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-22 12:59:26 UTC (rev 257) @@ -78,6 +78,7 @@ bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions bow.preferences.siteLook=Site look bow.preferences.submit=Change +bow.preferences.tagsManagement=Tags edition bow.preferences.tagsNb=Number of tags displayed in the tag cloud bow.preferences.title=Preferences bow.preferences.update.successful=The preferences have been updated successfully Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 12:58:14 UTC (rev 256) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-22 12:59:26 UTC (rev 257) @@ -78,6 +78,7 @@ bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions bow.preferences.siteLook=Pr\u00E9f\u00E9rences du site bow.preferences.submit=Changer +bow.preferences.tagsManagement=Edition des tags bow.preferences.tagsNb=Nombre de tags affich\u00E9s sur le nuage de tags bow.preferences.title=Pr\u00E9f\u00E9rences bow.preferences.update.successful=Vos pr\u00E9f\u00E9rences ont \u00E9t\u00E9 mises \u00E0 jour avec succ\u00E8s Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-22 12:58:14 UTC (rev 256) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-04-22 12:59:26 UTC (rev 257) @@ -119,11 +119,12 @@ <s:a href="%{home}" id="homePage"><s:text name="bow.home.title"/></s:a> </p> </div> - <div class="menu clearfix"> - <h2><s:text name="bow.preferences.importExport"/></h2> - </div> </s:form> + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.tagsManagement"/></h2> + </div> + <div class="formFrame fond"> <h3><s:text name="bow.preferences.labels"/></h3> <s:form action="adminlabels" method="post"> @@ -148,6 +149,10 @@ </s:form> </div> + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.importExport"/></h2> + </div> + <div class="formFrame fond"> <s:a action="exportBookmarks"><s:text name="bow.preferences.export.bookmarks"/></s:a> <br/>

1 0

r256 - in trunk/bow-ui/src/main/webapp: css jsp/inc
by sletellier＠users.chorem.org April 22, 2011

April 22, 2011

Author: sletellier Date: 2011-04-22 14:58:14 +0200 (Fri, 22 Apr 2011) New Revision: 256 Url: http://chorem.org/repositories/revision/bow/256 Log: Move search panel to header Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-04-22 12:58:14 UTC (rev 256) @@ -129,7 +129,7 @@ font-size:14px; line-height:32px; padding-left:40px; - background:url('../img/ptit_livre.jpg') no-repeat; + background:url('../img/ptit-livre.jpg') no-repeat; height:32px; display:block; text-decoration:none; @@ -289,9 +289,7 @@ padding: 4px 0 0 30px; } - #colonneD #nuage, -#colonneD .recherche, #colonneD #import, #colonneD #add{ padding:4% 10%; @@ -476,7 +474,7 @@ } .input label{ - color:#9edcf8; + color:#804561; font-size:20px; font-weight:normal; font-style:normal; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-22 12:58:14 UTC (rev 256) @@ -46,6 +46,23 @@ clear:both; } +.left{ + float:left; +} + +.right{ + float:right; +} + +.recherche{ + padding-top:20px; + padding-right:15%; +} + +#header .input{ + width:250px; +} + .button{ margin-top:20px; background:url('../img/fdboutonV.jpg') repeat-x; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-04-22 12:58:14 UTC (rev 256) @@ -37,6 +37,26 @@ <s:a cssClass="logo" action="home">bow</s:a> </s:else> </div> + <s:if test="%{#session.BowSession.user != null}"> + <div class="recherche right"> + <div class="right"> + <s:form action="search"> + <div class="input"> + <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + </div> + <div class="left"> + <s:form action="fullText"> + <div class="input"> + <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + </div> + </div> + </s:if> <div id="msg"> <span id="actionmessageHeader"> <s:actionmessage /> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-22 12:57:22 UTC (rev 255) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-22 12:58:14 UTC (rev 256) @@ -58,22 +58,6 @@ </s:a> </li> </ul> - <div class="recherche"> - <s:form action="search"> - <div class="input"> - <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> - </div> - <div class="recherche"> - <s:form action="fullText"> - <div class="input"> - <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> - </div>  <s:if test="%{searchLine != null}"> <jsp:include page="tagsCloud.jsp" flush="true">

1 0

r255 - trunk/bow-ui/src/main/webapp/jsp
by sletellier＠users.chorem.org April 22, 2011

April 22, 2011

Author: sletellier Date: 2011-04-22 14:57:22 +0200 (Fri, 22 Apr 2011) New Revision: 255 Url: http://chorem.org/repositories/revision/bow/255 Log: Fix search with null when editing bookmark without javascript Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 16:01:59 UTC (rev 254) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-22 12:57:22 UTC (rev 255) @@ -45,12 +45,14 @@ <div class="formFrame fond"> <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> - <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" value="%{bookmark.link}" /><br /> - <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" value="%{bookmark.description}" /><br /> - <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" value="%{bookmark.privateAlias}" /><br /> - <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator="" value="%{bookmark.publicAlias}" /><br /> - <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator="" value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator=" " value="%{bookmark.link}" /><br /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator=" " value="%{bookmark.description}" /><br /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " value="%{bookmark.privateAlias}" /><br /> + <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " value="%{bookmark.publicAlias}" /><br /> + <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> </p> <s:submit key="popup.addurl.submit" name="submit" /> </s:form>

1 0

r254 - in trunk/bow-ui/src/main: java/org/chorem/bow/action webapp/jsp/inc
by sletellier＠users.chorem.org April 21, 2011

April 21, 2011

Author: sletellier Date: 2011-04-21 18:01:59 +0200 (Thu, 21 Apr 2011) New Revision: 254 Url: http://chorem.org/repositories/revision/bow/254 Log: Debug bookmark description editor Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 15:29:13 UTC (rev 253) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 16:01:59 UTC (rev 254) @@ -1,7 +1,5 @@ package org.chorem.bow.action; -import org.apache.commons.lang.StringUtils; -import org.chorem.bow.Bookmark; import org.chorem.bow.BowBookmark; import org.chorem.bow.BowBookmarkImpl; import org.nuiton.wikitty.WikittyProxy; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 16:01:59 UTC (rev 254) @@ -111,7 +111,7 @@ <s:param name="id" value="%{#wikittyId}"/> </s:url> <s:a cssClass="edit" href="%{editBookmark}" - onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(bookmark.getDescription())}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> + onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(#request.bookmark.description)}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> </s:a> <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 15:29:13 UTC (rev 253) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 16:01:59 UTC (rev 254) @@ -12,7 +12,7 @@ function openPopupAddUrl(bookmarkId, link, name, privateAlias, publicAlias, tags) { $("#popupAddUrlFormBookmarkId")[0].value = bookmarkId; $("#popupAddUrlFormLink")[0].value = link; - $("#popupAddUrlFormName")[0].value = name; + $("#popupAddUrlFormName")[0].innerHTML = name; $("#popupAddUrlFormPrivateAlias")[0].value = privateAlias; $("#popupAddUrlFormPublicAlias")[0].value = publicAlias; $("#popupAddUrlFormTags")[0].value = tags;

1 0

r253 - in trunk/bow-ui/src/main: java/org/chorem/bow java/org/chorem/bow/action resources webapp/css webapp/jsp webapp/jsp/inc
by sletellier＠users.chorem.org April 21, 2011

April 21, 2011

Author: sletellier Date: 2011-04-21 17:29:13 +0200 (Thu, 21 Apr 2011) New Revision: 253 Url: http://chorem.org/repositories/revision/bow/253 Log: - Set default size for textarea in css - Allow to modify bookmark without javascript Added: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-04-21 15:29:13 UTC (rev 253) @@ -34,8 +34,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; Added: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java (rev 0) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-04-21 15:29:13 UTC (rev 253) @@ -0,0 +1,55 @@ +package org.chorem.bow.action; + +import org.apache.commons.lang.StringUtils; +import org.chorem.bow.Bookmark; +import org.chorem.bow.BowBookmark; +import org.chorem.bow.BowBookmarkImpl; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.operators.Element; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Load a bookmark to display it on modification page + * + * @author sletellier + */ +public class EditBookmarkAction extends BowBaseAction { + + protected String id; + protected BowBookmark bookmark; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public BowBookmark getBookmark() { + if (bookmark == null) { + bookmark = new BowBookmarkImpl(); + } + return bookmark; + } + + @Override + public String execute() throws Exception { + if (id == null) { + return SUCCESS; + } + try { + WikittyProxy proxy = getBowProxy(); + Criteria criteria = Search.query() + .eq(Element.ELT_ID, id).criteria(); + bookmark = proxy.findByCriteria(BowBookmark.class, criteria); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); + } + return SUCCESS; + } +} Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 15:29:13 UTC (rev 253) @@ -262,7 +262,7 @@ <interceptor-ref name="loginStack"/> <result>/jsp/admin.jsp</result> </action> - <action name="editBookmark"> + <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> <interceptor-ref name="loginStack"/> <result>/jsp/editBookmark.jsp</result> </action> Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 15:29:13 UTC (rev 253) @@ -58,6 +58,11 @@ padding:2px; } +textarea{ + height:100px; + width:200px; +} + #wrap{ clear:both; float:left; Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) @@ -46,13 +46,11 @@ <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> - <s:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" /><br /> - <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" /><br /> - <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" /><br /> - <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator="" /><br /> - <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator="" /><br /> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" value="%{bookmark.link}" /><br /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator="" value="%{bookmark.description}" /><br /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator="" value="%{bookmark.privateAlias}" /><br /> + <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator="" value="%{bookmark.publicAlias}" /><br /> + <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator="" value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> </p> <s:submit key="popup.addurl.submit" name="submit" /> </s:form> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-04-21 15:29:13 UTC (rev 253) @@ -107,9 +107,11 @@  - <s:a cssClass="edit" href="http://linuxfr.org" - onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '<%=StringEscapeUtils.escapeJavaScript(bookmark.getDescription())%>', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> - + <s:url var="editBookmark" action="editBookmark"> + <s:param name="id" value="%{#wikittyId}"/> + </s:url> + <s:a cssClass="edit" href="%{editBookmark}" + onclick="return openPopupAddUrl('%{#wikittyId}', '%{#bookmarkLink}', '%{@org.apache.commons.lang.StringEscapeUtils@escapeJavaScript(bookmark.getDescription())}', '%{#bookmarkAlias}', '%{#publicAliasUrl}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}');"> </s:a> <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>

1 0

r252 - in trunk/bow-ui/src/main: java/org/chorem/bow/action resources resources/i18n webapp/css webapp/jsp webapp/jsp/inc
by sletellier＠users.chorem.org April 21, 2011

April 21, 2011

Author: sletellier Date: 2011-04-21 15:57:31 +0200 (Thu, 21 Apr 2011) New Revision: 252 Url: http://chorem.org/repositories/revision/bow/252 Log: - Fix popup traduction - Enable bookmark creation without javascript - Fix css Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/home.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-04-21 13:57:31 UTC (rev 252) @@ -99,7 +99,7 @@ } /** - * @param privateAlias the privateAlias to set + * @param alias the privateAlias to set */ public void setPrivateAlias(String alias) { this.privateAlias = alias; Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-04-21 13:57:31 UTC (rev 252) @@ -132,8 +132,11 @@ bow.search.submit=Search bow.search.title=Search bow.token.generate.successful=The token has been regenerated successfully -popup.addurl.alias.private=private alias -popup.addurl.alias.public=public alias -popup.addurl.link=url -popup.addurl.name=description -popup.addurl.tags=tags +popup.addurl.alias.private=Private alias +popup.addurl.alias.public=Public alias +popup.addurl.cancel=Cancel +popup.addurl.link=Url +popup.addurl.name=Description +popup.addurl.submit=Validate +popup.addurl.tags=Tags +popup.addurl.title=Add or modify URL Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-04-21 13:57:31 UTC (rev 252) @@ -132,8 +132,11 @@ bow.search.submit=Rechercher bow.search.title=Recherche bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s -popup.addurl.alias.private=alias priv\u00E9 -popup.addurl.alias.public=alias public -popup.addurl.link=url -popup.addurl.name=description -popup.addurl.tags=tags +popup.addurl.alias.private=Alias priv\u00E9 +popup.addurl.alias.public=Alias public +popup.addurl.cancel=Annuler +popup.addurl.link=Url +popup.addurl.name=Description +popup.addurl.submit=Valider +popup.addurl.tags=Tags +popup.addurl.title=Ajouter ou modifier une URL Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-04-21 13:57:31 UTC (rev 252) @@ -262,5 +262,9 @@ <interceptor-ref name="loginStack"/> <result>/jsp/admin.jsp</result> </action> + <action name="editBookmark"> + <interceptor-ref name="loginStack"/> + <result>/jsp/editBookmark.jsp</result> + </action> </package> </struts> Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-04-21 13:57:31 UTC (rev 252) @@ -46,6 +46,18 @@ clear:both; } +.button{ + margin-top:20px; + background:url('../img/fdboutonV.jpg') repeat-x; + height:31px; + line-height:31px; + color:#FFFFFF; + font-weight:bold; + border:none; + width:auto; + padding:2px; +} + #wrap{ clear:both; float:left; Modified: trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css 2011-04-21 13:57:31 UTC (rev 252) @@ -60,7 +60,7 @@ .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #dbdbdb url(images/ui-bg_flat_75_dbdbdb_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content a { color: #222222; } +/*.ui-widget-content a { color: #222222; }*/ .ui-widget-header { border: 1px solid #aaaaaa; background: #bf8a9c url(images/ui-bg_highlight-soft_75_bf8a9c_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } .ui-widget-header a { color: #222222; } @@ -570,4 +570,5 @@ * http://docs.jquery.com/UI/Progressbar#theming */ .ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } + Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -40,12 +40,12 @@ <body> <div id="content"> <div class="menu clearfix"> - <h2><s:text name="bow.bookmark.edit" /></h2> + <h2><s:text name="popup.addurl.title" /></h2> </div> <div class="formFrame fond"> <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> - <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark.getWikittyId()%>"/> + <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> <s:hidden name="searchLine" value="%{searchLine}" /> <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator="" /><br /> @@ -54,6 +54,7 @@ <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator="" /><br /> <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator="" /><br /> </p> + <s:submit key="popup.addurl.submit" name="submit" /> </s:form> </div> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -94,7 +94,6 @@ </div> <s:include value="inc/popupPublicAlias.jsp" /> - <s:include value="inc/popupAddUrl.jsp" /> </body> </html> <% } %> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -1,4 +1,5 @@ -<%-- +<%@ page import="static org.nuiton.i18n.I18n._" %> +<%-- Document : popupAddUrl Created on : 20 avr. 2011, 17:03:37 Author : poussin @@ -25,24 +26,37 @@ autoOpen: false, width: 400, modal: true, - buttons: { - "Validate": function() { - $("#popupAddUrlForm").submit(); - $( this ).dialog( "close" ); - }, - Cancel: function() { - $( this ).dialog( "close" ); - } - }, +// buttons: { +// "Validate": function() { +// $("#popupAddUrlForm").submit(); +// $( this ).dialog( "close" ); +// }, +// Cancel: function() { +// $( this ).dialog( "close" ); +// } +// }, close: function() { //allFields.val( "" ).removeClass( "ui-state-error" ); } }); }); + + function submitAddUrl() { + $("#popupAddUrlForm").submit(); + closePopupAddUrl(); + } + + function closePopupAddUrl() { + $( "#addUrlPopup" ).dialog( "close" ) + } </script> +<s:set id="title"> + <s:text name="popup.addurl.title"/> +</s:set> + <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - id="addUrlPopup" title="Add or modify URL"> + id="addUrlPopup" title="${title}"> <s:form id="popupAddUrlForm" action="addUrl" method="post"> <p> <s:hidden id="popupAddUrlFormBookmarkId" name="bookmarkId" /> @@ -54,5 +68,7 @@ <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /><br /> <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " /><br /> </p> + <a class="button" onclick="submitAddUrl()"><s:text name="popup.addurl.submit"/></a> + <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.addurl.cancel"/></a> </s:form> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-21 09:42:50 UTC (rev 251) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-04-21 13:57:31 UTC (rev 252) @@ -42,6 +42,7 @@ </div> <div id="side" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> + <s:include value="popupAddUrl.jsp" /> <s:set var="searchLine" value="%{request.bookmarkActions.searchLine}" /> <s:set var="fullTextLine" value="%{request.bookmarkActions.fullTextLine}" /> <div id="colonneD"> @@ -51,8 +52,8 @@ </s:if> <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> <li> - <s:a href="http://linuxfr.org" - onclick="return openPopupAddUrl('', '', '', '', '', '');"> + <s:url var="editBookmark" action="editBookmark"/> + <s:a href="%{editBookmark}" onclick="return openPopupAddUrl('', '', '', '', '', '');"> <s:text name="bow.rightMenu.addUrl.link" /> </s:a> </li>

1 0