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

r183 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action resources resources/i18n webapp/WEB-INF/decorators webapp/jsp webapp/jsp/inc webapp/template webapp/template/simple
by vbriand＠users.chorem.org Feb. 3, 2011

Feb. 3, 2011

Author: vbriand Date: 2011-02-03 19:08:18 +0100 (Thu, 03 Feb 2011) New Revision: 183 Url: http://chorem.org/repositories/revision/bow/183 Log: W3C compliant. The tags cloud is displayed properly. The search engines aren't suggested anymore when the user isn't logged in. Added: trunk/src/main/webapp/template/simple/ trunk/src/main/webapp/template/simple/form-common.ftl Modified: trunk/src/main/java/org/chorem/bow/BowInit.java trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/src/main/resources/i18n/bow_en_GB.properties trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/jsp/forgotPassword.jsp trunk/src/main/webapp/jsp/home.jsp trunk/src/main/webapp/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/inc/bookmarkTop.jsp trunk/src/main/webapp/jsp/inc/errorFrame.jsp trunk/src/main/webapp/jsp/inc/rightMenu.jsp trunk/src/main/webapp/jsp/inc/tagsCloud.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/preferences.jsp trunk/src/main/webapp/jsp/register.jsp trunk/src/main/webapp/jsp/search.jsp Modified: trunk/src/main/java/org/chorem/bow/BowInit.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowInit.java 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/java/org/chorem/bow/BowInit.java 2011-02-03 18:08:18 UTC (rev 183) @@ -71,14 +71,14 @@ if (criteria != null) { Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); //Selects all bookmarks by user - sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_DATE).setEndIndex(10); + sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_DATE).setEndIndex(10);//TODO: remove hardcoded value List<Bookmark> lastBookmarks = proxy.findAllByCriteria(Bookmark.class, sortCriteria).getAll(); BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, null); bookmarkActions.setTagSearch(null); List<Bookmark> bookList = bookmarkActions.getBookmarks(); - if (bookList.size() > 10) { - bookList = bookmarkActions.getBookmarks().subList(0, 10); + if (bookList.size() > 10) { //TODO: remove hardcoded value + bookList = bookmarkActions.getBookmarks().subList(0, 10); //TODO: remove hardcoded value bookmarkActions.setBookmarks(bookList); } if (lastBookmarks != null) { Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-03 18:08:18 UTC (rev 183) @@ -62,8 +62,8 @@ bool = passwordExists(md5); } String mailContent; - - mailContent = getText(n_("bow.register.mailHi")) + "\n\n" + getText(n_("bow.register.mailPwd")) + password + "\n\n" + getText(n_("bow.register.mailEmail")) + email + "\n\n"; + + mailContent = getText(n_("bow.register.mailHi")) + ",\n\n" + getText(n_("bow.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("bow.register.mailEmail")) + ": " + email + "\n\n"; try { BowMail.sendMail(email, getText(n_("bow.register.mailSubject")), mailContent); //TODO: modifier les noms et peut-être la manière de faire car c'est pas très beau } catch (AddressException e) { Modified: trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-03 18:08:18 UTC (rev 183) @@ -9,6 +9,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.struts2.interceptor.SessionAware; import org.chorem.bow.BowBookmark; +import org.chorem.bow.BowInit; import org.chorem.bow.BowProxy; import org.chorem.bow.Preference; import org.chorem.bow.User; @@ -274,6 +275,7 @@ setSearchEngineUrlResults(preference.getSearchEngineUrlResults()); } } + BowInit.initHomePage(request, user); return SUCCESS; } } Modified: trunk/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-03 18:08:18 UTC (rev 183) @@ -53,10 +53,10 @@ bow.preferences.userInfo=User information bow.register.emailAldyUsed=This email address is already used bow.register.invalidLogin= -bow.register.mailEmail= -bow.register.mailHi= -bow.register.mailPwd= -bow.register.mailSubject= +bow.register.mailEmail=Your email +bow.register.mailHi=Hi +bow.register.mailPwd=Your password +bow.register.mailSubject=[bow] Your account information bow.register.pwdDontMatch=Passwords don''t match bow.register.submit=Register bow.register.title=Register Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-03 18:08:18 UTC (rev 183) @@ -53,10 +53,10 @@ bow.preferences.userInfo=Informations utilisateur bow.register.emailAldyUsed=Cette adresse email est d\u00E9j\u00E0 utilis\u00E9e bow.register.invalidLogin= -bow.register.mailEmail= -bow.register.mailHi= -bow.register.mailPwd= -bow.register.mailSubject= +bow.register.mailEmail=Votre email +bow.register.mailHi=Bonjour +bow.register.mailPwd=Votre mot de passe +bow.register.mailSubject=[bow] Vos informations utilisateur bow.register.pwdDontMatch=Les mots de passe sont diff\u00E9erents bow.register.submit=S''enregistrer bow.register.title=S''enregistrer Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/resources/struts.xml 2011-02-03 18:08:18 UTC (rev 183) @@ -132,7 +132,7 @@ <action name="locale" class="org.chorem.bow.action.LocaleAction"> <result type="redirect">/jsp/login.jsp</result> </action> - <action name="generateToken" class="org.chorem.bow.action.GenerateTokenAction"> + <action name="regenPermToken" class="org.chorem.bow.action.GenerateTokenAction"> <interceptor-ref name="loginStack" /> <result type="redirectAction">preferences</result> </action> Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -15,8 +15,10 @@ <s:url id="permanentXml" action="permanentXml" /> <s:url id="favicon" value="/img/favicon.png" /> <link rel="icon" type="image/png" href="${favicon}" /> - <link rel="search" type="application/opensearchdescription+xml" title="Bow (temporary)" href="${temporaryXml}" /> - <link rel="search" type="application/opensearchdescription+xml" title="Bow (permanent)" href="${permanentXml}" /> + <s:if test="%{#session.user != null}"> + <link rel="search" type="application/opensearchdescription+xml" title="Bow (temporary)" href="${temporaryXml}" /> + <link rel="search" type="application/opensearchdescription+xml" title="Bow (permanent)" href="${permanentXml}" /> + </s:if> <s:url id="globalCSS" value="/css/global.css" /> <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> <s:url id="bookmarkJS" value="/js/bookmark.js" /> Modified: trunk/src/main/webapp/jsp/forgotPassword.jsp =================================================================== --- trunk/src/main/webapp/jsp/forgotPassword.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/forgotPassword.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?>  - <s:a href="%{#search}" class="tag"><%=tagName%></s:a> - <% - ++count; - if (count >= nbTags) { - break; - } - } -} -%> +<s:if test="%{#request.nbTags > #request.bookmarkActions.tagsCloud.size()}"> + <s:set var="maxTags" value="#request.bookmarkActions.tagsCloud.size()" /> +</s:if> +<s:else> + <s:set var="maxTags" value="#request.nbTags" /> +</s:else> +<s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}"> + <s:url id="search" action="search" escapeAmp="true"> + <s:param name="addTag"><s:property value="topicName" /></s:param> + <s:if test="%{request.searchLine != null}"> + <s:param name="searchLine">&searchLine=<s:property value="%{request.searchLine}" /></s:param> + </s:if> + </s:url> +  + <s:a href="%{search}" title="%{count} results" cssClass="tag" cssStyle="font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property value="topicName" /></s:a> +</s:iterator> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/login.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -18,11 +17,11 @@ <h1><s:text name="bow.login.title" /></h1> <s:actionerror /> <s:form action="login"> - <p> - <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /><br /><br /> - <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /><br /><br /> - <s:submit key="bow.login.submit" /> - </p> + <p> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /><br /><br /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /><br /><br /> + <s:submit key="bow.login.submit" name="submit" /> + </p> </s:form> <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?>  +<#if (parameters.validate?default(false) == false)><#rt/> + <#if parameters.onsubmit??><#rt/> + ${tag.addParameter('onsubmit', "${parameters.onsubmit}") } + </#if> +</#if> +<form<#rt/> +<#if parameters.id??> + id="${parameters.id?html}"<#rt/> +</#if> +<#if parameters.onsubmit??> + onsubmit="${parameters.onsubmit?html}"<#rt/> +</#if> +<#if parameters.onreset??> + onreset="${parameters.onreset?html}"<#rt/> +</#if> +<#if parameters.action??> + action="${parameters.action?html}"<#rt/> +</#if> +<#if parameters.target??> + target="${parameters.target?html}"<#rt/> +</#if> +<#if parameters.method??> + method="${parameters.method?html}"<#rt/> +<#else> + method="post"<#rt/> +</#if> +<#if parameters.enctype??> + enctype="${parameters.enctype?html}"<#rt/> +</#if> +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> +</#if> +<#if parameters.cssStyle??> + style="${parameters.cssStyle?html}"<#rt/> +</#if> +<#if parameters.title??> + title="${parameters.title?html}"<#rt/> +</#if> +<#if parameters.acceptcharset??> + accept-charset="${parameters.acceptcharset?html}"<#rt/> +</#if> +<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" />

1 0

r182 - in trunk/src/main: java/org/chorem/bow/action java/org/chorem/bow/interceptor resources resources/i18n
by vbriand＠users.chorem.org Feb. 3, 2011

Feb. 3, 2011

