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

r223 - in trunk/src/main/webapp: WEB-INF/decorators jsp jsp/inc
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 16:12:31 +0100 (Fri, 25 Feb 2011) New Revision: 223 Url: http://chorem.org/repositories/revision/bow/223 Log: Bow is almost W3C compliant again. Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/jsp/error.jsp trunk/src/main/webapp/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/search.jsp Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow Modified: trunk/src/main/webapp/jsp/error.jsp =================================================================== --- trunk/src/main/webapp/jsp/error.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/jsp/error.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -76,7 +76,7 @@ <p class="tags"> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#request.bookmark.labels"> - <s:url var="deleteTag" action="deleteTag" escapeAmp="false"> + <s:url var="deleteTag" action="deleteTag"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> <s:param name="deleteTag"><s:property /></s:param> <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> @@ -88,7 +88,7 @@ </s:a> </s:if> <s:else> - <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration: none;" href="%{#deleteTag}"> + <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteTag}"> <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> </s:a> </s:else> Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/jsp/search.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow

1 0

r222 - in trunk/src/main/webapp/jsp: . inc
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 15:59:33 +0100 (Fri, 25 Feb 2011) New Revision: 222 Url: http://chorem.org/repositories/revision/bow/222 Log: The i18n plugin doesn't throw exceptions anymore on build (fixed anomaly #301). Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp trunk/src/main/webapp/jsp/permanentXml.jsp trunk/src/main/webapp/jsp/temporaryXml.jsp Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -1,4 +1,3 @@ -<%@page import="org.chorem.bow.BookmarkActions"%>  <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> +<%@page import="org.chorem.bow.BookmarkActions"%> -<s:if test="#request.bookmarkActions != null"> - <div id="nuage" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> +<div id="nuage" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <s:if test="#request.bookmarkActions != null"> <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}"> <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" /> </s:if> <s:else> - <s:set var="maxTags" value="#session.BowSession.preference.tags" /> + <s:set var="maxTags" value="#session.BowSession.preference.tags" /> </s:else> <s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}"> <s:url var="search" action="search" escapeAmp="true"> @@ -45,5 +45,5 @@  <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> - </div> -</s:if> \ No newline at end of file + </s:if> +</div> \ No newline at end of file Modified: trunk/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -1,4 +1,3 @@ -<%@page import="org.chorem.bow.BowConfig"%> <!-- #%L bow @@ -30,12 +29,15 @@ String url = BowConfig.getInstance().getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" - xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + xmlns:moz="http://www.mozilla.org/2006/browser/search/" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> <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%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> + <s:set var="token" value="#session.BowSession.getPermanentToken()" /> + <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-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -29,12 +29,15 @@ String url = BowConfig.getInstance().getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" - xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + xmlns:moz="http://www.mozilla.org/2006/browser/search/" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> <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%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&search={searchTerms}" /> + <s:set var="token" value="%{#session.BowSession.getTemporaryToken()}" /> + <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

r221 - trunk/src/main/webapp/jsp/inc
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 15:23:02 +0100 (Fri, 25 Feb 2011) New Revision: 221 Url: http://chorem.org/repositories/revision/bow/221 Log: Fixed the rightMenu.jsp page for i18n plugin. Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-25 14:11:36 UTC (rev 220) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-25 14:23:02 UTC (rev 221) @@ -49,8 +49,10 @@ <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><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='<%=bowUrl%>addUrl.action?token=<s:property value='#session.BowSession.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" /></a></li> - <li><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='<%=bowUrl%>addUrl.action?token=<s:property value='#session.BowSession.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" /></a></li> + <s:set var="permanentToken" value="#session.BowSession.getPermanentToken()" /> + <s:set var="temporaryToken" value="#session.BowSession.getTemporaryToken()" /> + <li><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='<%=bowUrl%>addUrl.action?token=${temporaryToken}&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" /></a></li> + <li><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='<%=bowUrl%>addUrl.action?token=${permanentToken}&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" /></a></li> </ul> <div id="extensions"> <h2><s:text name="bow.rightMenu.extensions" /></h2>

1 0

