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
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"?> <!-- #%L bow @@ -41,7 +40,7 @@ <s:form action="forgotPassword"> <p> <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> - <s:submit key="bow.forgotpwd.submit" /> + <s:submit key="bow.forgotpwd.submit" name="submit" /> </p> </s:form> <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> Modified: trunk/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/src/main/webapp/jsp/home.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/home.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -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-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow @@ -47,16 +46,21 @@ <s:property value="%{#bookmarkAlias}" /> </s:a> <p class="date">(<s:property value="%{date}" />)</p> - <s:url id="editBookmark" action="modifyBookmark" escapeAmp="false"> + <s:url id="editBookmarkModify" 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:url id="editBookmark" action="modifyBookmark" escapeAmp="true"> <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}', '%{editBookmarkModify}', '%{#wikittyId}');"></s:a> + <s:url id="removeBookmark" action="removeBookmark" escapeAmp="true"> + <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> Modified: trunk/src/main/webapp/jsp/inc/bookmarkTop.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmarkTop.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/inc/bookmarkTop.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8" ?> <!-- #%L bow Modified: trunk/src/main/webapp/jsp/inc/errorFrame.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/errorFrame.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/inc/errorFrame.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" %> <% String userError = (String)request.getAttribute("errorMsgUser"); Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8" ?> <!-- #%L bow @@ -48,13 +47,10 @@ <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"> +<div id="logoutDiv"> <s:form action="logout"> <div class="input"> - <s:submit key="bow.rightMenu.logout" /> + <s:submit key="bow.rightMenu.logout" name="submit" /> </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> @@ -80,13 +76,15 @@ <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="" /><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:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:submit key="bow.rightMenu.bookmark.submit" /> + <p> + <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:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <s:submit key="bow.rightMenu.bookmark.submit" name="submit" /> + </p> </s:form> </div> <div id="nuage"> @@ -103,7 +101,7 @@ <s:form action="search"> <div class="input"> <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> </div> </s:form> </div> @@ -111,7 +109,7 @@ <s:form action="fullText"> <div class="input"> <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> </div> </s:form> </div> @@ -121,7 +119,7 @@ <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" /> + <s:submit key="bow.rightMenu.import.submit" name="submit" /> </div> </s:form> <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a> Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -26,33 +26,19 @@ <%@page import="org.chorem.bow.BookmarkActions" %> <%@page import="java.util.List" %> <%@page import="org.nuiton.wikitty.FacetTopic" %> -<% -BookmarkActions bookmarkActions = (BookmarkActions)request.getAttribute("bookmarkActions"); -int nbTags = (Integer)request.getAttribute("nbTags"); -String search = ""; -String searchLine = request.getParameter("searchLine"); -if (searchLine != null) { - search += "&searchLine=" + searchLine; -} -if (bookmarkActions != null) { - List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud(); - int count = 0; - for (FacetTopic tag : tagCloud) { - int value = tag.getCount(); - String tagName = tag.getTopicName(); - int font = bookmarkActions.getFont(value); - %> - <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) { - 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"?> <!-- #%L bow @@ -65,7 +64,7 @@ <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" /> + <s:submit key="bow.preferences.submit" name="submit" /> <br /><br /> <s:url id="home" action="home" /> <s:a href="%{home}" id="homePage"><s:text name="bow.home.title" /></s:a> Modified: trunk/src/main/webapp/jsp/register.jsp =================================================================== --- trunk/src/main/webapp/jsp/register.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/register.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow @@ -43,7 +42,7 @@ <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" /> + <s:submit key="bow.register.submit" name="submit" /> </p> </s:form> <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-02-03 16:09:14 UTC (rev 182) +++ trunk/src/main/webapp/jsp/search.jsp 2011-02-03 18:08:18 UTC (rev 183) @@ -63,7 +63,7 @@ <option value="ascDate"><s:text name="bow.search.ascdate" /></option> <option value="descDate"><s:text name="bow.search.descdate" /></option> </select> - <s:submit key="bow.search.submit" /> + <s:submit key="bow.search.submit" name="submit" /> <s:set name="bookmarksToDelete" value="%{#request.bookmarkActions.getBookmarks().size()}" /> <s:if test="%{#bookmarksToDelete > 0}"> <s:url id="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> Added: trunk/src/main/webapp/template/simple/form-common.ftl =================================================================== --- trunk/src/main/webapp/template/simple/form-common.ftl (rev 0) +++ trunk/src/main/webapp/template/simple/form-common.ftl 2011-02-03 18:08:18 UTC (rev 183) @@ -0,0 +1,64 @@ +<#-- +/* + * $Id: form.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. + */ +--> +<#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" />
participants (1)
-
vbriand＠users.chorem.org