Author: vbriand Date: 2011-02-03 17:09:14 +0100 (Thu, 03 Feb 2011) New Revision: 182 Url: http://chorem.org/repositories/revision/bow/182 Log: The user is now redirected to the login page if he tries to access a page where login is mandatory, and to the home page if he is already logged in and tries to access the login / register pages. Added: trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java Modified: trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java trunk/src/main/java/org/chorem/bow/action/HomeAction.java trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java trunk/src/main/java/org/chorem/bow/action/LoginAction.java trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/resources/struts.xml Modified: trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-03 16:09:14 UTC (rev 182) @@ -23,41 +23,39 @@ } public String execute() { - User user = (User)session.get("user"); - - if (user != null) { - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = Search.query().eq(Token.FQ_FIELD_EMAIL, user.getEmail()).criteria(); - Token currentToken = proxy.findByCriteria(Token.class, criteria); - if (currentToken != null) { - String id = currentToken.getWikittyId(); - proxy.delete(id); - } - TokenActions tokenActions = (TokenActions)session.get("tokenActions"); - - if (tokenActions != null) { - String token; - try { - token = tokenActions.generateToken(); //Generates an encoding MD5 token - criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); - Token oldToken = proxy.findByCriteria(Token.class, criteria); - - if (oldToken == null) { //Checks if the token already exists - TokenImpl newToken = new TokenImpl(); - newToken.setToken(token); - newToken.setEmail(user.getEmail()); - proxy.store((Token) newToken); //If the token doesn't exist, it is stored - tokenActions.setPermanentToken(token); - } else { - tokenActions.setPermanentToken(""); - } - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + User user = (User)session.get("user"); + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = Search.query().eq(Token.FQ_FIELD_EMAIL, user.getEmail()).criteria(); + Token currentToken = proxy.findByCriteria(Token.class, criteria); + + if (currentToken != null) { + String id = currentToken.getWikittyId(); + proxy.delete(id); + } + TokenActions tokenActions = (TokenActions)session.get("tokenActions"); + + if (tokenActions != null) { + String token; + + try { + token = tokenActions.generateToken(); //Generates an encoding MD5 token + criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); + Token oldToken = proxy.findByCriteria(Token.class, criteria); + + if (oldToken == null) { //Checks if the token already exists + TokenImpl newToken = new TokenImpl(); + newToken.setToken(token); + newToken.setEmail(user.getEmail()); + proxy.store((Token) newToken); //If the token doesn't exist, it is stored + tokenActions.setPermanentToken(token); + } else { + tokenActions.setPermanentToken(""); } + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - return SUCCESS; } - return LOGIN; + return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/HomeAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/HomeAction.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/action/HomeAction.java 2011-02-03 16:09:14 UTC (rev 182) @@ -1,6 +1,5 @@ package org.chorem.bow.action; -import java.security.NoSuchAlgorithmException; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -8,12 +7,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.struts2.interceptor.SessionAware; import org.chorem.bow.BowInit; -import org.chorem.bow.BowProxy; -import org.chorem.bow.Token; import org.chorem.bow.User; -import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.search.Search; public class HomeAction extends BowBaseAction implements SessionAware, ServletRequestAware { private static final long serialVersionUID = -3735250067223062719L; @@ -43,39 +37,11 @@ public void setServletRequest(HttpServletRequest request) { this.request = request; } - - protected User checkPermanentToken(String token) { - if (token != null) { - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); - Token DbToken = proxy.findByCriteria(Token.class, criteria); - if (DbToken != null) { //Check if the token exists - criteria = Search.query().eq(User.FQ_FIELD_EMAIL, DbToken.getEmail()).criteria(); //Retrieves user by token - return proxy.findByCriteria(User.class, criteria); - } - } - return null; - } - public String execute() { User user = (User)session.get("user"); - if (user == null) { - user = checkPermanentToken(token); - if (user != null) { - try { - BowInit.initSession(session, user); - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } - if (user != null) { - BowInit.initHomePage(request, user); - return SUCCESS; - } - return LOGIN; + BowInit.initHomePage(request, user); + return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-03 16:09:14 UTC (rev 182) @@ -190,71 +190,68 @@ public String execute() { User user = (User)session.get("user"); - if (user != null) { - if (upfile != null) { - try { - List<?> lines; + if (upfile != null) { + try { + List<?> lines; - lines = FileUtils.readLines(upfile); - String content = ""; + lines = FileUtils.readLines(upfile); + String content = ""; - for (Object line : lines) { - content += (String)line; - } - WikittyProxy proxy = BowProxy.getInstance(); + for (Object line : lines) { + content += (String)line; + } + WikittyProxy proxy = BowProxy.getInstance(); - try { - Parser parser = new Parser(content); - NodeList list = parser.parse(null); - List<Bookmark> bookmarks = new ArrayList<Bookmark>(); - parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>()); - bookmarks = proxy.store(bookmarks); - createImportExtension(bookmarks); - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); - if (searchLine == null || searchLine.isEmpty()) { - BowInit.initHomePage(request, user); - return SUCCESS; - } else { - try { - BowSearch.search(request, user); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (ServletException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return SUCCESS; + try { + Parser parser = new Parser(content); + NodeList list = parser.parse(null); + List<Bookmark> bookmarks = new ArrayList<Bookmark>(); + parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>()); + bookmarks = proxy.store(bookmarks); + createImportExtension(bookmarks); + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); + if (searchLine == null || searchLine.isEmpty()) { + BowInit.initHomePage(request, user); + return SUCCESS; + } else { + try { + BowSearch.search(request, user); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ServletException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); } - } catch (ParserException e) { - request.setAttribute("errorMsgUser", getText(n_("bow.bookmark.badFileFormat"))); - request.setAttribute("errorMsgTech", e.getMessage()); - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); - - if (searchLine == null || searchLine.isEmpty()) { - BowInit.initHomePage(request, user); - return SUCCESS; - } else { - try { - BowSearch.search(request, user); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (ServletException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return SUCCESS; - } + return SUCCESS; } - } catch (IOException e2) { - // TODO Auto-generated catch block - e2.printStackTrace(); + } catch (ParserException e) { + request.setAttribute("errorMsgUser", getText(n_("bow.bookmark.badFileFormat"))); + request.setAttribute("errorMsgTech", e.getMessage()); + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); + + if (searchLine == null || searchLine.isEmpty()) { + BowInit.initHomePage(request, user); + return SUCCESS; + } else { + try { + BowSearch.search(request, user); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ServletException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return SUCCESS; + } } - return ERROR; + } catch (IOException e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); } - return SUCCESS; + return ERROR; } - return LOGIN; + return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/LoginAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/LoginAction.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/action/LoginAction.java 2011-02-03 16:09:14 UTC (rev 182) @@ -90,7 +90,7 @@ } return null; } - + public String execute() { if (email != null) { email = email.trim(); Modified: trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-02-03 16:09:14 UTC (rev 182) @@ -85,74 +85,72 @@ public String execute() { User user = (User)session.get("user"); - if (user != null) { - if (searchLine != null && searchLine.matches("^http://[^ ]*")) { - redirectTo = BowUtils.redirectTo(searchLine, null); - } else if (searchLine != null - && (searchLine.startsWith(":") || searchLine.startsWith("t:")) ) { - //On fait une recherche sur les tags - - int index = searchLine.indexOf(":"); - searchLine = searchLine.substring(index+1); //Suppresses first ":" - - session.put("user", user); - try { - BowInit.initializeToken(session, user); - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = BowBookmark.getBookmarkListCriteriaByUser(user, searchLine); - criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); //Retrieves bookmarks by search - BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, searchLine); - request.setAttribute("bookmarkActions", bookmarkActions); - request.setAttribute("token", token); - redirectTo = BowUtils.redirectTo(searchLine, null); - } else if (searchLine != null && searchLine.startsWith("f:")) { - // recherche fulltext dans bow - String fullText = searchLine.substring(2); - - session.put("user", user); - try { - BowInit.initializeToken(session, user); - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria; - if (!fullText.isEmpty()) { - criteria = Search.query().keyword(fullText). - eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). - addFacetField(Bookmark.FQ_FIELD_TAGS); - } else { - criteria = BowBookmark.getBookmarkListCriteriaByUser(user, null); - } - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); - BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, null); - request.setAttribute("bookmarkActions", bookmarkActions); - request.setAttribute("token", token); - redirectTo = BowUtils.redirectTo(searchLine, null); - } else if (searchLine != null && searchLine.startsWith("a:")) { - // on redirige vers l'alias demande - searchLine = searchLine.substring(2); - redirectTo = BowConfig.getInstance().getAliasUrl() + searchLine; + if (searchLine != null && searchLine.matches("^http://[^ ]*")) { + redirectTo = BowUtils.redirectTo(searchLine, null); + } else if (searchLine != null + && (searchLine.startsWith(":") || searchLine.startsWith("t:")) ) { + //On fait une recherche sur les tags + + int index = searchLine.indexOf(":"); + searchLine = searchLine.substring(index+1); //Suppresses first ":" + + session.put("user", user); + try { + BowInit.initializeToken(session, user); + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = BowBookmark.getBookmarkListCriteriaByUser(user, searchLine); + criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); //Retrieves bookmarks by search + BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, searchLine); + request.setAttribute("bookmarkActions", bookmarkActions); + request.setAttribute("token", token); + redirectTo = BowUtils.redirectTo(searchLine, null); + } else if (searchLine != null && searchLine.startsWith("f:")) { + // recherche fulltext dans bow + String fullText = searchLine.substring(2); + + session.put("user", user); + try { + BowInit.initializeToken(session, user); + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria; + if (!fullText.isEmpty()) { + criteria = Search.query().keyword(fullText). + eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addFacetField(Bookmark.FQ_FIELD_TAGS); } else { - // on fait une recherche sur le moteur de recherche configure - WikittyProxy proxy = BowProxy.getInstance(); - Preference pref = proxy.restore(Preference.class, user.getWikittyId()); - - String searchEngineURL = pref.getSearchEngineUrlResults(); - if (searchEngineURL == null || "".equals(searchEngineURL)) { - BowConfig config = BowConfig.getInstance(); - searchEngineURL = config.getSearchEngine(); - } - searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); - searchEngineURL = response.encodeRedirectURL(searchEngineURL); - redirectTo = searchEngineURL; + criteria = BowBookmark.getBookmarkListCriteriaByUser(user, null); } + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); + BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, null); + request.setAttribute("bookmarkActions", bookmarkActions); + request.setAttribute("token", token); + redirectTo = BowUtils.redirectTo(searchLine, null); + } else if (searchLine != null && searchLine.startsWith("a:")) { + // on redirige vers l'alias demande + searchLine = searchLine.substring(2); + redirectTo = BowConfig.getInstance().getAliasUrl() + searchLine; + } else { + // on fait une recherche sur le moteur de recherche configure + WikittyProxy proxy = BowProxy.getInstance(); + Preference pref = proxy.restore(Preference.class, user.getWikittyId()); + + String searchEngineURL = pref.getSearchEngineUrlResults(); + if (searchEngineURL == null || "".equals(searchEngineURL)) { + BowConfig config = BowConfig.getInstance(); + searchEngineURL = config.getSearchEngine(); + } + searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); + searchEngineURL = response.encodeRedirectURL(searchEngineURL); + redirectTo = searchEngineURL; } return SUCCESS; } Modified: trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java 2011-02-03 16:09:14 UTC (rev 182) @@ -52,36 +52,34 @@ public String execute() { User user = (User)session.get("user"); - if (user != null) { - if (searchLine != null) { - OpenSearchActions openSearchActions = new OpenSearchActions(); - WikittyProxy proxy = BowProxy.getInstance(); - String[] words = searchLine.split("\\s+"); - List<String> searchLineList = new ArrayList<String>(Arrays.asList(words)); + if (searchLine != null) { + OpenSearchActions openSearchActions = new OpenSearchActions(); + WikittyProxy proxy = BowProxy.getInstance(); + String[] words = searchLine.split("\\s+"); + List<String> searchLineList = new ArrayList<String>(Arrays.asList(words)); - if (searchLine.charAt(searchLine.length() - 1) == ' ') { - searchLineList.add(""); //If the user doesn't type anything, we have to propose suggestions - } - Criteria criteria; + if (searchLine.charAt(searchLine.length() - 1) == ' ') { + searchLineList.add(""); //If the user doesn't type anything, we have to propose suggestions + } + Criteria criteria; - if (searchLineList.size() > 1) { - List<String> cpy = new ArrayList<String>(searchLineList); - cpy.remove(cpy.size() - 1); - criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()). - eq(Bookmark.FQ_FIELD_TAGS, cpy).criteria().addFacetField(Bookmark.FQ_FIELD_TAGS); - } else { - criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()). - criteria().addFacetField(Bookmark.FQ_FIELD_TAGS); - } - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); - List<Bookmark> bookList = result.getAll(); - List<FacetTopic> topics = result.getTopic(Bookmark.FQ_FIELD_TAGS); - - openSearchActions.setBookmarkList(bookList); - openSearchActions.setSuggestionList(topics); - openSearchActions.findSuggestions(searchLineList); - request.setAttribute("openSearchAction", openSearchActions); + if (searchLineList.size() > 1) { + List<String> cpy = new ArrayList<String>(searchLineList); + cpy.remove(cpy.size() - 1); + criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()). + eq(Bookmark.FQ_FIELD_TAGS, cpy).criteria().addFacetField(Bookmark.FQ_FIELD_TAGS); + } else { + criteria = Search.query().eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()). + criteria().addFacetField(Bookmark.FQ_FIELD_TAGS); } + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); + List<Bookmark> bookList = result.getAll(); + List<FacetTopic> topics = result.getTopic(Bookmark.FQ_FIELD_TAGS); + + openSearchActions.setBookmarkList(bookList); + openSearchActions.setSuggestionList(topics); + openSearchActions.findSuggestions(searchLineList); + request.setAttribute("openSearchAction", openSearchActions); } return SUCCESS; } Modified: trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-03 16:09:14 UTC (rev 182) @@ -235,49 +235,45 @@ public String execute() { User user = (User)session.get("user"); - if (user != null) { - setBookmarksImportDate(BowBookmark.getBookmarksByImportDate(request, user)); + setBookmarksImportDate(BowBookmark.getBookmarksByImportDate(request, user)); + if (update != null) { //If the user submitted the form + WikittyProxy proxy = BowProxy.getInstance(); + Preference preference = changePreference(); + proxy.store(preference); - if (update != null) { //If the user submitted the form - WikittyProxy proxy = BowProxy.getInstance(); - Preference preference = changePreference(); - proxy.store(preference); - - User newUser = proxy.restore(User.class, user.getWikittyId()); - Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); - User find = proxy.findByCriteria(User.class, criteria); + User newUser = proxy.restore(User.class, user.getWikittyId()); + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); + User find = proxy.findByCriteria(User.class, criteria); - if (find == null || find.getEmail().equals(user.getEmail())) { //If this email address isn't already used by someone else - try { - newUser = changeUser(newUser); - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - newUser = proxy.store(newUser); - session.put("user", newUser); - - preference = proxy.restore(Preference.class, newUser.getWikittyId()); - session.put("preference", preference); - return "update"; + if (find == null || find.getEmail().equals(user.getEmail())) { //If this email address isn't already used by someone else + try { + newUser = changeUser(newUser); + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - setEmail(user.getEmail()); - addActionError(getText("bow.preferences.emailAldyExists")); - return ERROR; - } else { //If the user didn't submit the form, the fields are filled with the current preferences values - Preference preference = (Preference)session.get("preference"); + newUser = proxy.store(newUser); + session.put("user", newUser); - setEmail(user.getEmail()); - if (preference != null) { - setColors(preference.getColors()); - setTagsNb(String.valueOf(preference.getTags())); - setBookmarksHomePage(String.valueOf(preference.getBookmarks())); - setSearchEngineUrlSuggestions(preference.getSearchEngineUrlSuggestions()); - setSearchEngineUrlResults(preference.getSearchEngineUrlResults()); - } + preference = proxy.restore(Preference.class, newUser.getWikittyId()); + session.put("preference", preference); + return "update"; } - return SUCCESS; + setEmail(user.getEmail()); + addActionError(getText("bow.preferences.emailAldyExists")); + return ERROR; + } else { //If the user didn't submit the form, the fields are filled with the current preferences values + Preference preference = (Preference)session.get("preference"); + + setEmail(user.getEmail()); + if (preference != null) { + setColors(preference.getColors()); + setTagsNb(String.valueOf(preference.getTags())); + setBookmarksHomePage(String.valueOf(preference.getBookmarks())); + setSearchEngineUrlSuggestions(preference.getSearchEngineUrlSuggestions()); + setSearchEngineUrlResults(preference.getSearchEngineUrlResults()); + } } - return LOGIN; + return SUCCESS; } } Added: trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java =================================================================== --- trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java 2011-02-03 16:09:14 UTC (rev 182) @@ -0,0 +1,34 @@ +package org.chorem.bow.interceptor; + +import java.util.Map; + +import org.apache.struts2.ServletActionContext; +import org.chorem.bow.User; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; + +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(); + + if ((User)session.get("user") != null) { + ServletActionContext.getResponse().sendRedirect(redirect); + return null; + } + return invocation.invoke(); + } + +} Property changes on: trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java =================================================================== --- trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-02-03 16:09:14 UTC (rev 182) @@ -2,6 +2,7 @@ import java.util.Map; +import org.apache.struts2.ServletActionContext; import org.chorem.bow.BowInit; import org.chorem.bow.BowUtils; import org.chorem.bow.User; @@ -12,7 +13,15 @@ public class LoginInterceptor extends AbstractInterceptor { private static final long serialVersionUID = -7520186185205372272L; + 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(); @@ -22,8 +31,15 @@ String[] token = (String[])toto.get("token"); if (token != null && !token[0].isEmpty()) { - BowInit.initSession(session, BowUtils.checkToken(token[0], session)); + User user = BowUtils.checkToken(token[0], session); + + if (user != null) { + BowInit.initSession(session, user); + return invocation.invoke(); + } } + ServletActionContext.getResponse().sendRedirect(redirect); + return null; } return invocation.invoke(); } Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-03 16:09:14 UTC (rev 182) @@ -25,7 +25,7 @@ bow.home.title=Accueil bow.label.locale.english= bow.label.locale.french= -bow.login.authenticationFailure=Soit votre adresse email n''existe pas, soit votre vot de passe est eronn\u00E9 +bow.login.authenticationFailure=Soit votre adresse email n''existe pas, soit votre mot de passe est eronn\u00E9 bow.login.email=Email bow.login.email.required=Veuillez entrer votre adresse email bow.login.email.wrongformat=Votre adresse email est invalide Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-02-03 14:26:21 UTC (rev 181) +++ trunk/src/main/resources/struts.xml 2011-02-03 16:09:14 UTC (rev 182) @@ -8,16 +8,29 @@  <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> <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>/home.action</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> </action> <action name="logout" class="org.chorem.bow.action.LogoutAction"> @@ -26,75 +39,109 @@ </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> <action name="importBookmarks" class="org.chorem.bow.action.ImportBookmarksAction"> + <interceptor-ref name="loginStack" /> <result name="error" type="redirectAction">error</result> - <result name="login" type="redirectAction">login_input</result> <result type="redirect">${redirectTo}</result> </action> - <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction" /> + <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction"> + <interceptor-ref name="loginStack" /> + </action> <action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction"> + <interceptor-ref name="loginStack" /> <result type="redirectAction">home</result> </action> <action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction"> + <interceptor-ref name="loginStack" /> <result type="redirect">${redirectTo}</result> </action> <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> + <interceptor-ref name="loginStack" /> <result name="home" type="redirectAction">home</result> <result name="search">/jsp/search.jsp</result> </action> <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> + <interceptor-ref name="loginStack" /> <result type="redirectAction">preferences</result> </action> <action name="addUrl" class="org.chorem.bow.action.AddUrlAction"> + <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" /> + <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> <action name="search" class="org.chorem.bow.action.SearchAction"> - <result>/jsp/search.jsp</result> + <interceptor-ref name="loginStack" /> + <result>/jsp/search.jsp</result> </action> <action name="fullText" class="org.chorem.bow.action.FullTextSearchAction"> - <result>/jsp/search.jsp</result> + <interceptor-ref name="loginStack" /> + <result>/jsp/search.jsp</result> </action> <action name="order" class="org.chorem.bow.action.OrderAction"> - <result>/jsp/search.jsp</result> + <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"> - <result>/jsp/suggestions.jsp</result> + <interceptor-ref name="loginStack" /> + <result>/jsp/suggestions.jsp</result> </action> <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> - <result type="redirectAction">home</result> + <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> <action name="home" class="org.chorem.bow.action.HomeAction"> - <result name="login" type="redirectAction">login_input</result> + <interceptor-ref name="loginStack" /> <result>/jsp/home.jsp</result> </action> <action name="locale" class="org.chorem.bow.action.LocaleAction"> <result type="redirect">/jsp/login.jsp</result> </action> <action name="generateToken" class="org.chorem.bow.action.GenerateTokenAction"> - <result name="login" type="redirectAction">login_input</result> + <interceptor-ref name="loginStack" /> <result type="redirectAction">preferences</result> </action> <action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction"> + <interceptor-ref name="loginStack" /> <result type="redirect">${redirectTo}</result> </action> <action name="addClick" class="org.chorem.bow.action.AddClickAction"> + <interceptor-ref name="loginStack" /> <result name="error" type="redirectAction">home</result> <result type="redirect">${link}</result> </action> @@ -102,16 +149,18 @@ <result>/jsp/{1}Xml.jsp</result> </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> - <result name="login" type="redirectAction">login_input</result> + <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="loginStack" /> <result>/jsp/admin.jsp</result> </action> </package>