r220 - trunk/src/main/webapp/jsp
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 15:11:36 +0100 (Fri, 25 Feb 2011) New Revision: 220 Url: http://chorem.org/repositories/revision/bow/220 Log: Fixed the preferences.jsp page for i18n plugin. Modified: trunk/src/main/webapp/jsp/preferences.jsp Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-02-25 14:00:15 UTC (rev 219) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-02-25 14:11:36 UTC (rev 220) @@ -116,7 +116,8 @@ <s:url var="deleteImport" action="deleteImport"> <s:param name="date"><%=dateSave%></s:param> </s:url> - <a class="deleteImportButton" href="" onclick="deleteConfirmation('<s:property value="%{deleteImport}" />','<%=bookmarkImport.getCount()%>','<%=date%>'); return(false);"></a> + <s:set var="deleteImport" value="%{deleteImport}" /> + <a class="deleteImportButton" href="" onclick="deleteConfirmation('${deleteImport}','<%=bookmarkImport.getCount()%>','<%=date%>'); return(false);"></a> </div> <% i++;

1 0

r219 - in trunk/src/main/webapp: jsp/inc template/simple
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 15:00:15 +0100 (Fri, 25 Feb 2011) New Revision: 219 Url: http://chorem.org/repositories/revision/bow/219 Log: Added modified template of "<a>" tag. Fixed the bookmarks.jsp for i18n plugin. Added: trunk/src/main/webapp/template/simple/a-close.ftl Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 13:33:27 UTC (rev 218) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 14:00:15 UTC (rev 219) @@ -88,9 +88,9 @@ </s:a> </s:if> <s:else> - <a name="<s:property value='%{#wikittyId}' />" style="display:none; text-decoration: none;" href="<s:property value='%{#deleteTag}' />"> + <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration: none;" href="%{#deleteTag}"> <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </a> + </s:a> </s:else> <s:url var="search" action="search"> <s:param name="searchLine"><s:property /></s:param> Added: trunk/src/main/webapp/template/simple/a-close.ftl =================================================================== --- trunk/src/main/webapp/template/simple/a-close.ftl (rev 0) +++ trunk/src/main/webapp/template/simple/a-close.ftl 2011-02-25 14:00:15 UTC (rev 219) @@ -0,0 +1,48 @@ +<#-- +/* + * $Id: a-close.ftl 753015 2009-03-12 21:00:23Z 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. + */ +--> +<a<#rt/> +<#if parameters.id?if_exists != ""> + id="${parameters.id?html}"<#rt/> +</#if> +<#if parameters.href?if_exists != ""> + href="${parameters.href}"<#rt/> +</#if> +<#if parameters.tabindex??> + tabindex="${parameters.tabindex?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.name??> + name="${parameters.name?html}"<#rt/> +</#if> +<#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> +<#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> +<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" /> +>${parameters.body}</a>

1 0

r218 - trunk/src/main/webapp/jsp/inc
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 14:33:27 +0100 (Fri, 25 Feb 2011) New Revision: 218 Url: http://chorem.org/repositories/revision/bow/218 Log: Added missing Struts2 tags. The page header can now be parsed properly by the i18n plugin. Modified: trunk/src/main/webapp/jsp/inc/header.jsp Modified: trunk/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/header.jsp 2011-02-25 09:53:59 UTC (rev 217) +++ trunk/src/main/webapp/jsp/inc/header.jsp 2011-02-25 13:33:27 UTC (rev 218) @@ -26,16 +26,19 @@ <div id="header" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <s:if test="%{#session.BowSession.user != null}"> - <a class="logo" href="home.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />">bow</a> - </s:if> - <s:else> - <a class="logo" href="home.action">bow</a> - </s:else> - <span id="actionmessageHeader"> - <s:actionmessage /> - </span> - <span id="actionerrorHeader"> - <s:actionerror /> - </span> + <s:if test="%{#session.BowSession.user != null}"> + <s:url var="homeToken" action="home"> + <s:param name="token"><s:property value="%{#session.BowSession.getPermanentToken()}" /></s:param> + </s:url> + <s:a cssClass="logo" href="%{homeToken}">bow</s:a> + </s:if> + <s:else> + <s:a cssClass="logo" action="home">bow</s:a> + </s:else> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> </div> \ No newline at end of file

1 0

