r171 - in trunk/src/main: resources resources/i18n webapp/jsp/inc
Author: vbriand Date: 2011-01-13 19:04:39 +0100 (Thu, 13 Jan 2011) New Revision: 171 Url: http://chorem.org/repositories/revision/bow/171 Log: The tags can now be removed Modified: 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/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/inc/tagsCloud.jsp Modified: trunk/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-13 15:11:42 UTC (rev 170) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-13 18:04:39 UTC (rev 171) @@ -60,6 +60,7 @@ bow.rightMenu.bookmark.link=URL bow.rightMenu.bookmark.name=DESC bow.rightMenu.bookmark.permanentLink=Bookmark add link (permanent) +bow.rightMenu.bookmark.submit=Save bow.rightMenu.bookmark.tags=TAGS bow.rightMenu.bookmark.temporaryLink=Bookmark add link (session) bow.rightMenu.chromiumExtension=Chromium extension @@ -72,3 +73,4 @@ bow.rightMenu.search=Search bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id +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-13 15:11:42 UTC (rev 170) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-13 18:04:39 UTC (rev 171) @@ -60,6 +60,7 @@ bow.rightMenu.bookmark.link=URL bow.rightMenu.bookmark.name=DESC bow.rightMenu.bookmark.permanentLink=Ajouter un bookmark (permanent) +bow.rightMenu.bookmark.submit=Sauvegarder bow.rightMenu.bookmark.tags=TAGS bow.rightMenu.bookmark.temporaryLink=Ajouter un bookmark (session) bow.rightMenu.chromiumExtension=Extension pour chromium @@ -72,3 +73,4 @@ bow.rightMenu.search=Recherche bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session +bow.search.title=Recherche Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-01-13 15:11:42 UTC (rev 170) +++ trunk/src/main/resources/struts.xml 2011-01-13 18:04:39 UTC (rev 171) @@ -31,7 +31,7 @@ </action> <action name="addUrl" class="org.chorem.bow.action.AddUrlAction"> <result type="redirectAction">home</result> - <!-- La redirection change selon le type de page sur laquelle on est, donc je ne vois pas trop comment faire ça pour le moment--> + <!-- TODO: changer pour rediriger selon la page sur laquelle on se trouvait (home, search, ...)--> </action> </package> @@ -71,10 +71,11 @@ <result type="redirectAction">preferences</result> </action> <action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction"> - <!-- La redirection change selon le type de page sur laquelle on est, donc je ne vois pas trop comment faire ça pour le moment--> + <!-- TODO: changer pour rediriger selon la page sur laquelle on se trouvait (home, search, ...)--> + <result type="redirectAction">home</result> </action> <action name="addAlias" class="org.chorem.bow.action.AddAliasAction"> - <!-- La redirection change selon le type de page sur laquelle on est, donc je ne vois pas trop comment faire ça pour le moment--> + <!-- TODO: changer pour rediriger selon la page sur laquelle on se trouvait (home, search, ...)--> <result type="redirectAction">home</result> </action> <action name="order" class="org.chorem.bow.action.OrderAction"> @@ -90,7 +91,7 @@ </action> <!-- Suggestion, Result --> <action name="openSearch*" method="{1}" class="org.chorem.bow.action.OpenSearchAction"> - <!-- Plein de types de redirections différentes, et un .forward(..., ...); que je ne sais pas comment changer --> + <!-- TODO: changer pour rediriger selon la page sur laquelle on se trouvait (home, search, ...)--> <result>/jsp/suggestions.jsp</result> </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-13 15:11:42 UTC (rev 170) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-01-13 18:04:39 UTC (rev 171) @@ -42,6 +42,7 @@ %> <s:set var="searchLine" value="%{#request.searchLine}" /> <s:set var="fullTextLine" value="%{#request.fullTextLine}" /> + <s:set var="wikittyId" value="%{#request.bookmark.getWikittyId()}" /> <div class="bookmark"> <div class="bookmarkhead"> @@ -50,13 +51,13 @@ </a> <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p> <s:url id="editBookmark" action="modifyBookmark" escapeAmp="false"> - <s:param name="bookmarkId"><s:property value="%{#request.bookmark.getWikittyId()}" /></s:param> + <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('%{#request.bookmark.getDescription()}', '%{#request.bookmark.getAlias()}', '%{#request.bookmark.getTags()}', '%{#request.bookmark.getLink()}', '%{editBookmark}', '%{#request.bookmark.getWikittyId()}');"></s:a> + <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#request.bookmark.getDescription()}', '%{#request.bookmark.getAlias()}', '%{#request.bookmark.getTags()}', '%{#request.bookmark.getLink()}', '%{editBookmark}', '%{#wikittyId}');"></s:a> <s:url id="removeBookmark" action="removeBookmark" escapeAmp="false"> - <s:param name="bookmarkId"><s:property value="%{#request.bookmark.getWikittyId()}" /></s:param> + <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> @@ -71,8 +72,7 @@ <s:url id="addClick" action="addClick"> <s:param name="bookmarkId"><%=bookmark.getWikittyId()%></s:param> </s:url> - <s:a title="" href="%{addClick}" onclick="window.open(this.href); return false;"><%=bookmark.getDescription()%></s:a> - <!-- <%=bookmark.getLink()%>--> + <s:a title="%{#request.bookmark.getLink()}" href="%{addClick}" onclick="window.open(this.href); return false;"><%=bookmark.getDescription()%></s:a> </p> <p class="tags"> <strong>Tags :</strong> @@ -82,8 +82,8 @@ if (tagList != null && !tagList.isEmpty()) { for (String tag : tagList) { %> - <s:url id="deleteTag" action="deleteTag"> - <s:param name="bookmarkId"><s:property value="%{#request.bookmark.getWikittyId()}" /></s:param> + <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> @@ -97,10 +97,9 @@ <% } else { %> - <!-- <%=bookmark.getWikittyId()%> --> - <s:a name="" cssStyle="display:none; text-decoration: none;" href="%{deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> + <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> Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-01-13 15:11:42 UTC (rev 170) +++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-01-13 18:04:39 UTC (rev 171) @@ -21,6 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> +<%@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.util.List" %> <%@page import="org.nuiton.wikitty.FacetTopic" %> @@ -40,7 +42,12 @@ String tagName = tag.getTopicName(); int font = bookmarkActions.getFont(value); %> - <a href="/bow/search.action&addTag=<%=tagName%><%=search%>" title="<%=value%> result<%=(value != 1 ? "s" : "")%>" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a> + <s:url id="search" action="search" escapeAmp="false"> + <s:param name="addTag"><%=tagName%></s:param> + <s:param name="searchLine"><s:property value="%{#request.searchLine}" /></s:param> + </s:url> + <!-- title="??value?? result??(value != 1 ? \"s\" : \"\")??" style="font-size: ??font??px;"--> + <s:a href="%{#search}" class="tag"><%=tagName%></s:a> <% ++count; if (count >= nbTags) {
participants (1)
-
vbriand@users.chorem.org