1 0

r181 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action java/org/chorem/bow/interceptor resources webapp/WEB-INF/decorators webapp/jsp
by vbriand＠users.chorem.org Feb. 3, 2011

Feb. 3, 2011

Author: vbriand Date: 2011-02-03 15:26:21 +0100 (Thu, 03 Feb 2011) New Revision: 181 Url: http://chorem.org/repositories/revision/bow/181 Log: The search engine works with the token authentication Added: trunk/src/main/java/org/chorem/bow/interceptor/ trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java Modified: trunk/src/main/java/org/chorem/bow/BowInit.java trunk/src/main/java/org/chorem/bow/BowUtils.java trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/jsp/permanentXml.jsp trunk/src/main/webapp/jsp/temporaryXml.jsp Modified: trunk/src/main/java/org/chorem/bow/BowInit.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowInit.java 2011-02-03 09:59:36 UTC (rev 180) +++ trunk/src/main/java/org/chorem/bow/BowInit.java 2011-02-03 14:26:21 UTC (rev 181) @@ -50,15 +50,18 @@ static public void initSession(Map<String, Object> session, User user) throws NoSuchAlgorithmException { WikittyProxy proxy = BowProxy.getInstance(); - Preference preference = proxy.restore(Preference.class, user.getWikittyId()); - BowConfig config = BowConfig.getInstance(); - session.put("user", user); - session.put("preference", preference); - session.put("version", config.getVersion()); - session.put("bowUrl", config.getBowUrl()); - initializeToken(session, user); - checkAdmin(session, user.getEmail()); + if (user != null) { + Preference preference = proxy.restore(Preference.class, user.getWikittyId()); + BowConfig config = BowConfig.getInstance(); + + session.put("user", user); + session.put("preference", preference); + session.put("version", config.getVersion()); + session.put("bowUrl", config.getBowUrl()); + initializeToken(session, user); + checkAdmin(session, user.getEmail()); + } } static public void initHomePage(HttpServletRequest request, User user) { Modified: trunk/src/main/java/org/chorem/bow/BowUtils.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-03 09:59:36 UTC (rev 180) +++ trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-03 14:26:21 UTC (rev 181) @@ -1,5 +1,7 @@ package org.chorem.bow; +import java.util.Map; + import javax.servlet.http.HttpSession; import org.nuiton.wikitty.Criteria; @@ -27,6 +29,13 @@ } return checkPermanentToken(token); } + + static public User checkToken(String token, Map<String, Object> session) { + if (checkTemporaryToken(token, session)) { + return (User) session.get("user"); + } + return checkPermanentToken(token); + } /* @param token String which contains the MD5 encoding token * @return null the token doesn't exist @@ -53,6 +62,7 @@ */ protected static boolean checkTemporaryToken(String token, HttpSession session) { TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (tokenActions != null) { String temporaryToken = tokenActions.getTemporaryToken(); if (temporaryToken != null) { @@ -63,4 +73,19 @@ } return false; } + + protected static boolean checkTemporaryToken(String token, Map<String, Object> session) { + TokenActions tokenActions = (TokenActions) session.get("tokenActions"); + + if (tokenActions != null) { + String temporaryToken = tokenActions.getTemporaryToken(); + + if (temporaryToken != null) { + if (temporaryToken.equals(token)) { + return true; + } + } + } + return false; + } } Modified: trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-02-03 09:59:36 UTC (rev 180) +++ trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-02-03 14:26:21 UTC (rev 181) @@ -11,7 +11,7 @@ private static final long serialVersionUID = 1L; public static final String UNTRANSLATED_MARKER = "???"; protected static final Log log = LogFactory.getLog(BowBaseAction.class); - + @Override public String getText(String aTextName) { String value = super.getText(aTextName); Added: trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java =================================================================== --- trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-02-03 14:26:21 UTC (rev 181) @@ -0,0 +1,30 @@ +package org.chorem.bow.interceptor; + +import java.util.Map; + +import org.chorem.bow.BowInit; +import org.chorem.bow.BowUtils; +import org.chorem.bow.User; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; + +public class LoginInterceptor extends AbstractInterceptor { + private static final long serialVersionUID = -7520186185205372272L; + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + Map<String, Object> session = ActionContext.getContext().getSession(); + + if ((User)session.get("user") == null) { + Map<String, Object> toto = ActionContext.getContext().getParameters(); + String[] token = (String[])toto.get("token"); + + if (token != null && !token[0].isEmpty()) { + BowInit.initSession(session, BowUtils.checkToken(token[0], session)); + } + } + return invocation.invoke(); + } +} Property changes on: trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-02-03 09:59:36 UTC (rev 180) +++ trunk/src/main/resources/struts.xml 2011-02-03 14:26:21 UTC (rev 181) @@ -3,27 +3,27 @@ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> - <constant name="struts.devMode" value="true" /> - <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> + <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> -  - <package name="login" extends="struts-default"> - <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> - <result name="input">/jsp/register.jsp</result> - <result type="redirectAction">home</result> - </action> - <action name="forgotPassword_*" method="{1}" class="org.chorem.bow.action.ForgotPasswordAction"> - <result name="input">/jsp/forgotPassword.jsp</result> - <result>/home.action</result> - </action> - <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> - <result name="input">/jsp/login.jsp</result> - <result type="redirectAction">home</result> - </action> - <action name="logout" class="org.chorem.bow.action.LogoutAction"> - <result type="redirectAction">login_input</result> - </action> - </package> +  + <package name="login" extends="struts-default"> + <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> + <result name="input">/jsp/register.jsp</result> + <result type="redirectAction">home</result> + </action> + <action name="forgotPassword_*" method="{1}" class="org.chorem.bow.action.ForgotPasswordAction"> + <result name="input">/jsp/forgotPassword.jsp</result> + <result>/home.action</result> + </action> + <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> + <result name="input">/jsp/login.jsp</result> + <result type="redirectAction">home</result> + </action> + <action name="logout" class="org.chorem.bow.action.LogoutAction"> + <result type="redirectAction">login_input</result> + </action> + </package> <package name="bookmark" extends="struts-default"> <action name="importBookmarks" class="org.chorem.bow.action.ImportBookmarksAction"> @@ -51,6 +51,13 @@ </package> <package name="search" extends="struts-default"> + <interceptors> + <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor" /> + <interceptor-stack name="loginStack"> + <interceptor-ref name="login" /> + <interceptor-ref name="defaultStack" /> + </interceptor-stack> + </interceptors> <action name="search" class="org.chorem.bow.action.SearchAction"> <result>/jsp/search.jsp</result> </action> @@ -61,7 +68,8 @@ <result>/jsp/search.jsp</result> </action> <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> - <result type="redirect">${redirectTo}</result> + <interceptor-ref name="loginStack" /> + <result type="redirect">${redirectTo}</result> </action> <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> <result>/jsp/suggestions.jsp</result> @@ -90,12 +98,9 @@ <result name="error" type="redirectAction">home</result> <result type="redirect">${link}</result> </action> - <action name="temporaryXml"> - <result>/jsp/temporaryXml.jsp</result> + <action name="*Xml"> + <result>/jsp/{1}Xml.jsp</result> </action> - <action name="permanentXml"> - <result>/jsp/permanentXml.jsp</result> - </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> <result name="login" type="redirectAction">login_input</result> <result name="update" type="redirectAction">preferences</result> Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-03 09:59:36 UTC (rev 180) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-03 14:26:21 UTC (rev 181) @@ -5,13 +5,6 @@ <%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> <%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> <%@taglib prefix="s" uri="/struts-tags" %> -<% -String token = request.getParameter("token"); - -if (token != null && !token.isEmpty()) { - session.setAttribute("user", BowUtils.checkToken(token, session)); -} -%> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Bow : <decorator:title default="Bow" /></title> @@ -37,7 +30,7 @@ <%@include file="/jsp/inc/errorFrame.jsp" %> <decorator:body /> </div> - <s:if test="#session.user"> + <s:if test="%{#session.user != null}"> <jsp:include page="/jsp/inc/rightMenu.jsp" /> </s:if> </div> Modified: trunk/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-03 09:59:36 UTC (rev 180) +++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-03 14:26:21 UTC (rev 181) @@ -41,7 +41,7 @@ <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&searchLine={searchTerms}" /> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&searchLine={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription> Modified: trunk/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-03 09:59:36 UTC (rev 180) +++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-03 14:26:21 UTC (rev 181) @@ -41,7 +41,7 @@ <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&search={searchTerms}" /> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&search={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription>

1 0

r180 - in trunk/src/main: java/org/chorem/bow/action resources webapp/jsp/inc
by vbriand＠users.chorem.org Feb. 3, 2011

Feb. 3, 2011

Author: vbriand Date: 2011-02-03 10:59:36 +0100 (Thu, 03 Feb 2011) New Revision: 180 Url: http://chorem.org/repositories/revision/bow/180 Log: Added the redirections to the search page / home page when manually adding a bookmark or deleting a tag. Cleaned the struts.xml Removed: trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java Modified: trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/jsp/inc/rightMenu.jsp Deleted: trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/AddAliasAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -1,62 +0,0 @@ -package org.chorem.bow.action; - -import java.util.List; - -import org.chorem.bow.Bookmark; -import org.chorem.bow.BowProxy; -import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.search.Search; - -public class AddAliasAction extends BowBaseAction { - private static final long serialVersionUID = 2565840071468031758L; - protected String alias; - protected String bookmarkId; - - /** - * @return the alias - */ - public String getAlias() { - return alias; - } - - /** - * @param alias the alias to set - */ - public void setAlias(String alias) { - this.alias = alias; - } - - /** - * @return the bookmarkId - */ - public String getBookmarkId() { - return bookmarkId; - } - - /** - * @param bookmarkId the bookmarkId to set - */ - public void setBookmarkId(String bookmarkId) { - this.bookmarkId = bookmarkId; - } - - public String execute() { - if (alias != null && !alias.isEmpty()) { - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); - List<Bookmark> bookmarks = proxy.findAllByCriteria(Bookmark.class, criteria).getAll(); - - if (bookmarks == null || bookmarks.isEmpty()) { - if (bookmarkId != null && !bookmarkId.isEmpty()) { - Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); - if (bookmark != null) { - bookmark.setAlias(alias); - proxy.store(bookmark); - } - } - } - } - return SUCCESS; - } -} \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -6,6 +6,7 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BookmarkActions; import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUtils; import org.chorem.bow.User; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.WikittyProxy; @@ -18,6 +19,9 @@ protected String alias; protected String tags; protected String nameAndTags; + protected String redirectTo; + protected String searchLine; + protected String fullTextLine; protected Map<String, Object> session; @@ -91,6 +95,41 @@ this.nameAndTags = nameAndTags; } + /** + * @return the redirectTo + */ + public String getRedirectTo() { + return redirectTo; + } + + /** + * @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; + } + @Override public void setSession(Map<String, Object> session) { this.session = session; @@ -116,7 +155,11 @@ } if (bookmark != null && !bookmark.getDescription().isEmpty() && !bookmark.getEmail().isEmpty()) { proxy.store(bookmark); //Stores the bookmark if everything is ok + if (log.isDebugEnabled()) { + log.debug("Adding URL"); + } } + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -2,12 +2,16 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUtils; import org.nuiton.wikitty.WikittyProxy; 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 @@ -33,7 +37,42 @@ 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; + } + public String execute() { if (deleteTag != null && bookmarkId != null) { if (!bookmarkId.isEmpty()) { @@ -46,6 +85,7 @@ } } } + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -89,7 +89,7 @@ request.setAttribute("formAction", "/bow/modifyBookmark.action?bookmarkId=" + bookmarkId + "&searchLine=" + searchLine + "&fullTextLine=" + fullTextLine); } } - if (searchLine == null) { + if (searchLine == null || searchLine.equals("")) { BowInit.initHomePage(request, (User)session.get("user")); return "home"; } else { Modified: trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-02-03 09:59:36 UTC (rev 180) @@ -3,7 +3,6 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BookmarkActions; import org.chorem.bow.BowProxy; -import org.chorem.bow.BowUtils; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Search; @@ -17,7 +16,6 @@ protected String bookmarkId; protected String searchLine; protected String fullTextLine; - protected String redirectTo; /** * @return the link @@ -27,7 +25,7 @@ } /** - * @param url the linkto set + * @param url the link to set */ public void setLink(String link) { this.link = link; @@ -117,20 +115,6 @@ this.fullTextLine = fullTextLine; } - /** - * @return the redirectTo - */ - public String getRedirectTo() { - return redirectTo; - } - - /** - * @param redirectTo the redirectTo to set - */ - public void setRedirectTo(String redirectTo) { - this.redirectTo = redirectTo; - } - public String execute() { WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); @@ -146,8 +130,6 @@ BookmarkActions.updateBookmark(bookmark, name, link, tags, alias); proxy.store(bookmark); } - System.out.println("{{{{{{{{{{{{{{{{{{"+searchLine+"}}}}}}}}}{{{{{{{"+fullTextLine); - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/resources/struts.xml 2011-02-03 09:59:36 UTC (rev 180) @@ -7,7 +7,7 @@ <constant name="struts.ognl.allowStaticMethodAccess" value="true" />  - <package name="myPackage" extends="struts-default"> + <package name="login" extends="struts-default"> <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> <result name="input">/jsp/register.jsp</result> <result type="redirectAction">home</result> @@ -16,10 +16,6 @@ <result name="input">/jsp/forgotPassword.jsp</result> <result>/home.action</result> </action> - - <action name="locale" class="org.chorem.bow.action.LocaleAction"> - <result type="redirect">/jsp/login.jsp</result> - </action> <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> <result name="input">/jsp/login.jsp</result> <result type="redirectAction">home</result> @@ -27,14 +23,6 @@ <action name="logout" class="org.chorem.bow.action.LogoutAction"> <result type="redirectAction">login_input</result> </action> - <action name="home" class="org.chorem.bow.action.HomeAction"> - <result name="login" type="redirectAction">login_input</result> - <result>/jsp/home.jsp</result> - </action> - <action name="addUrl" class="org.chorem.bow.action.AddUrlAction"> - <result type="redirectAction">home</result> -  - </action> </package> <package name="bookmark" extends="struts-default"> @@ -45,7 +33,7 @@ </action> <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction" /> <action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction"> - <result type="redirect">${redirectTo}</result> + <result type="redirectAction">home</result> </action> <action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction"> <result type="redirect">${redirectTo}</result> @@ -54,44 +42,60 @@ <result name="home" type="redirectAction">home</result> <result name="search">/jsp/search.jsp</result> </action> + <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> + <result type="redirectAction">preferences</result> + </action> + <action name="addUrl" class="org.chorem.bow.action.AddUrlAction"> + <result type="redirect">${redirectTo}</result> + </action> </package> - - <package name="toto" extends="struts-default"> + + <package name="search" extends="struts-default"> <action name="search" class="org.chorem.bow.action.SearchAction"> <result>/jsp/search.jsp</result> </action> <action name="fullText" class="org.chorem.bow.action.FullTextSearchAction"> <result>/jsp/search.jsp</result> </action> + <action name="order" class="org.chorem.bow.action.OrderAction"> + <result>/jsp/search.jsp</result> + </action> + <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> + <result type="redirect">${redirectTo}</result> + </action> + <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> + <result>/jsp/suggestions.jsp</result> + </action> + <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> + <result type="redirectAction">home</result> + </action> + </package> + + <package name="misc" extends="struts-default"> + <action name="home" class="org.chorem.bow.action.HomeAction"> + <result name="login" type="redirectAction">login_input</result> + <result>/jsp/home.jsp</result> + </action> + <action name="locale" class="org.chorem.bow.action.LocaleAction"> + <result type="redirect">/jsp/login.jsp</result> + </action> <action name="generateToken" class="org.chorem.bow.action.GenerateTokenAction"> <result name="login" type="redirectAction">login_input</result> <result type="redirectAction">preferences</result> </action> <action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction"> -  - <result type="redirectAction">home</result> + <result type="redirect">${redirectTo}</result> </action> - <action name="addAlias" class="org.chorem.bow.action.AddAliasAction"> -  - <result type="redirectAction">home</result> - </action> - <action name="order" class="org.chorem.bow.action.OrderAction"> - <result>/jsp/search.jsp</result> - </action> <action name="addClick" class="org.chorem.bow.action.AddClickAction"> <result name="error" type="redirectAction">home</result> <result type="redirect">${link}</result> </action> -  - <action name="*Xml"> - <result>/jsp/{1}Xml.jsp</result> + <action name="temporaryXml"> + <result>/jsp/temporaryXml.jsp</result> </action> - <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> - <result type="redirect">${redirectTo}</result> + <action name="permanentXml"> + <result>/jsp/permanentXml.jsp</result> </action> - <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> - <result>/jsp/suggestions.jsp</result> - </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> <result name="login" type="redirectAction">login_input</result> <result name="update" type="redirectAction">preferences</result> @@ -102,14 +106,8 @@ <result name="error">/jsp/login.jsp</result> <result>/jsp/admin.jsp</result> </action> - <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> - <result type="redirectAction">preferences</result> - </action> <action name="reIndexation" class="org.chorem.bow.action.ReIndexationAction"> <result>/jsp/admin.jsp</result> </action> - <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> - <result type="redirectAction">home</result> - </action> </package> </struts> Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-28 17:28:36 UTC (rev 179) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-03 09:59:36 UTC (rev 180) @@ -84,6 +84,8 @@ <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /><br /> <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" labelSeparator="" /><br /><br /> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> <s:submit key="bow.rightMenu.bookmark.submit" /> </s:form> </div>