r217 - in trunk/src/main: java/org/chorem/bow resources/i18n
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 10:53:59 +0100 (Fri, 25 Feb 2011) New Revision: 217 Url: http://chorem.org/repositories/revision/bow/217 Log: The token is now generated by UUID Modified: trunk/src/main/java/org/chorem/bow/BowUtils.java trunk/src/main/resources/i18n/bow_fr_FR.properties Modified: trunk/src/main/java/org/chorem/bow/BowUtils.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-25 09:15:39 UTC (rev 216) +++ trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-25 09:53:59 UTC (rev 217) @@ -23,6 +23,7 @@ */ package org.chorem.bow; +import java.util.UUID; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.WikittyProxy; @@ -33,15 +34,25 @@ private BowUtils() { } + /** + * Generates a random token + * + * @return the generated token + */ static public String generateToken() { - Double rand = Math.random() * 100000000; - int res = (int) Math.abs(rand); // generate a token between 0 and 100 000 000 - String tokenGenerated = String.valueOf(res); + UUID uuid = UUID.randomUUID(); + String tokenGenerated = uuid.toString(); tokenGenerated = StringUtil.encodeMD5(tokenGenerated); // encode the token in MD5 - return tokenGenerated; // return the generate token + return tokenGenerated; // return the generated token } - + /** + * Redirects the user either on the home page or on the search page + * + * @param searchLine + * @param fullTextLine + * @return the page where the user will be redirected + */ static public String redirectTo(String searchLine, String fullTextLine) { String result = "home.action"; @@ -51,6 +62,14 @@ return result; } + /** + * Retrieves the user by the temporary or the permanent token + * + * @param session the session + * @param token either the temporary or the permanent token + * @return null if the token doesn't exist + * @return the user if the token is valid + */ static public BowUser checkToken(BowSession session, String token) { BowUser result = null; if (checkTemporaryToken(session, token) || checkPermanentToken(session, token)) { Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-25 09:15:39 UTC (rev 216) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-25 09:53:59 UTC (rev 217) @@ -109,4 +109,4 @@ bow.search.orderby=Trier par bow.search.submit=Rechercher bow.search.title=Recherche -bow.token.generate.successful=Le token a y00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s +bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s

1 0

r216 - in trunk/src/main/webapp/jsp: . inc
by vbriand＠users.chorem.org Feb. 25, 2011

Feb. 25, 2011

Author: vbriand Date: 2011-02-25 10:15:39 +0100 (Fri, 25 Feb 2011) New Revision: 216 Url: http://chorem.org/repositories/revision/bow/216 Log: Replaced jsp tags by Struts2 tags whenever possible Modified: trunk/src/main/webapp/jsp/home.jsp trunk/src/main/webapp/jsp/inc/bookmark.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/temporaryXml.jsp Modified: trunk/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/src/main/webapp/jsp/home.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/home.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -60,7 +60,7 @@ request.setAttribute("bookmark", bookmark); request.setAttribute("sdf", sdf); %> - <jsp:include page="inc/bookmark.jsp" flush="true" /> + <s:include value="inc/bookmark.jsp" /> <% ++count; if (count >= nbBookmarks) { @@ -86,7 +86,7 @@ request.setAttribute("bookmark", bookmark); request.setAttribute("sdf", sdf); %> - <jsp:include page="inc/bookmark.jsp" flush="true" /> + <s:include value="inc/bookmark.jsp" /> <% ++count; if (count >= nbBookmarks) { Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -23,7 +23,7 @@ --> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> - +<%@page import="org.chorem.bow.BowBookmark" %> <div class="bookmark" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/login.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -44,8 +44,8 @@ <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> + <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> Modified: trunk/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -23,22 +23,19 @@ #L% --> <%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@page import="org.chorem.bow.BowSession" %> <% -BowSession bowSession = BowSession.getBowSession(session); -String token = bowSession.getPermanentToken(); String url = BowConfig.getInstance().getBowUrl(); %> - <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> <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%>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=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -23,17 +23,10 @@ --> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags"%> -<%@page import="org.chorem.bow.BowSession" %> <%@page import="org.chorem.bow.BowImport" %> <%@page import="org.nuiton.wikitty.search.FacetTopic" %> <%@page import="java.util.List" %> - <% -BowSession bowSession = BowSession.getBowSession(session); -String permanentToken = bowSession.getPermanentToken(); -String temporaryToken = bowSession.getTemporaryToken(); - %> - <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> <head> @@ -72,10 +65,10 @@ <p> <ul> <li><strong><s:text name="bow.rightMenu.token.permanent"/> - :</strong><%=permanentToken%> + :</strong><s:property value="%{#session.BowSession.getPermanentToken()}" /> </li> <li><strong><s:text name="bow.rightMenu.token.temporary"/> - :</strong><%=temporaryToken%> + :</strong><s:property value="%{#session.BowSession.getTemporaryToken()}" /> </li> </ul> <s:url var="regenPermToken" action="regenPermToken"/> Modified: trunk/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-24 16:26:13 UTC (rev 215) +++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 09:15:39 UTC (rev 216) @@ -22,22 +22,19 @@ #L% --> <%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@page import="org.chorem.bow.BowSession" %> <% -BowSession bowSession = BowSession.getBowSession(session); -String token = bowSession.getTemporaryToken(); String url = BowConfig.getInstance().getBowUrl(); %> - <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"> <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%>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=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&search={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription>