1 0

r179 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action resources resources/i18n webapp/WEB-INF/decorators webapp/jsp webapp/jsp/inc webapp/template/xhtml
by vbriand＠users.chorem.org Jan. 28, 2011

Jan. 28, 2011

Author: vbriand Date: 2011-01-28 18:28:36 +0100 (Fri, 28 Jan 2011) New Revision: 179 Url: http://chorem.org/repositories/revision/bow/179 Log: When an action (remove, import, modify a bookmark) is performed on the search page, the user is redirected to the search page instead of the home page. Transformed some code on jsp pages to its Struts2 equivalent. The search engines work again (when logged in for the moment). The <form>s all redirect to the correct url (/bow instead of /bow/bow). Added: trunk/src/main/java/org/chorem/bow/BowUtils.java trunk/src/main/webapp/template/xhtml/file.ftl Modified: trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java trunk/src/main/resources/i18n/bow_en_GB.properties trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/inc/footer.jsp trunk/src/main/webapp/jsp/inc/rightMenu.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/permanentXml.jsp trunk/src/main/webapp/jsp/preferences.jsp trunk/src/main/webapp/jsp/search.jsp trunk/src/main/webapp/jsp/suggestions.jsp trunk/src/main/webapp/jsp/temporaryXml.jsp Added: trunk/src/main/java/org/chorem/bow/BowUtils.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowUtils.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-01-28 17:28:36 UTC (rev 179) @@ -0,0 +1,66 @@ +package org.chorem.bow; + +import javax.servlet.http.HttpSession; + +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Search; + +public class BowUtils { + static public String redirectTo(String searchLine, String fullTextLine) { + if (!searchLine.equals("") || !fullTextLine.equals("")) { + return "search.action?searchLine=" + searchLine + "&fullTextLine=" + fullTextLine; + } else { + return "home.action"; + } + } + + /* @param token String token + * @param session HttpSession session + * @return User + * @description check if the token is valid and return the + * token owner + */ + static public User checkToken(String token, HttpSession session) { + if (checkTemporaryToken(token, session)) { + return (User) session.getAttribute("user"); + } + return checkPermanentToken(token); + } + + /* @param token String which contains the MD5 encoding token + * @return null the token doesn't exist + * @return User the token owner + */ + protected static User checkPermanentToken(String token) { + if (token != null) { + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = Search.query().eq(Token.FQ_FIELD_TOKEN, token).criteria(); + Token DbToken = proxy.findByCriteria(Token.class, criteria); + + if (DbToken != null) { // check if the token exists + String userEmail = DbToken.getEmail(); // the token owner user name (email) + criteria = Search.query().eq(User.FQ_FIELD_EMAIL, userEmail).criteria(); // retrieve user by token + return proxy.findByCriteria(User.class, criteria); + } + } + return null; + } + + /* @param token String which contains the MD5 encoding token + * @return null the token doesn't exist + * @return User the token owner + */ + protected static boolean checkTemporaryToken(String token, HttpSession session) { + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (tokenActions != null) { + String temporaryToken = tokenActions.getTemporaryToken(); + if (temporaryToken != null) { + if (temporaryToken.equals(token)) { + return true; + } + } + } + return false; + } +} Property changes on: trunk/src/main/java/org/chorem/bow/BowUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -8,11 +8,10 @@ import java.util.List; public class BowBaseAction extends ActionSupport { - private static final long serialVersionUID = 1L; public static final String UNTRANSLATED_MARKER = "???"; - private static final Log log = LogFactory.getLog(BowBaseAction.class); - + protected static final Log log = LogFactory.getLog(BowBaseAction.class); + @Override public String getText(String aTextName) { String value = super.getText(aTextName); Modified: trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -20,6 +20,7 @@ private static final long serialVersionUID = 2706590901233864637L; protected String bookmarkId; protected String searchLine; + protected String fullTextLine; protected Map<String, Object> session; protected HttpServletRequest request; @@ -51,6 +52,20 @@ 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; + } + @Override public void setSession(Map<String, Object> session) { this.session = session; @@ -71,7 +86,7 @@ request.setAttribute("name", bookmark.getDescription()); request.setAttribute("alias", bookmark.getAlias()); request.setAttribute("tags", BookmarkActions.getBookmarkTagsString(bookmark)); - request.setAttribute("formAction", "/bow/modifyBookmark.action?bookmarkId=" + bookmarkId); + request.setAttribute("formAction", "/bow/modifyBookmark.action?bookmarkId=" + bookmarkId + "&searchLine=" + searchLine + "&fullTextLine=" + fullTextLine); } } if (searchLine == null) { Modified: trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -14,6 +14,8 @@ public class FullTextSearchAction extends BowBaseAction implements SessionAware, ServletRequestAware { private static final long serialVersionUID = -7736099487284993426L; protected Map<String, Object> session; + protected String searchLine; + protected String fullTextLine; protected HttpServletRequest request; @Override @@ -26,6 +28,34 @@ this.session = session; } + /** + * @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; + } + public String execute() { User user = (User)session.get("user"); Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -18,6 +18,7 @@ import org.chorem.bow.BowInit; import org.chorem.bow.BowProxy; import org.chorem.bow.BowSearch; +import org.chorem.bow.BowUtils; import org.chorem.bow.Import; import org.chorem.bow.User; import org.htmlparser.Node; @@ -34,6 +35,9 @@ protected File upfile; protected String upfileContentType; protected String upfileFileName; + protected String searchLine; + protected String fullTextLine; + protected String redirectTo; protected Map<String, Object> session; protected HttpServletRequest request; @@ -79,6 +83,41 @@ this.upfileFileName = upfileFileName; } + /** + * @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; + } + @Override public void setSession(Map<String, Object> session) { this.session = session; @@ -171,13 +210,28 @@ parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>()); bookmarks = proxy.store(bookmarks); createImportExtension(bookmarks); - BowInit.initHomePage(request, user); - return SUCCESS; + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); + if (searchLine == null || searchLine.isEmpty()) { + BowInit.initHomePage(request, user); + return SUCCESS; + } else { + try { + BowSearch.search(request, user); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ServletException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return SUCCESS; + } } catch (ParserException e) { request.setAttribute("errorMsgUser", getText(n_("bow.bookmark.badFileFormat"))); request.setAttribute("errorMsgTech", e.getMessage()); + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); - if (request.getParameter("searchLine") == null) { + if (searchLine == null || searchLine.isEmpty()) { BowInit.initHomePage(request, user); return SUCCESS; } else { @@ -190,7 +244,7 @@ // TODO Auto-generated catch block e1.printStackTrace(); } - return "search"; + return SUCCESS; } } } catch (IOException e2) { Modified: trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -3,6 +3,7 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BookmarkActions; import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUtils; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Search; @@ -14,6 +15,9 @@ protected String alias; protected String tags; protected String bookmarkId; + protected String searchLine; + protected String fullTextLine; + protected String redirectTo; /** * @return the link @@ -85,6 +89,48 @@ this.bookmarkId = bookmarkId; } + /** + * @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; + } + + /** + * @param redirectTo the redirectTo to set + */ + public void setRedirectTo(String redirectTo) { + this.redirectTo = redirectTo; + } + public String execute() { WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, bookmarkId); @@ -100,6 +146,8 @@ BookmarkActions.updateBookmark(bookmark, name, link, tags, alias); proxy.store(bookmark); } + System.out.println("{{{{{{{{{{{{{{{{{{"+searchLine+"}}}}}}}}}{{{{{{{"+fullTextLine); + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -15,6 +15,7 @@ import org.chorem.bow.BowConfig; import org.chorem.bow.BowInit; import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUtils; import org.chorem.bow.Preference; import org.chorem.bow.User; import org.nuiton.wikitty.Criteria; @@ -26,6 +27,7 @@ private static final long serialVersionUID = -1691325797986483856L; protected String searchLine; protected String token; + protected String redirectTo; protected Map<String, Object> session; protected HttpServletRequest request; protected HttpServletResponse response; @@ -58,6 +60,13 @@ this.token = token; } + /** + * @return the redirectTo + */ + public String getRedirectTo() { + return redirectTo; + } + @Override public void setSession(Map<String, Object> session) { this.session = session; @@ -73,78 +82,77 @@ this.response = response; } - //TODO : gérer toutes les redirections comme il faut avec Struts2 public String execute() { User user = (User)session.get("user"); - if (searchLine != null && searchLine.matches("^http://[^ ]*")) { - //response.sendRedirect(searchLine); - } else if (searchLine != null - && (searchLine.startsWith(":") || searchLine.startsWith("t:")) ) { - //On fait une recherche sur les tags - - int index = searchLine.indexOf(":"); - searchLine = searchLine.substring(index+1); //Suppresses first ":" - - session.put("user", user); - try { - BowInit.initializeToken(session, user); - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = BowBookmark.getBookmarkListCriteriaByUser(user, searchLine); - criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); //Retrieves bookmarks by search - BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, searchLine); - request.setAttribute("bookmarkActions", bookmarkActions); - request.setAttribute("token", token); - //request.getRequestDispatcher("search.jsp").forward(request, response); - } else if (searchLine != null && searchLine.startsWith("f:")) { - // recherche fulltext dans bow - String fullText = searchLine.substring(2); - - session.put("user", user); - try { - BowInit.initializeToken(session, user); - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria; - if (!fullText.isEmpty()) { - criteria = Search.query().keyword(fullText). - eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). - addFacetField(Bookmark.FQ_FIELD_TAGS); - + if (user != null) { + if (searchLine != null && searchLine.matches("^http://[^ ]*")) { + redirectTo = BowUtils.redirectTo(searchLine, null); + } else if (searchLine != null + && (searchLine.startsWith(":") || searchLine.startsWith("t:")) ) { + //On fait une recherche sur les tags + + int index = searchLine.indexOf(":"); + searchLine = searchLine.substring(index+1); //Suppresses first ":" + + session.put("user", user); + try { + BowInit.initializeToken(session, user); + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = BowBookmark.getBookmarkListCriteriaByUser(user, searchLine); + criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); //Retrieves bookmarks by search + BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, searchLine); + request.setAttribute("bookmarkActions", bookmarkActions); + request.setAttribute("token", token); + redirectTo = BowUtils.redirectTo(searchLine, null); + } else if (searchLine != null && searchLine.startsWith("f:")) { + // recherche fulltext dans bow + String fullText = searchLine.substring(2); + + session.put("user", user); + try { + BowInit.initializeToken(session, user); + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria; + if (!fullText.isEmpty()) { + criteria = Search.query().keyword(fullText). + eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addFacetField(Bookmark.FQ_FIELD_TAGS); + } else { + criteria = BowBookmark.getBookmarkListCriteriaByUser(user, null); + } + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); + BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, null); + request.setAttribute("bookmarkActions", bookmarkActions); + request.setAttribute("token", token); + redirectTo = BowUtils.redirectTo(searchLine, null); + } else if (searchLine != null && searchLine.startsWith("a:")) { + // on redirige vers l'alias demande + searchLine = searchLine.substring(2); + redirectTo = BowConfig.getInstance().getAliasUrl() + searchLine; } else { - criteria = BowBookmark.getBookmarkListCriteriaByUser(user, null); + // on fait une recherche sur le moteur de recherche configure + WikittyProxy proxy = BowProxy.getInstance(); + Preference pref = proxy.restore(Preference.class, user.getWikittyId()); + + String searchEngineURL = pref.getSearchEngineUrlResults(); + if (searchEngineURL == null || "".equals(searchEngineURL)) { + BowConfig config = BowConfig.getInstance(); + searchEngineURL = config.getSearchEngine(); + } + searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); + searchEngineURL = response.encodeRedirectURL(searchEngineURL); + redirectTo = searchEngineURL; } - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); - BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, null); - request.setAttribute("bookmarkActions", bookmarkActions); - request.setAttribute("token", token); - //request.getRequestDispatcher("search.jsp").forward(request, response); - } else if (searchLine != null && searchLine.startsWith("a:")) { - // on redirige vers l'alias demande - searchLine = searchLine.substring(2); - //response.sendRedirect(BowConfig.getInstance().getAliasUrl() + searchLine); - } else { - // on fait une recherche sur le moteur de recherche configure - WikittyProxy proxy = BowProxy.getInstance(); - Preference pref = proxy.restore(Preference.class, user.getWikittyId()); - - String searchEngineURL = pref.getSearchEngineUrlResults(); - if (searchEngineURL == null || "".equals(searchEngineURL)) { - BowConfig config = BowConfig.getInstance(); - searchEngineURL = config.getSearchEngine(); - } - searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); - searchEngineURL = response.encodeRedirectURL(searchEngineURL); - - //response.sendRedirect(searchEngineURL); } return SUCCESS; } Modified: trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -245,8 +245,9 @@ User newUser = proxy.restore(User.class, user.getWikittyId()); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); + User find = proxy.findByCriteria(User.class, criteria); - if (proxy.findByCriteria(User.class, criteria) == null) { //If this email address isn't already used by someone else + if (find == null || find.getEmail().equals(user.getEmail())) { //If this email address isn't already used by someone else try { newUser = changeUser(newUser); } catch (NoSuchAlgorithmException e) { Modified: trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-01-28 17:28:36 UTC (rev 179) @@ -2,11 +2,15 @@ import org.chorem.bow.Bookmark; import org.chorem.bow.BowProxy; +import org.chorem.bow.BowUtils; import org.nuiton.wikitty.WikittyProxy; public class RemoveBookmarkAction extends BowBaseAction { private static final long serialVersionUID = 820566716695285561L; protected String bookmarkId; + protected String searchLine; + protected String fullTextLine; + protected String redirectTo; /** * @return the bookmarkId @@ -22,6 +26,41 @@ this.bookmarkId = bookmarkId; } + /** + * @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; + } + public String execute() { if (bookmarkId != null && !bookmarkId.isEmpty()) { try { @@ -31,12 +70,11 @@ if (bookmark != null) { proxy.delete(bookmarkId); } - } catch (Exception eee) { - //TODO: log - //log.error("Can't do action", eee); + } catch (Exception e) { + log.error("Can't do action", e); } } -// redirectToTheGoodPage(request, response); + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-28 17:28:36 UTC (rev 179) @@ -14,6 +14,9 @@ bow.config.data.dir.description= bow.config.search.engine.description= bow.config.servlet.bow.description= +bow.footer.bugreport=Bug report +bow.footer.license=AGPL License +bow.footer.userSupport=User support bow.forgotPassword.emailDoesntExist= bow.forgotpwd.submit=Send bow.forgotpwd.title=Forgot your password? @@ -22,7 +25,7 @@ bow.home.title=Home bow.label.locale.english= bow.label.locale.french= -bow.login.authenticationFailure= +bow.login.authenticationFailure=Either your email address doesn''t exist or your password is incorrect bow.login.email=Email bow.login.email.required=Email is required bow.login.email.wrongformat=Your email address isn''t valid @@ -41,7 +44,7 @@ bow.preferences.newPassword=New password bow.preferences.noImportedBookmarks=No imported bookmarks bow.preferences.regenPermToken=Regenerate permanent token -bow.preferences.searchEngineUrlResults=Search Engine URL Results ({searchTerms} will be replaced by your text) +bow.preferences.searchEngineUrlResults=Search Engine URL Results ('{'searchTerms'}' will be replaced by your text) bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions bow.preferences.siteLook=Site look bow.preferences.submit=Change @@ -58,14 +61,17 @@ bow.register.submit=Register bow.register.title=Register bow.requiredstring=${getText(fieldKey)} is required +bow.rightMenu.admin=Admin bow.rightMenu.bookmark.addModify=Add / Modify bow.rightMenu.bookmark.alias=ALIAS bow.rightMenu.bookmark.link=URL bow.rightMenu.bookmark.name=DESC bow.rightMenu.bookmark.permanentLink=Bookmark add link (permanent) +bow.rightMenu.bookmark.permanentLinkDescription=Add this link to your favourites to bookmark others in the future. This link is always available\! bow.rightMenu.bookmark.submit=Save bow.rightMenu.bookmark.tags=TAGS bow.rightMenu.bookmark.temporaryLink=Bookmark add link (session) +bow.rightMenu.bookmark.temporaryLinkDescription=Add this link to your favourites to bookmark others in the future. This link is only available while you are connected on the site\! bow.rightMenu.chromiumExtension=Chromium extension bow.rightMenu.exportBookmarks=Export bookmarks bow.rightMenu.extensions=Extensions @@ -78,6 +84,12 @@ bow.rightMenu.search=Search bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id +bow.search.ascclick=Asc. clicks nb +bow.search.ascdate=Asc. date +bow.search.ascname=Asc. name +bow.search.descclick=Desc. clicks nb +bow.search.descdate=Desc. date +bow.search.descname=Desc. name bow.search.orderby=Order by bow.search.submit=Search bow.search.title=Search Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-28 17:28:36 UTC (rev 179) @@ -14,6 +14,9 @@ bow.config.data.dir.description= bow.config.search.engine.description= bow.config.servlet.bow.description= +bow.footer.bugreport=Rapport de bug +bow.footer.license=Licence AGPL +bow.footer.userSupport=Support utilisateur bow.forgotPassword.emailDoesntExist= bow.forgotpwd.submit=Envoyer bow.forgotpwd.title=Vous avez oubli\u00E9 votre mot de passe ? @@ -22,7 +25,7 @@ bow.home.title=Accueil bow.label.locale.english= bow.label.locale.french= -bow.login.authenticationFailure= +bow.login.authenticationFailure=Soit votre adresse email n''existe pas, soit votre vot de passe est eronn\u00E9 bow.login.email=Email bow.login.email.required=Veuillez entrer votre adresse email bow.login.email.wrongformat=Votre adresse email est invalide @@ -41,13 +44,13 @@ bow.preferences.newPassword=Nouveau mot de passe bow.preferences.noImportedBookmarks=Aucun marque-page import\u00E9 bow.preferences.regenPermToken=Reg\u00E9n\u00E9rer le token permanent -bow.preferences.searchEngineUrlResults= -bow.preferences.searchEngineUrlSuggestions= -bow.preferences.siteLook= +bow.preferences.searchEngineUrlResults=Search Engine URL Results ('{'searchTerms'}' sera remplac\u00E9 par votre recherche) +bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions +bow.preferences.siteLook=Pr\u00E9f\u00E9rences du site bow.preferences.submit=Changer -bow.preferences.tagsNb= +bow.preferences.tagsNb=Nombre de tags affich\u00E9s sur le nuage de tags bow.preferences.title=Pr\u00E9f\u00E9rences -bow.preferences.userInfo= +bow.preferences.userInfo=Informations utilisateur bow.register.emailAldyUsed=Cette adresse email est d\u00E9j\u00E0 utilis\u00E9e bow.register.invalidLogin= bow.register.mailEmail= @@ -58,14 +61,17 @@ bow.register.submit=S''enregistrer bow.register.title=S''enregistrer bow.requiredstring=${getText(fieldKey)} est obligatoire +bow.rightMenu.admin=Admin bow.rightMenu.bookmark.addModify=Ajouter / Modifier bow.rightMenu.bookmark.alias=ALIAS bow.rightMenu.bookmark.link=URL bow.rightMenu.bookmark.name=DESC bow.rightMenu.bookmark.permanentLink=Ajouter un bookmark (permanent) +bow.rightMenu.bookmark.permanentLinkDescription=Ajoutez ce lien \u00E0 vos favoris pour pouvoir bookmarker vos liens dans le futur. Ce lien est toujours disponible \! bow.rightMenu.bookmark.submit=Sauvegarder bow.rightMenu.bookmark.tags=TAGS bow.rightMenu.bookmark.temporaryLink=Ajouter un bookmark (session) +bow.rightMenu.bookmark.temporaryLinkDescription=Ajoutez ce lien \u00E0 vos favoris pour pouvoir bookmarker vos liens dans le futur. Ce lien est seulement disponible tant que vous \u00EAtes connect\u00E9 sur le site \! bow.rightMenu.chromiumExtension=Extension pour chromium bow.rightMenu.exportBookmarks=Exporter les marque-pages bow.rightMenu.extensions=Extensions @@ -78,6 +84,12 @@ bow.rightMenu.search=Recherche bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session +bow.search.ascclick=Nb clics asc. +bow.search.ascdate=Date asc. +bow.search.ascname=Nom asc. +bow.search.descclick=Nb clics desc. +bow.search.descdate=Date desc. +bow.search.descname=Nom desc. bow.search.orderby=Trier par bow.search.submit=Rechercher bow.search.title=Recherche Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/resources/struts.xml 2011-01-28 17:28:36 UTC (rev 179) @@ -6,6 +6,7 @@ <constant name="struts.devMode" value="true" /> <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> +  <package name="myPackage" extends="struts-default"> <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> <result name="input">/jsp/register.jsp</result> @@ -38,21 +39,16 @@ <package name="bookmark" extends="struts-default"> <action name="importBookmarks" class="org.chorem.bow.action.ImportBookmarksAction"> - <result name="search" type="redirectAction">search</result> <result name="error" type="redirectAction">error</result> - <result name="login" type="redirectAction">home</result> - <result type="redirectAction">home</result> + <result name="login" type="redirectAction">login_input</result> + <result type="redirect">${redirectTo}</result> </action> - <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction"> - <result type="redirectAction">home</result> - </action> + <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction" /> <action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction"> - <result name="search">/jsp/search.jsp</result> - <result type="redirectAction">home</result> + <result type="redirect">${redirectTo}</result> </action> <action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction"> - <result type="redirectAction">home</result> - <result name="search">/jsp/search.jsp</result> + <result type="redirect">${redirectTo}</result> </action> <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> <result name="home" type="redirectAction">home</result> @@ -90,9 +86,10 @@ <action name="*Xml"> <result>/jsp/{1}Xml.jsp</result> </action> -  - <action name="openSearch*" method="{1}" class="org.chorem.bow.action.OpenSearchAction"> -  + <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> + <result type="redirect">${redirectTo}</result> + </action> + <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> <result>/jsp/suggestions.jsp</result> </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> @@ -106,7 +103,7 @@ <result>/jsp/admin.jsp</result> </action> <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> - <result>/jsp/preferences.jsp</result> + <result type="redirectAction">preferences</result> </action> <action name="reIndexation" class="org.chorem.bow.action.ReIndexationAction"> <result>/jsp/admin.jsp</result> Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -1,10 +1,17 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@page import="org.chorem.bow.BowUtils" %> <%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> <%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> <%@taglib prefix="s" uri="/struts-tags" %> +<% +String token = request.getParameter("token"); +if (token != null && !token.isEmpty()) { + session.setAttribute("user", BowUtils.checkToken(token, session)); +} +%> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Bow : <decorator:title default="Bow" /></title> @@ -15,8 +22,8 @@ <s:url id="permanentXml" action="permanentXml" /> <s:url id="favicon" value="/img/favicon.png" /> <link rel="icon" type="image/png" href="${favicon}" /> - <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="${temporaryXml}" /> - <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="${permanentXml}" /> + <link rel="search" type="application/opensearchdescription+xml" title="Bow (temporary)" href="${temporaryXml}" /> + <link rel="search" type="application/opensearchdescription+xml" title="Bow (permanent)" href="${permanentXml}" /> <s:url id="globalCSS" value="/css/global.css" /> <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> <s:url id="bookmarkJS" value="/js/bookmark.js" /> Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -29,92 +29,73 @@ <%@page import="java.text.SimpleDateFormat" %> <%@page import="org.chorem.bow.BookmarkActions" %> <%@page import="java.util.Set" %> -<% -Bookmark bookmark = (Bookmark) request.getAttribute("bookmark"); -BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); -SimpleDateFormat sdf = (SimpleDateFormat) request.getAttribute("sdf"); -String aliasUrl = BowConfig.getInstance().getServletAliasUrl(); -if (bookmark != null && sdf != null && bookmarkActions != null) { - String formBookmarkId = (String) request.getAttribute("formBookmarkId"); - String link = bookmark.getLink(); - link = link.replace("'", "\\'"); - %> - <s:set var="searchLine" value="%{#request.searchLine}" /> - <s:set var="fullTextLine" value="%{#request.fullTextLine}" /> - <s:set var="wikittyId" value="%{#request.bookmark.getWikittyId()}" /> - <s:set var="bookmarkLink" value="%{#request.bookmark.getLink()}" /> - <s:set var="bookmarkAlias" value="%{#request.bookmark.getAlias()}" /> - <s:set var="bookmarkDescription" value="%{#request.bookmark.getDescription()}" /> - <s:set var="bookmarkClicks" value="%{#request.bookmark.getClick()}" /> - - <div class="bookmark"> - <div class="bookmarkhead"> - <a class="alias" href="<%=aliasUrl + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" onclick="window.open(this.href); return false;"> - <s:property value="%{#bookmarkAlias}" /> - </a> - <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p> - <s:url id="editBookmark" action="modifyBookmark" escapeAmp="false"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkActions@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmark}', '%{#wikittyId}');"></s:a> - <s:url id="removeBookmark" action="removeBookmark" escapeAmp="false"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:a cssClass="supprim" href="%{removeBookmark}"></s:a> - </div> - <div class="bookmarkcontenu"> - <div class="screenshot"></div> - <div class="click"><s:property value="%{#bookmarkClicks}" /></div> - <div class="description"> - <h3><s:text name="bow.bookmark.description" /> :</h3> - <p> - <s:url id="addClick" action="addClick"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - </s:url> - <s:a title="%{#bookmarkLink}" href="%{addClick}" onclick="window.open(this.href); return false;"><s:property value="%{#bookmarkDescription}" /></s:a> - </p> - <p class="tags"> - <strong><s:text name="bow.bookmark.tags" /> :</strong> - <% - Set<String> tagList = bookmark.getTags(); - - if (tagList != null && !tagList.isEmpty()) { - for (String tag : tagList) { - %> - <s:url id="deleteTag" action="deleteTag" escapeAmp="false"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="deleteTag"><%=tag%></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> - </s:url> - <% - if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) { - %> - <s:a cssStyle="text-decoration: none;" href="%{deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - <% - } else { - %> - <a name="<s:property value='%{#wikittyId}' />" style="display:none; text-decoration: none;" href="<s:property value='%{#deleteTag}' />"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </a> - <% } %> - <s:url id="search" action="search"> - <s:param name="searchLine"><%=tag%></s:param> - </s:url> - <s:a href="%{search}" cssStyle="text-decoration: none"><%=tag%></s:a> - <% - } - } - %> - </p> - </div> - </div> - </div> - <% } %> +<s:set var="searchLine" value="%{#request.searchLine}" /> +<s:set var="fullTextLine" value="%{#request.fullTextLine}" /> +<s:set var="wikittyId" value="%{#request.bookmark.getWikittyId()}" /> +<s:set var="bookmarkLink" value="%{#request.bookmark.getLink()}" /> +<s:set var="bookmarkAlias" value="%{#request.bookmark.getAlias()}" /> +<s:set var="bookmarkDescription" value="%{#request.bookmark.getDescription()}" /> +<s:set var="bookmarkClicks" value="%{#request.bookmark.getClick()}" /> +<s:set var="formBookmarkId" value="%{#request.formBookmarkId}" /> +<s:set var="aliasUrl" value="%{@org.chorem.bow.BowConfig@getInstance().getServletAliasUrl() + #bookmarkAlias}" /> +<s:set var="date" value="%{#request.sdf.format(#request.bookmark.getDate())}" /> + +<div class="bookmark"> + <div class="bookmarkhead"> + <s:a cssClass="alias" href="%{#aliasUrl}" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> + <s:property value="%{#bookmarkAlias}" /> + </s:a> + <p class="date">(<s:property value="%{date}" />)</p> + <s:url id="editBookmark" action="modifyBookmark" escapeAmp="false"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkActions@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmark}', '%{#wikittyId}');"></s:a> + <s:url id="removeBookmark" action="removeBookmark" escapeAmp="false"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></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:a cssClass="supprim" href="%{removeBookmark}"></s:a> + </div> + <div class="bookmarkcontenu"> + <div class="screenshot"></div> + <div class="click"><s:property value="%{#bookmarkClicks}" /></div> + <div class="description"> + <h3><s:text name="bow.bookmark.description" /> :</h3> + <p> + <s:url id="addClick" action="addClick"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> + </s:url> + <s:a title="%{#bookmarkLink}" href="%{addClick}" onclick="window.open(this.href); return false;"><s:property value="%{#bookmarkDescription}" /></s:a> + </p> + <p class="tags"> + <strong><s:text name="bow.bookmark.tags" /> :</strong> + <s:iterator value="#request.bookmark.tags"> + <s:url id="deleteTag" action="deleteTag" escapeAmp="false"> + <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> + <a name="<s:property value='%{#wikittyId}' />" style="display:none; text-decoration: none;" href="<s:property value='%{#deleteTag}' />"> + <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> + </a> + </s:else> + <s:url id="search" action="search"> + <s:param name="searchLine"><s:property /></s:param> + </s:url> + <s:a href="%{search}" cssStyle="text-decoration:none"><s:property /></s:a> + </s:iterator> + </p> + </div> + </div> +</div> Modified: trunk/src/main/webapp/jsp/inc/footer.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/footer.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/inc/footer.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -5,11 +5,11 @@ <p> <a shape="rect" href="">bow</a> <a shape="rect" href="http://www.chorem.org/projects/list_files/bow"></a> - - <a shape="rect" href="http://www.gnu.org/licenses/agpl.html">Licence AGPL</a> - + <a shape="rect" href="http://www.gnu.org/licenses/agpl.html"><s:text name="bow.footer.license" /></a> - <span title="Copyright">©2010</span> <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - - <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> - - <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a> - + <a shape="rect" href="http://www.chorem.org/projects/bow/issues"><s:text name="bow.footer.bugreport" /></a> - + <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users"><s:text name="bow.footer.userSupport" /></a> - <s:url id="localeEN"> <s:param name="request_locale">en_GB</s:param> </s:url> Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -32,10 +32,6 @@ <% TokenActions tokenActions = (TokenActions)session.getAttribute("tokenActions"); BookmarkActions bookmarkActions = (BookmarkActions)request.getAttribute("bookmarkActions"); -Boolean admin = (Boolean)session.getAttribute("admin"); -if (admin == null) { - admin = false; -} int nbTags = 100; Preference preference = (Preference)session.getAttribute("preference"); @@ -45,21 +41,18 @@ nbTags = tags; } request.setAttribute("nbTags", nbTags); -String searchLine = null; -String fullText = null; -if (bookmarkActions != null){ - searchLine = bookmarkActions.getSearchLine(); - fullText = bookmarkActions.getFullTextLine(); -} if ((String)request.getAttribute("formAction") == null) - request.setAttribute("formAction", "/addUrl.action"); + request.setAttribute("formAction", "addUrl"); %> +<s:set var="searchLine" value="%{request.bookmarkActions.searchLine}" /> +<s:set var="fullTextLine" value="%{request.bookmarkActions.fullTextLine}" /> + <div id="logoutDiv" xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <s:form action="logout" theme="simple"> + <s:form action="logout"> <div class="input"> <s:submit key="bow.rightMenu.logout" /> </div> @@ -69,9 +62,9 @@ <div id="side"> <div id="colonneD"> <ul class="droite"> - <% if (admin) { %> - <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> - <% } %> + <s:if test="%{#session.admin == true}"> + <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> + </s:if> <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> <li><s:a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='%{#session.bowUrl}addUrl.action?token=%{#session.tokenActions.getTemporaryToken()}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></s:a></li> <li><s:a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='%{#session.bowUrl}addUrl.action?token=%{#session.tokenActions.getPermanentToken()}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></s:a></li> @@ -95,19 +88,20 @@ </s:form> </div> <div id="nuage"> - <% if (searchLine != null) { %> + <s:if test="%{searchLine != null}"> <jsp:include page="tagsCloud.jsp" flush="true"> - <jsp:param name="searchLine" value="<%=searchLine%>" /> + <jsp:param name="searchLine" value="%{searchLine}" /> </jsp:include> - <% } else { %> + </s:if> + <s:else> <jsp:include page="tagsCloud.jsp" flush="true" /> - <% } %> + </s:else> </div> <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" theme="simple" /> + <s:submit key="bow.rightMenu.find.submit" /> </div> </s:form> </div> @@ -115,16 +109,17 @@ <s:form action="fullText"> <div class="input"> <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" theme="simple" /> + <s:submit key="bow.rightMenu.find.submit" /> </div> </s:form> </div> <div id="import"> <s:form action="importBookmarks" method="post" enctype="multipart/form-data"> <div class="input"> - <label for="fileImport"><s:text name="bow.rightMenu.importBookmarks" /></label> - <input type="file" size="15%" id="upfile" name="upfile" /><br /> - <s:submit key="bow.rightMenu.import.submit" theme="simple" /> + <s:file size="15%" name="upfile" key="bow.rightMenu.importBookmarks" labelSeparator="" /> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <s:submit key="bow.rightMenu.import.submit" /> </div> </s:form> <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/login.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -16,6 +16,7 @@ <div id="content"> <div id="formFrame"> <h1><s:text name="bow.login.title" /></h1> + <s:actionerror /> <s:form action="login"> <p> <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /><br /><br /> Modified: trunk/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -25,23 +25,23 @@ <%@page import="org.chorem.bow.TokenActions" %> <% - TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); - String token = ""; - if (tokenActions != null) { - token = tokenActions.getPermanentToken(); - } - String url = request.getRequestURL().toString(); - int index = url.indexOf("permanentXml.jsp"); - url = url.substring(0, index); +TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); +String token = ""; +if (tokenActions != null) { + token = tokenActions.getPermanentToken(); +} +String url = request.getRequestURL().toString(); +int index = url.indexOf("permanentXml.jsp"); +url = url.substring(0, index - 4); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> - <ShortName>bowPermanentSearchEngine</ShortName> + <ShortName>Bow (permanent)</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&searchLine={searchTerms}" /> - <moz:SearchForm><%=url%>bow</moz:SearchForm> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&searchLine={searchTerms}" /> + <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -43,11 +43,8 @@ <div class="menu clearfix"> <h2><s:text name="bow.preferences.title" /></h2> </div> - <s:url id="changePreferences" action="preferences"> - <s:param name="update">1</s:param> - </s:url> <s:actionerror /> - <s:form action="%{changePreferences}"> + <s:form action="preferences"> <div class="formFrame"> <h3><s:text name="bow.preferences.userInfo" /></h3> <p> @@ -67,6 +64,7 @@ <s:textfield key="bow.preferences.bookmarksHomePage" name="bookmarksHomePage" labelposition="top" /><br /> <s:textfield key="bow.preferences.searchEngineUrlSuggestions" name="searchEngineUrlSuggestions" labelposition="top" /><br /> <s:textfield key="bow.preferences.searchEngineUrlResults" name="searchEngineUrlResults" labelposition="top" /><br /> + <s:hidden name="update" value="1" /> <s:submit key="bow.preferences.submit" /> <br /><br /> <s:url id="home" action="home" /> @@ -98,7 +96,7 @@ <s:url id="deleteImport" action="deleteImport"> <s:param name="date"><%=dateSave%></s:param> </s:url> - <s:a cssClass="deleteImportButton" href="" onclick="deleteConfirmation('%{deleteImport}','%{#bookmarkImport!getCount}','<%=date%>'); return(false);"></s:a> + <a class="deleteImportButton" href="" onclick="deleteConfirmation('<s:property value="%{deleteImport}" />','<%=bookmarkImport.getCount()%>','<%=date%>'); return(false);"></a> </div> <% i++; Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/search.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -52,11 +52,7 @@ <body> <div class="menu clearfix"> <h2><s:text name="bow.search.title" /></h2> - <s:url id="order" action="order" escapeAmp="false"> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullText}" /></s:param> - </s:url> - <s:form action="%{order}"> + <s:form action="order"> <p> <label for="type"><s:text name="bow.search.orderby" /></label> <select id="type" name="type"> @@ -76,6 +72,8 @@ </s:url> <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> </s:if> + <s:hidden name="searchLine" value="%{#searchLine}" /> + <s:hidden name="fullTextLine" value="%{#fullText}" /> </p> </s:form> </div> Modified: trunk/src/main/webapp/jsp/suggestions.jsp =================================================================== --- trunk/src/main/webapp/jsp/suggestions.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/suggestions.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -27,18 +27,17 @@ <%@page import="java.util.Iterator" %> <%@page import="org.nuiton.wikitty.FacetTopic" %> - <% - OpenSearchActions osa = (OpenSearchActions) request.getAttribute("openSearchAction"); - if (osa != null) { - String[] word = osa.getSearch(); - if (word != null) { - List<FacetTopic> suggestions = osa.getSuggestionList(); - if (suggestions != null) { +OpenSearchActions osa = (OpenSearchActions) request.getAttribute("openSearchAction"); +if (osa != null) { + String[] word = osa.getSearch(); + if (word != null) { + List<FacetTopic> suggestions = osa.getSuggestionList(); + if (suggestions != null) { + %> + <%=osa.getJsonResult()%> + <% + } + } +} %> -<%=osa.getJsonResult()%> -<% - } - } - } -%> Modified: trunk/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-01-27 15:51:12 UTC (rev 178) +++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-01-28 17:28:36 UTC (rev 179) @@ -25,23 +25,23 @@ <%@page import="org.chorem.bow.TokenActions" %> <% - TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); - String token = ""; - if (tokenActions != null) { - token = tokenActions.getTemporaryToken(); - } - String url = request.getRequestURL().toString(); - int index = url.indexOf("temporaryXml.jsp"); - url = url.substring(0, index); +TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); +String token = ""; +if (tokenActions != null) { + token = tokenActions.getTemporaryToken(); +} +String url = request.getRequestURL().toString(); +int index = url.indexOf("temporaryXml.jsp"); +url = url.substring(0, index - 4); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> - <ShortName>bowTemporarySearchEngine</ShortName> + <ShortName>Bow (temporary)</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>bow?action=openSearchResult&token=<%=token%>&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>bow?action=openSearchSuggestion&token=<%=token%>&search={searchTerms}" /> - <moz:SearchForm><%=url%>bow</moz:SearchForm> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&search={searchTerms}" /> + <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription> Added: trunk/src/main/webapp/template/xhtml/file.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/file.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/file.ftl 2011-01-28 17:28:36 UTC (rev 179) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: file.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/file.ftl" />