1 0

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

Feb. 24, 2011

Author: vbriand Date: 2011-02-24 17:26:13 +0100 (Thu, 24 Feb 2011) New Revision: 215 Url: http://chorem.org/repositories/revision/bow/215 Log: Fixed admin page design Modified: trunk/src/main/java/org/chorem/bow/BookmarkUtils.java trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java trunk/src/main/java/org/chorem/bow/action/RegisterAction.java trunk/src/main/resources/i18n/bow_en_GB.properties trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/jsp/admin.jsp trunk/src/main/webapp/jsp/inc/tagsCloud.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkUtils.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-02-24 16:26:13 UTC (rev 215) @@ -141,20 +141,22 @@ + "<DL><p>\n"; if (bookmarks != null) { for (BowBookmark bookmark : bookmarks) { - export += "<DT><A HREF=\""; - export += bookmark.getLink() + "\" "; - Date date = bookmark.getCreationDate(); - if (date != null) { - long milli = date.getTime(); - String time = String.valueOf(milli / 1000); - export += "ADD_DATE=\"" + time + "\" LAST_MODIFIED=\"" + time + "\" "; + if (bookmark != null) { + export += "<DT><A HREF=\""; + export += bookmark.getLink() + "\" "; + Date date = bookmark.getCreationDate(); + if (date != null) { + long milli = date.getTime(); + String time = String.valueOf(milli / 1000); + export += "ADD_DATE=\"" + time + "\" LAST_MODIFIED=\"" + time + "\" "; + } + export += "LAST_CHARSET=\"UTF-8\" "; + Set<String> tags = bookmark.getLabels(); + if (tags != null && !tags.isEmpty()) { + export += "SHORTCUTURL=\"" + getBookmarkTagsString(bookmark) + "\""; + } + export += ">" + bookmark.getDescription() + "</A>\n"; } - export += "LAST_CHARSET=\"UTF-8\" "; - Set<String> tags = bookmark.getLabels(); - if (tags != null && !tags.isEmpty()) { - export += "SHORTCUTURL=\"" + getBookmarkTagsString(bookmark) + "\""; - } - export += ">" + bookmark.getDescription() + "</A>\n"; } } export += "</DL><p>"; Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-24 16:26:13 UTC (rev 215) @@ -113,12 +113,12 @@ String message = getText("bow.mail.badFormat"); addActionError(n_(message)); - log.error(message + " (email:" + email + ")"); + log.error(message + " (email:" + email + ")", e); } catch (MessagingException e) { String message = getText("bow.mail.sendError"); addActionError(n_(message)); - log.error(message + "(" + e.getMessage() + ")"); + log.error(message + "(" + e.getMessage() + ")", e); } result = SUCCESS; } else { //If the email is not associated with an account Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-24 16:26:13 UTC (rev 215) @@ -264,7 +264,7 @@ } } catch (IOException e2) { addActionError(getText(n_("bow.error.internal"))); - log.error(e2.getMessage()); + log.error(e2.getMessage(), e2); } } return SUCCESS; Modified: trunk/src/main/java/org/chorem/bow/action/RegisterAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-24 16:26:13 UTC (rev 215) @@ -166,12 +166,12 @@ String message = getText("bow.mail.badFormat"); addActionError(n_(message)); - log.error(message + " (email:" + email + ")"); + log.error(message + " (email:" + email + ")", e); } catch (MessagingException e) { String message = getText("bow.mail.sendError"); addActionError(n_(message)); - log.error(message + "(" + e.getMessage() + ")"); + log.error(message + "(" + e.getMessage() + ")", e); } result = SUCCESS; } Modified: trunk/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-24 16:26:13 UTC (rev 215) @@ -1,5 +1,10 @@ bow.action.locale.english=English bow.action.locale.french=Fran\u00E7ais +bow.admin.dataMigration=Migrate all data from 0.4 to 0.5 +bow.admin.dataReindexation=All data reindexation +bow.admin.forbidden=You don't have admin rights \! +bow.admin.home=Return to the home page +bow.admin.panel=Admin panel bow.bookmark.add.successful=Bookmark successfully added bow.bookmark.badFileFormat=Bad bookmarks file format \: unsuccessful import (expected Netscape-like bookmarks file) bow.bookmark.description=Description Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-24 16:26:13 UTC (rev 215) @@ -1,5 +1,10 @@ bow.action.locale.english=English bow.action.locale.french=Fran\u00E7ais +bow.admin.dataMigration=Migrer toutes les donn\u00E9es de la version 0.4 \u00E0 0.5 +bow.admin.dataReindexation=R\u00E9indexation des donn\u00E9es +bow.admin.forbidden=Vous n'\u00EAtes pas administrateur \! +bow.admin.home=Retour sur la page d''accueil +bow.admin.panel=Panneau d''administration bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le fichier doit avoir un format de type Netscape) bow.bookmark.description=Description Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/webapp/css/bookmark.css 2011-02-24 16:26:13 UTC (rev 215) @@ -492,4 +492,16 @@ #add h2{ margin-bottom:20px; +} + +#adminActions li{ + list-style-type:none; + padding-bottom:15px; +} + +#adminActions li a{ + text-decoration:none; + color:#804561; + font-size:11px; + font-weight:bold; } \ No newline at end of file Modified: trunk/src/main/webapp/jsp/admin.jsp =================================================================== --- trunk/src/main/webapp/jsp/admin.jsp 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/webapp/jsp/admin.jsp 2011-02-24 16:26:13 UTC (rev 215) @@ -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"%> -<%@page import="org.chorem.bow.BowSession" %> <html 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" @@ -36,21 +34,22 @@ </head> <body> <div id="content"> - <div id="formFrame"> - <h1>Admin panel</h1> + <div class="menu clearfix"> + <h2><s:text name="bow.admin.panel" /></h2> + </div> + <div class="formFrame"> <br /><br /> - <% -BowSession bowSession = BowSession.getBowSession(session); -if (bowSession.isAdmin()) { - %> - <ul> - <li><a href="/bow/reIndexation.action">All data re-indexation</a></li> - <li><a href="/bow/migrate04To05.action">Migration all data from 0.4 to 0.5</a></li> - <li><a href="/bow/home.action" id="homePage">Return to the home page</a></li> - </ul> - <% } else {%> - <h2>You don't have admin right !</h2> - <% }%> + + <s:if test="#session.BowSession.isAdmin()"> + <ul id="adminActions"> + <li><s:a action="reIndexation"><s:text name="bow.admin.dataReindexation" /></s:a></li> + <li><s:a action="migrate04To05"><s:text name="bow.admin.dataMigration" /></s:a></li> + <li><s:a action="home" id="homePage"><s:text name="bow.admin.home" /></s:a></li> + </ul> + </s:if> + <s:else> + <h2><s:text name="bow.admin.forbidden" /></h2> + </s:else> </div> </div> </body> Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-24 10:30:30 UTC (rev 214) +++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-24 16:26:13 UTC (rev 215) @@ -25,24 +25,25 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> -<div id="nuage" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}"> - <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" /> -</s:if> -<s:else> - <s:set var="maxTags" value="#session.BowSession.preference.tags" /> -</s:else> -<s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}"> - <s:url var="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> - -</div> \ No newline at end of file +<s:if test="#request.bookmarkActions != null"> + <div id="nuage" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}"> + <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" /> + </s:if> + <s:else> + <s:set var="maxTags" value="#session.BowSession.preference.tags" /> + </s:else> + <s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}"> + <s:url var="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> + </div> +</s:if> \ No newline at end of file