1 0

r178 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action webapp webapp/WEB-INF/decorators webapp/css webapp/jsp webapp/jsp/inc webapp/template webapp/template/xhtml
by vbriand＠users.chorem.org Jan. 27, 2011

Jan. 27, 2011

Author: vbriand Date: 2011-01-27 16:51:12 +0100 (Thu, 27 Jan 2011) New Revision: 178 Url: http://chorem.org/repositories/revision/bow/178 Log: Overloaded the default template of Struts2 ("xhtml") in order to remove the generated "<table>"s Added: trunk/src/main/webapp/template/ trunk/src/main/webapp/template/xhtml/ trunk/src/main/webapp/template/xhtml/controlheader-core.ftl trunk/src/main/webapp/template/xhtml/form-close.ftl trunk/src/main/webapp/template/xhtml/form.ftl trunk/src/main/webapp/template/xhtml/password.ftl trunk/src/main/webapp/template/xhtml/submit-close.ftl trunk/src/main/webapp/template/xhtml/submit.ftl trunk/src/main/webapp/template/xhtml/text.ftl Modified: trunk/src/main/java/org/chorem/bow/ trunk/src/main/java/org/chorem/bow/action/LoginAction.java trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/css/global.css trunk/src/main/webapp/jsp/inc/rightMenu.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/preferences.jsp Property changes on: trunk/src/main/java/org/chorem/bow ___________________________________________________________________ Added: svn:ignore + .ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/action/LoginAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/LoginAction.java 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/java/org/chorem/bow/action/LoginAction.java 2011-01-27 15:51:12 UTC (rev 178) @@ -90,15 +90,15 @@ } return null; } - + public String execute() { if (email != null) { email = email.trim(); - + if (password != null) { String md5 = StringUtil.encodeMD5(password); User user; - + try { user = checkLogin(email, md5); } catch (NoSuchAlgorithmException e) { Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-27 15:51:12 UTC (rev 178) @@ -8,6 +8,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Bow : <decorator:title default="Bow" /></title> + <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmarks on the web" /> <s:url id="temporaryXml" action="temporaryXml" /> @@ -20,7 +21,6 @@ <link href="${globalCSS}" rel="stylesheet" type="text/css" media="all" /> <s:url id="bookmarkJS" value="/js/bookmark.js" /> <script type="text/javascript" src="${bookmarkJS}"></script> - <decorator:head /> </head> <body id="page-home"> <div id="wrap"> Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/css/bookmark.css 2011-01-27 15:51:12 UTC (rev 178) @@ -488,10 +488,4 @@ #bookmarkForm label{ margin-top:12px; font-style:normal; -} - -#bookmarkForm input[type="text"]{ - width:100%; - margin-top:10px; - margin-left:10px; } \ No newline at end of file Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/css/connexion.css 2011-01-27 15:51:12 UTC (rev 178) @@ -52,7 +52,7 @@ margin-top: 25px; } -#page { +#page{ width:100%; margin:0 auto; clear:both; @@ -78,12 +78,12 @@ color:#804561; width:225px; position:relative; - margin:15px 15px -20px 0px; + margin:15px 15px 10px 0px; } -#formFrame form table td label{ +#formFrame form p{ color:#804561; - font-size:16px; + font-size:14px; font-weight:bold; padding:10px 0; } @@ -137,9 +137,9 @@ } #forgotPassword{ - margin-top:50px; + margin-top:30px; } #register{ - margin-top:35px; + margin-top:20px; } \ No newline at end of file Modified: trunk/src/main/webapp/css/global.css =================================================================== --- trunk/src/main/webapp/css/global.css 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/css/global.css 2011-01-27 15:51:12 UTC (rev 178) @@ -108,3 +108,9 @@ text-align:center; line-height:50px; } + +.errorMessage{ + font-weight:normal; + font-size:12px; + color:red; +} \ No newline at end of file Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-27 15:51:12 UTC (rev 178) @@ -87,10 +87,10 @@ <div id="add" class="clearfix"> <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> <s:form id="bookmarkForm" action="%{#request.formAction}"> - <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /> - <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /> - <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" labelSeparator="" /> + <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /><br /> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br /> + <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /><br /> + <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" labelSeparator="" /><br /><br /> <s:submit key="bow.rightMenu.bookmark.submit" /> </s:form> </div> @@ -106,8 +106,7 @@ <div class="recherche"> <s:form action="search"> <div class="input"> - <label for="searchLine"><s:text name="bow.rightMenu.search" /></label> - <input type="text" name="searchLine" id="searchLine" /> + <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> <s:submit key="bow.rightMenu.find.submit" theme="simple" /> </div> </s:form> @@ -115,8 +114,7 @@ <div class="recherche"> <s:form action="fullText"> <div class="input"> - <label for="fullTextLine"><s:text name="bow.rightMenu.fullTextSearch" /></label> - <input type="text" name="fullTextLine" id="fullTextLine" /> + <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> <s:submit key="bow.rightMenu.find.submit" theme="simple" /> </div> </s:form> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/jsp/login.jsp 2011-01-27 15:51:12 UTC (rev 178) @@ -17,9 +17,11 @@ <div id="formFrame"> <h1><s:text name="bow.login.title" /></h1> <s:form action="login"> + <p> <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /><br /><br /> <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /><br /><br /> <s:submit key="bow.login.submit" /> + </p> </s:form> <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-01-27 09:31:16 UTC (rev 177) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-01-27 15:51:12 UTC (rev 178) @@ -51,22 +51,22 @@ <div class="formFrame"> <h3><s:text name="bow.preferences.userInfo" /></h3> <p> - <s:textfield key="bow.login.email" name="email" cssStyle="margin-bottom: 2px" /><br /><br /> - <s:password key="bow.preferences.currentPassword" name="currentPassword" /> - <s:password key="bow.preferences.newPassword" name="newPassword" /> - <s:password key="bow.preferences.confirmNewPassword" name="confirmNewPassword" /> - <s:url id="generateToken" action="generateToken" /> - <s:a href="%{generateToken}" id="regenPermToken"><s:text name="bow.preferences.regenPermToken" /></s:a> + <s:textfield key="bow.login.email" name="email" labelposition="top" /><br /> + <s:password key="bow.preferences.currentPassword" name="currentPassword" labelposition="top" /><br /> + <s:password key="bow.preferences.newPassword" name="newPassword" labelposition="top" /><br /> + <s:password key="bow.preferences.confirmNewPassword" name="confirmNewPassword" labelposition="top" /><br /> + <s:url id="regenPermToken" action="regenPermToken" /> + <s:a href="%{regenPermToken}" id="regenPermToken"><s:text name="bow.preferences.regenPermToken" /></s:a> </p> </div> <div class="formFrame"> <h3><s:text name="bow.preferences.siteLook" /></h3> <p> - <s:textfield key="bow.preferences.colors" name="colors" /><br /> - <s:textfield key="bow.preferences.tagsNb" name="tagsNb" /><br /> - <s:textfield key="bow.preferences.bookmarksHomePage" name="bookmarksHomePage" /><br /> - <s:textfield key="bow.preferences.searchEngineUrlSuggestions" name="searchEngineUrlSuggestions" /><br /> - <s:textfield key="bow.preferences.searchEngineUrlResults" name="searchEngineUrlResults" /> + <s:textfield key="bow.preferences.colors" name="colors" labelposition="top" /><br /> + <s:textfield key="bow.preferences.tagsNb" name="tagsNb" labelposition="top" /><br /> + <s:textfield key="bow.preferences.bookmarksHomePage" name="bookmarksHomePage" labelposition="top" /><br /> + <s:textfield key="bow.preferences.searchEngineUrlSuggestions" name="searchEngineUrlSuggestions" labelposition="top" /><br /> + <s:textfield key="bow.preferences.searchEngineUrlResults" name="searchEngineUrlResults" labelposition="top" /><br /> <s:submit key="bow.preferences.submit" /> <br /><br /> <s:url id="home" action="home" /> Added: trunk/src/main/webapp/template/xhtml/controlheader-core.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/controlheader-core.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/controlheader-core.ftl 2011-01-27 15:51:12 UTC (rev 178) @@ -0,0 +1,66 @@ +<#-- +/* + * $Id: controlheader-core.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#-- + Only show message if errors are available. + This will be done if ActionSupport is used. +--> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<#if hasFieldErrors> +<#list fieldErrors[parameters.name] as error> + + <span class="errorMessage">${error?html}</span><#t/> + <#if parameters.labelposition?default("") == 'top'> + <br /> + </#if> + +</#list> +</#if> +<#-- + if the label position is top, + then give the label it's own row in the table +--> +<#if parameters.label??> + <label <#t/> +<#if parameters.id??> + for="${parameters.id?html}" <#t/> +</#if> +<#if hasFieldErrors> + class="errorLabel"<#t/> +<#else> + class="label"<#t/> +</#if> + ><#t/> +<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'> + <span class="required">*</span><#t/> +</#if> +${parameters.label?html}<#t/> +<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'> + <span class="required">*</span><#t/> +</#if> +${parameters.labelseparator?default(":")?html}<#t/> +<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> +</label><#t/> +</#if> +<#if parameters.labelposition?default("") == 'top'> + <br /> +</#if> \ No newline at end of file Added: trunk/src/main/webapp/template/xhtml/form-close.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/form-close.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/form-close.ftl 2011-01-27 15:51:12 UTC (rev 178) @@ -0,0 +1,34 @@ +<#-- +/* + * $Id: form-close.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/simple/form-close.ftl" /> +<#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" /> +<#if parameters.focusElement?if_exists != ""> +<script type="text/javascript"> + StrutsUtils.addOnLoad(function() { + var element = document.getElementById("${parameters.focusElement?html}"); + if(element) { + element.focus(); + } + }); +</script> +</#if> Added: trunk/src/main/webapp/template/xhtml/form.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/form.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/form.ftl 2011-01-27 15:51:12 UTC (rev 178) @@ -0,0 +1,32 @@ +<#-- +/* + * $Id: form.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/form-validate.ftl" /> +<#include "/${parameters.templateDir}/simple/form-common.ftl" /> +<#if (parameters.validate?default(false))> + onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}" +<#else> + <#if parameters.onreset??> + onreset="${parameters.onreset?html}" + </#if> +</#if> +> Added: trunk/src/main/webapp/template/xhtml/password.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/password.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/password.ftl 2011-01-27 15:51:12 UTC (rev 178) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: password.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/password.ftl" /> Added: trunk/src/main/webapp/template/xhtml/submit-close.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/submit-close.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/submit-close.ftl 2011-01-27 15:51:12 UTC (rev 178) @@ -0,0 +1 @@ +<#include "/${parameters.templateDir}/simple/submit-close.ftl" /> Added: trunk/src/main/webapp/template/xhtml/submit.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/submit.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/submit.ftl 2011-01-27 15:51:12 UTC (rev 178) @@ -0,0 +1,23 @@ +<#-- +/* + * $Id: submit.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/simple/submit.ftl" /> Added: trunk/src/main/webapp/template/xhtml/text.ftl =================================================================== --- trunk/src/main/webapp/template/xhtml/text.ftl (rev 0) +++ trunk/src/main/webapp/template/xhtml/text.ftl 2011-01-27 15:51:12 UTC (rev 178) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: text.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/text.ftl" />

1 0

r177 - trunk
by tchemit＠users.chorem.org Jan. 27, 2011

Jan. 27, 2011

Author: tchemit Date: 2011-01-27 10:31:16 +0100 (Thu, 27 Jan 2011) New Revision: 177 Url: http://chorem.org/repositories/revision/bow/177 Log: Update mavenpom4redmine to 2.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-21 17:08:05 UTC (rev 176) +++ trunk/pom.xml 2011-01-27 09:31:16 UTC (rev 177) @@ -1,7 +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> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> + <version>2.4.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r176 - in trunk/src/main/webapp: css jsp/inc
by vbriand＠users.chorem.org Jan. 21, 2011

Jan. 21, 2011

Author: vbriand Date: 2011-01-21 18:08:05 +0100 (Fri, 21 Jan 2011) New Revision: 176 Url: http://chorem.org/repositories/revision/bow/176 Log: Fixed the design on the home page Modified: trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2011-01-21 14:54:13 UTC (rev 175) +++ trunk/src/main/webapp/css/bookmark.css 2011-01-21 17:08:05 UTC (rev 176) @@ -197,7 +197,7 @@ padding-left: 5px; } -#logout{ +#logoutDiv{ float:right; position:relative; right:67%; @@ -206,7 +206,7 @@ height:100px; } -#logout a.help{ +#logoutDiv a.help{ background:transparent url('/bow/img/aide.jpg') no-repeat scroll 0 0; display:block; height:34px; @@ -217,7 +217,7 @@ float:left; } -#logout form input{ +#logoutDiv form input{ background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0; border:medium none; color:#9C7186; @@ -280,7 +280,9 @@ } #colonneD #extensions .extensionIcon { - float: left; + float:left; + border:0 none; + margin-right:10px; } #colonneD #extensions .extensionName { @@ -472,3 +474,24 @@ margin-left:25px; margin-right:11px; } + +.input label{ + color:#9edcf8; + font-size:20px; + font-weight:normal; + font-style:normal; + float:left; + margin-bottom:20px; + width:100%; +} + +#bookmarkForm label{ + margin-top:12px; + font-style:normal; +} + +#bookmarkForm input[type="text"]{ + width:100%; + margin-top:10px; + margin-left:10px; +} \ No newline at end of file Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2011-01-21 14:54:13 UTC (rev 175) +++ trunk/src/main/webapp/css/connexion.css 2011-01-21 17:08:05 UTC (rev 176) @@ -142,4 +142,4 @@ #register{ margin-top:35px; -} +} \ No newline at end of file Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-21 14:54:13 UTC (rev 175) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-21 17:08:05 UTC (rev 176) @@ -53,14 +53,16 @@ } if ((String)request.getAttribute("formAction") == null) - request.setAttribute("formAction", "/bow/addUrl.action"); + request.setAttribute("formAction", "/addUrl.action"); %> -<div id="logout" xmlns="http://www.w3.org/1999/xhtml" +<div id="logoutDiv" xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <s:form action="logout"> - <s:submit key="bow.rightMenu.logout" /> + <s:form action="logout" theme="simple"> + <div class="input"> + <s:submit key="bow.rightMenu.logout" /> + </div> </s:form> <a href="http://maven-site.chorem.org/bow/" class="help" onclick="window.open(this.href); return false;"><s:text name="bow.rightMenu.help" /></a> </div> @@ -85,10 +87,10 @@ <div id="add" class="clearfix"> <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> <s:form id="bookmarkForm" action="%{#request.formAction}"> - <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" /> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" /> - <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" /> - <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" /> + <s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /> + <s:textfield key="bow.rightMenu.bookmark.name" name="name" value="%{#request.name}" labelSeparator="" /> + <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" value="%{#request.tags}" labelSeparator="" /> <s:submit key="bow.rightMenu.bookmark.submit" /> </s:form> </div> @@ -102,24 +104,30 @@ <% } %> </div> <div class="recherche"> - <h2><s:text name="bow.rightMenu.search" /></h2> <s:form action="search"> - <s:textfield name="searchLine" /> - <s:submit key="bow.rightMenu.find.submit" /> + <div class="input"> + <label for="searchLine"><s:text name="bow.rightMenu.search" /></label> + <input type="text" name="searchLine" id="searchLine" /> + <s:submit key="bow.rightMenu.find.submit" theme="simple" /> + </div> </s:form> </div> <div class="recherche"> - <h2><s:text name="bow.rightMenu.fullTextSearch" /></h2> <s:form action="fullText"> - <s:textfield name="fullTextLine" /> - <s:submit key="bow.rightMenu.find.submit" /> + <div class="input"> + <label for="fullTextLine"><s:text name="bow.rightMenu.fullTextSearch" /></label> + <input type="text" name="fullTextLine" id="fullTextLine" /> + <s:submit key="bow.rightMenu.find.submit" theme="simple" /> + </div> </s:form> </div> <div id="import"> - <h2><s:text name="bow.rightMenu.importBookmarks" /></h2> <s:form action="importBookmarks" method="post" enctype="multipart/form-data"> - <s:file name="upfile" size="15%" /><br /> - <s:submit key="bow.rightMenu.import.submit" /> + <div class="input"> + <label for="fileImport"><s:text name="bow.rightMenu.importBookmarks" /></label> + <input type="file" size="15%" id="upfile" name="upfile" /><br /> + <s:submit key="bow.rightMenu.import.submit" theme="simple" /> + </div> </s:form> <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a> </div>