1 0

r214 - trunk/src/main/java/org/chorem/bow/action
by vbriand＠users.chorem.org Feb. 24, 2011

Feb. 24, 2011

Author: vbriand Date: 2011-02-24 11:30:30 +0100 (Thu, 24 Feb 2011) New Revision: 214 Url: http://chorem.org/repositories/revision/bow/214 Log: The BufferedWriter is now closed even if an exception occurs Modified: trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java Modified: trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 10:16:35 UTC (rev 213) +++ trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 10:30:30 UTC (rev 214) @@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; import org.apache.struts2.interceptor.ServletResponseAware; import org.chorem.bow.BowBookmark; import org.chorem.bow.BookmarkUtils; @@ -70,17 +71,20 @@ .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria(); List<BowBookmark> bookmarks = proxy.findAllByCriteria(BowBookmark.class, criteria).getAll(); String export = BookmarkUtils.getExportHtmlBookmark(bookmarks); - + BufferedWriter out = null; + try { File tmp = File.createTempFile("bookmarks", "tmp.html"); tmp.deleteOnExit(); - BufferedWriter out = new BufferedWriter(new FileWriter(tmp)); + out = new BufferedWriter(new FileWriter(tmp)); out.write(export); - out.close(); + inputStream = new FileInputStream(tmp); } catch (IOException e) { - log.error("Error when exporting bookmarks to HTML : " + e.getMessage()); + log.error("Error when exporting bookmarks to HTML : " + e.getMessage(), e); + } finally { + IOUtils.closeQuietly(out); } return SUCCESS; }

1 0