1 0

r175 - in trunk/src/main: resources/i18n webapp/css webapp/jsp
by vbriand＠users.chorem.org Jan. 21, 2011

Jan. 21, 2011

Author: vbriand Date: 2011-01-21 15:54:13 +0100 (Fri, 21 Jan 2011) New Revision: 175 Url: http://chorem.org/repositories/revision/bow/175 Log: Fixed the design on the login, forgotPassword and register pages which was broken because Struts2 generates ugly "<table>"s everywhere Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/jsp/forgotPassword.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/register.jsp Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-21 14:54:13 UTC (rev 175) @@ -28,7 +28,7 @@ bow.login.email.wrongformat=Votre adresse email est invalide bow.login.password=Mot de passe bow.login.password.required=Veuillez entrer votre mot de passe -bow.login.repeatPassword=Retapez votre mot de passe +bow.login.repeatPassword=Confirmation bow.login.repeatPassword.required=Veuillez retaper votre mot de passe bow.login.submit=Connexion bow.login.title=Connexion Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/css/connexion.css 2011-01-21 14:54:13 UTC (rev 175) @@ -78,10 +78,10 @@ color:#804561; width:225px; position:relative; - margin:15px auto; + margin:15px 15px -20px 0px; } -#formFrame form p{ +#formFrame form table td label{ color:#804561; font-size:16px; font-weight:bold; @@ -101,7 +101,7 @@ font-size: 12px; } -#formFrame #register{ +#formFrame #registerLink, #formFrame #loginLink{ bottom:50px; font-size:14px; } @@ -117,7 +117,7 @@ font-size: 10px; } -input[type="submit"] { +input[type="submit"]{ float:right; margin-top:20px; background:url('/bow/img/fdboutonV.jpg') repeat-x; @@ -127,5 +127,19 @@ font-weight:bold; border:none; width:auto; - padding: 2px; + padding:2px; } + +#formFrame input[type="submit"]{ + position:absolute; + bottom:40px; + right:30px; +} + +#forgotPassword{ + margin-top:50px; +} + +#register{ + margin-top:35px; +} Modified: trunk/src/main/webapp/jsp/forgotPassword.jsp =================================================================== --- trunk/src/main/webapp/jsp/forgotPassword.jsp 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/jsp/forgotPassword.jsp 2011-01-21 14:54:13 UTC (rev 175) @@ -40,11 +40,11 @@ <h1><s:text name="bow.forgotpwd.title" /></h1> <s:form action="forgotPassword"> <p> - <s:textfield key="bow.login.email" name="email" /> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> <s:submit key="bow.forgotpwd.submit" /> </p> </s:form> - <s:a action="login_input"><s:text name="bow.login.title" /></s:a> + <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> </div> </div> </body> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/jsp/login.jsp 2011-01-21 14:54:13 UTC (rev 175) @@ -13,25 +13,17 @@ <s:head /> </head> <body> - <div id="content"> - <div id="formFrame"> - <h1><s:text name="bow.login.title" /></h1> - <s:form action="login"> - <p> -  - - <s:textfield key="bow.login.email" name="email" /><br /><br /> - <s:password key="bow.login.password" name="password" /><br /><br /> - <s:submit key="bow.login.submit" /> - </p> - </s:form> - <s:a action="register_input"><s:text name="bow.register.title" /></s:a><br /> - <s:a action="forgotPassword_input"><s:text name="bow.forgotpwd.title" /></s:a> - </div> - </div> + <div id="content"> + <div id="formFrame"> + <h1><s:text name="bow.login.title" /></h1> + <s:form action="login"> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /><br /><br /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /><br /><br /> + <s:submit key="bow.login.submit" /> + </s:form> + <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> + <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> + </div> + </div> </body> </html> Modified: trunk/src/main/webapp/jsp/register.jsp =================================================================== --- trunk/src/main/webapp/jsp/register.jsp 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/jsp/register.jsp 2011-01-21 14:54:13 UTC (rev 175) @@ -40,13 +40,13 @@ <h1><s:text name="bow.register.title" /></h1> <s:form action="register"> <p> - <s:textfield key="bow.login.email" name="email" /> - <s:password key="bow.login.password" name="password" /> - <s:password key="bow.login.repeatPassword" name="repeatPassword" /> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> <s:submit key="bow.register.submit" /> </p> </s:form> - <s:a action="login_input"><s:text name="bow.login.title" /></s:a> + <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> </div> </div> </body>

1 0

r174 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action resources resources/i18n webapp/WEB-INF/decorators webapp/css webapp/jsp webapp/jsp/inc
by vbriand＠users.chorem.org Jan. 21, 2011

Jan. 21, 2011

Author: vbriand Date: 2011-01-21 12:22:45 +0100 (Fri, 21 Jan 2011) New Revision: 174 Url: http://chorem.org/repositories/revision/bow/174 Log: We can't change our email address to the address of someone else anymore Modified: trunk/src/main/java/org/chorem/bow/BowInit.java trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/src/main/resources/i18n/bow_en_GB.properties trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/jsp/inc/footer.jsp trunk/src/main/webapp/jsp/inc/header.jsp trunk/src/main/webapp/jsp/inc/rightMenu.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/preferences.jsp Modified: trunk/src/main/java/org/chorem/bow/BowInit.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowInit.java 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/java/org/chorem/bow/BowInit.java 2011-01-21 11:22:45 UTC (rev 174) @@ -64,6 +64,7 @@ static public void initHomePage(HttpServletRequest request, User user) { WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = BowBookmark.getBookmarkListCriteriaByUser(user, null); + if (criteria != null) { Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); //Selects all bookmarks by user Modified: trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-01-21 11:22:45 UTC (rev 174) @@ -13,8 +13,10 @@ import org.chorem.bow.Preference; import org.chorem.bow.User; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.FacetTopic; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.search.Search; public class PreferencesAction extends BowBaseAction implements SessionAware, ServletRequestAware { private static final long serialVersionUID = -58341106356599721L; @@ -236,26 +238,32 @@ if (user != null) { setBookmarksImportDate(BowBookmark.getBookmarksByImportDate(request, user)); - if (update != null) { + if (update != null) { //If the user submitted the form WikittyProxy proxy = BowProxy.getInstance(); Preference preference = changePreference(); proxy.store(preference); - User newUser = proxy.restore(User.class, (user).getWikittyId()); + User newUser = proxy.restore(User.class, user.getWikittyId()); + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); - try { - newUser = changeUser(newUser); - } catch (NoSuchAlgorithmException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + if (proxy.findByCriteria(User.class, criteria) == null) { //If this email address isn't already used by someone else + try { + newUser = changeUser(newUser); + } catch (NoSuchAlgorithmException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + newUser = proxy.store(newUser); + session.put("user", newUser); + + preference = proxy.restore(Preference.class, newUser.getWikittyId()); + session.put("preference", preference); + return "update"; } - newUser = proxy.store(newUser); - session.put("user", newUser); - - preference = proxy.restore(Preference.class, newUser.getWikittyId()); - session.put("preference", preference); - return "update"; - } else { + setEmail(user.getEmail()); + addActionError(getText("bow.preferences.emailAldyExists")); + return ERROR; + } else { //If the user didn't submit the form, the fields are filled with the current preferences values Preference preference = (Preference)session.get("preference"); setEmail(user.getEmail()); Modified: trunk/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-21 11:22:45 UTC (rev 174) @@ -32,21 +32,22 @@ bow.login.repeatPassword.required=Please repeat your password bow.login.submit=Login bow.login.title=Login -bow.preferences.bookmarksHomePage= -bow.preferences.colors= -bow.preferences.confirmNewPassword= -bow.preferences.currentPassword= -bow.preferences.importedBookmarks= -bow.preferences.newPassword= -bow.preferences.noImportedBookmarks= -bow.preferences.regenPermToken= -bow.preferences.searchEngineUrlResults= -bow.preferences.searchEngineUrlSuggestions= -bow.preferences.siteLook= -bow.preferences.submit= -bow.preferences.tagsNb= +bow.preferences.bookmarksHomePage=Number of bookmarks displayed on the home page +bow.preferences.colors=Site color +bow.preferences.confirmNewPassword=Confirm new password +bow.preferences.currentPassword=Current password +bow.preferences.emailAldyExists=This email address is already linked with another account +bow.preferences.importedBookmarks=Imported bookmarks +bow.preferences.newPassword=New password +bow.preferences.noImportedBookmarks=No imported bookmarks +bow.preferences.regenPermToken=Regenerate permanent token +bow.preferences.searchEngineUrlResults=Search Engine URL Results ({searchTerms} will be replaced by your text) +bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions +bow.preferences.siteLook=Site look +bow.preferences.submit=Change +bow.preferences.tagsNb=Number of tags displayed in the tag cloud bow.preferences.title=Preferences -bow.preferences.userInfo= +bow.preferences.userInfo=User information bow.register.emailAldyUsed=This email address is already used bow.register.invalidLogin= bow.register.mailEmail= @@ -70,10 +71,13 @@ bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Find bow.rightMenu.fullTextSearch=Full text search +bow.rightMenu.help=Help bow.rightMenu.import.submit=Import bow.rightMenu.importBookmarks=Import bookmarks bow.rightMenu.logout=Logout bow.rightMenu.search=Search bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id +bow.search.orderby=Order by +bow.search.submit=Search bow.search.title=Search Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-21 11:22:45 UTC (rev 174) @@ -32,18 +32,19 @@ bow.login.repeatPassword.required=Veuillez retaper votre mot de passe bow.login.submit=Connexion bow.login.title=Connexion -bow.preferences.bookmarksHomePage= -bow.preferences.colors= -bow.preferences.confirmNewPassword= -bow.preferences.currentPassword= -bow.preferences.importedBookmarks= -bow.preferences.newPassword= -bow.preferences.noImportedBookmarks= -bow.preferences.regenPermToken= +bow.preferences.bookmarksHomePage=Nombre de marque-pages affich\u00E9s +bow.preferences.colors=Couleur du site +bow.preferences.confirmNewPassword=Confirmez votre mot de passe +bow.preferences.currentPassword=Mot de passe actuel +bow.preferences.emailAldyExists=Cette addresse email est d\u00E9j\u00E0 utilis\u00E9e par un autre compte +bow.preferences.importedBookmarks=Marque-pages import\u00E9s +bow.preferences.newPassword=Nouveau mot de passe +bow.preferences.noImportedBookmarks=Aucun marque-page import\u00E9 +bow.preferences.regenPermToken=Reg\u00E9n\u00E9rer le token permanent bow.preferences.searchEngineUrlResults= bow.preferences.searchEngineUrlSuggestions= bow.preferences.siteLook= -bow.preferences.submit= +bow.preferences.submit=Changer bow.preferences.tagsNb= bow.preferences.title=Pr\u00E9f\u00E9rences bow.preferences.userInfo= @@ -70,10 +71,13 @@ bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Rechercher bow.rightMenu.fullTextSearch=Recherche 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.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session +bow.search.orderby=Trier par +bow.search.submit=Rechercher bow.search.title=Recherche Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/resources/struts.xml 2011-01-21 11:22:45 UTC (rev 174) @@ -98,6 +98,7 @@ <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> <result name="login" type="redirectAction">login_input</result> <result name="update" type="redirectAction">preferences</result> + <result name="error">/jsp/preferences.jsp</result> <result>/jsp/preferences.jsp</result> </action> <action name="admin"> Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-21 11:22:45 UTC (rev 174) @@ -12,6 +12,8 @@ <meta name="description" content="Bookmarks on the web" /> <s:url id="temporaryXml" action="temporaryXml" /> <s:url id="permanentXml" action="permanentXml" /> + <s:url id="favicon" value="/img/favicon.png" /> + <link rel="icon" type="image/png" href="${favicon}" /> <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="${temporaryXml}" /> <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="${permanentXml}" /> <s:url id="globalCSS" value="/css/global.css" /> Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/css/bookmark.css 2011-01-21 11:22:45 UTC (rev 174) @@ -393,8 +393,8 @@ padding:15px 0; } -.formFrame p input[type="text"], -.formFrame p input[type="password"]{ +.formFrame p input[type="text"], td input[type="text"], +.formFrame p input[type="password"], td input[type="password"]{ width:225px; } @@ -427,7 +427,7 @@ font-size:10px; } -.formFrame p input{ +.formFrame p input, td input{ margin-bottom:2px; } Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/css/connexion.css 2011-01-21 11:22:45 UTC (rev 174) @@ -81,7 +81,7 @@ margin:15px auto; } -#formFrame form div{ +#formFrame form p{ color:#804561; font-size:16px; font-weight:bold; Modified: trunk/src/main/webapp/jsp/inc/footer.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/footer.jsp 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/jsp/inc/footer.jsp 2011-01-21 11:22:45 UTC (rev 174) @@ -1,3 +1,6 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> + <div id="footer"> <p> <a shape="rect" href="">bow</a> @@ -6,6 +9,14 @@ <span title="Copyright">©2010</span> <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - <a shape="rect" href="http://www.chorem.org/projects/bow/issues">Rapport de bug</a> - - <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a> + <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users">Support utilisateur</a> - + <s:url id="localeEN"> + <s:param name="request_locale">en_GB</s:param> + </s:url> + <s:url id="localeFR"> + <s:param name="request_locale">fr_FR</s:param> + </s:url> + <s:a href="%{localeEN}"><s:text name="bow.action.locale.english" /></s:a> - + <s:a href="%{localeFR}"><s:text name="bow.action.locale.french" /></s:a> </p> </div> \ No newline at end of file Modified: trunk/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/header.jsp 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/jsp/inc/header.jsp 2011-01-21 11:22:45 UTC (rev 174) @@ -1,4 +1,10 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> <div id="header"> - <a class="logo" href="/bow/">bow</a> + <s:if test="#session.user"> + <a class="logo" href="<s:property value='%{#session.bowUrl}' />home.action?token=<s:property value='%{#session.tokenActions.getPermanentToken()}' />">bow</a> + </s:if> + <s:else> + <a class="logo" href="">bow</a> + </s:else> </div> \ No newline at end of file Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-21 11:22:45 UTC (rev 174) @@ -25,13 +25,7 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BookmarkActions" %> -<%@page import="java.text.SimpleDateFormat" %> -<%@page import="java.util.Iterator" %> -<%@page import="java.util.Set" %> -<%@page import="java.util.ArrayList" %> -<%@page import="java.util.List" %> <%@page import="org.chorem.bow.TokenActions" %> -<%@page import="org.nuiton.wikitty.FacetTopic" %> <%@page import="org.chorem.bow.Bookmark" %> <%@page import="org.chorem.bow.BowConfig" %> <%@page import="org.chorem.bow.Preference" %> @@ -43,9 +37,6 @@ admin = false; } -String temporaryToken = tokenActions.getTemporaryToken(); -String permanentToken = tokenActions.getPermanentToken(); - int nbTags = 100; Preference preference = (Preference)session.getAttribute("preference"); if (preference != null) { @@ -61,23 +52,8 @@ fullText = bookmarkActions.getFullTextLine(); } -String formLink = (String)request.getAttribute("link"); -String formName = (String)request.getAttribute("name"); -String formTags = (String)request.getAttribute("tags"); -String formAlias = (String)request.getAttribute("alias"); -String formAction = (String)request.getAttribute("formAction"); - -if (formLink == null) - formLink = "URL"; -if (formName == null) - formName = "name"; -if (formTags == null) - formTags = "tag1 tag2..."; -if (formAlias == null) - formAlias = "alias"; -if (formAction == null) +if ((String)request.getAttribute("formAction") == null) request.setAttribute("formAction", "/bow/addUrl.action"); - //formAction = "/bow/addUrl.action"; %> <div id="logout" xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -135,17 +111,13 @@ <div class="recherche"> <h2><s:text name="bow.rightMenu.fullTextSearch" /></h2> <s:form action="fullText"> - <% if (fullText != null) { %> - <s:textfield name="fullTextLine" value="" />  - <% } else { %> - <s:textfield name="fullTextLine" /> - <% } %> + <s:textfield name="fullTextLine" /> <s:submit key="bow.rightMenu.find.submit" /> </s:form> </div> <div id="import"> <h2><s:text name="bow.rightMenu.importBookmarks" /></h2> - <s:form action="importBookmarks" enctype="multipart/form-data"> + <s:form action="importBookmarks" method="post" enctype="multipart/form-data"> <s:file name="upfile" size="15%" /><br /> <s:submit key="bow.rightMenu.import.submit" /> </s:form> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/jsp/login.jsp 2011-01-21 11:22:45 UTC (rev 174) @@ -17,22 +17,18 @@ <div id="formFrame"> <h1><s:text name="bow.login.title" /></h1> <s:form action="login"> - <p> + <p> +  + <s:textfield key="bow.login.email" name="email" /><br /><br /> <s:password key="bow.login.password" name="password" /><br /><br /> <s:submit key="bow.login.submit" /> </p> </s:form> - <s:url id="localeEN" action="login_input"> - <s:param name="request_locale">en_GB</s:param> - </s:url> - <s:url id="localeFR" action="login_input"> - <s:param name="request_locale">fr_FR</s:param> - </s:url> - - <s:a href="%{localeEN}">English</s:a><br /> - <s:a href="%{localeFR}">French</s:a><br /> - <s:a action="register_input"><s:text name="bow.register.title" /></s:a><br /> <s:a action="forgotPassword_input"><s:text name="bow.forgotpwd.title" /></s:a> </div> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-01-14 14:25:43 UTC (rev 173) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-01-21 11:22:45 UTC (rev 174) @@ -46,11 +46,12 @@ <s:url id="changePreferences" action="preferences"> <s:param name="update">1</s:param> </s:url> + <s:actionerror /> <s:form action="%{changePreferences}"> <div class="formFrame"> <h3><s:text name="bow.preferences.userInfo" /></h3> <p> - <s:textfield key="bow.login.email" name="email" /><br /><br /> + <s:textfield key="bow.login.email" name="email" cssStyle="margin-bottom: 2px" /><br /><br /> <s:password key="bow.preferences.currentPassword" name="currentPassword" /> <s:password key="bow.preferences.newPassword" name="newPassword" /> <s:password key="bow.preferences.confirmNewPassword" name="confirmNewPassword" />

1 0