Author: vbriand Date: 2011-01-06 15:22:41 +0100 (Thu, 06 Jan 2011) New Revision: 164 Url: http://chorem.org/repositories/revision/bow/164 Log: The bookmarks are now removable on the home page and the normal and fulltext searches work again Added: trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java Modified: trunk/src/main/java/org/chorem/bow/BowSearch.java trunk/src/main/java/org/chorem/bow/action/SearchAction.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/jsp/home.jsp trunk/src/main/webapp/jsp/inc/header.jsp trunk/src/main/webapp/jsp/inc/rightMenu.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/BowSearch.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowSearch.java 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/java/org/chorem/bow/BowSearch.java 2011-01-06 14:22:41 UTC (rev 164) @@ -35,9 +35,12 @@ 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); //Selects all bookmarks by user - BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, searchLine); - request.setAttribute("bookmarkActions", bookmarkActions); + + if (criteria != null) { + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); //Selects all bookmarks by user + BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, searchLine); + request.setAttribute("bookmarkActions", bookmarkActions); + } } } @@ -54,7 +57,6 @@ criteria = Search.query().keyword(fullText). eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). addFacetField(Bookmark.FQ_FIELD_TAGS); - } else { criteria = BowBookmark.getBookmarkListCriteriaByUser(user, null); } Added: trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-01-06 14:22:41 UTC (rev 164) @@ -0,0 +1,43 @@ +package org.chorem.bow.action; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; + +import org.apache.struts2.interceptor.ServletRequestAware; +import org.apache.struts2.interceptor.SessionAware; +import org.chorem.bow.BowSearch; +import org.chorem.bow.User; + +public class FullTextSearchAction extends BowBaseAction implements SessionAware, ServletRequestAware { + private static final long serialVersionUID = -7736099487284993426L; + protected Map<String, Object> session; + protected HttpServletRequest request; + + @Override + public void setServletRequest(HttpServletRequest request) { + this.request = request; + } + + @Override + public void setSession(Map<String, Object> session) { + this.session = session; + } + + public String execute() { + User user = (User)session.get("user"); + + try { + BowSearch.fullText(request, user); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ServletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return SUCCESS; + } +} Property changes on: trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/src/main/java/org/chorem/bow/action/SearchAction.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-01-06 14:22:41 UTC (rev 164) @@ -8,15 +8,8 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.struts2.interceptor.SessionAware; -import org.chorem.bow.Bookmark; -import org.chorem.bow.BookmarkActions; -import org.chorem.bow.BowBookmark; -import org.chorem.bow.BowProxy; import org.chorem.bow.BowSearch; import org.chorem.bow.User; -import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.PagedResult; -import org.nuiton.wikitty.WikittyProxy; public class SearchAction extends BowBaseAction implements SessionAware, ServletRequestAware { private static final long serialVersionUID = -2161661766242362907L; @@ -81,36 +74,15 @@ public String execute() { User user = (User)session.get("user"); - if (searchLine == null) { - searchLine = ""; + try { + BowSearch.search(request, user); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ServletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } - if (fullTextLine != null && !fullTextLine.isEmpty() && searchLine.isEmpty()) { - try { - BowSearch.fullText(request, user); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ServletException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } else { - if (addTag != null && !addTag.isEmpty()) { - if (searchLine.isEmpty()) { - searchLine = addTag; - } else { - searchLine += " " + addTag; - } - } - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = BowBookmark.getBookmarkListCriteriaByUser(user, searchLine); - if (criteria != null) { - criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); //Selects all bookmarks by user - BookmarkActions bookmarkActions = BowBookmark.createBookmarkActions(request, result, searchLine); - request.setAttribute("bookmarkActions", bookmarkActions); - } - } 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-06 09:56:50 UTC (rev 163) +++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-01-06 14:22:41 UTC (rev 164) @@ -31,6 +31,21 @@ 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.title= +bow.preferences.userInfo= bow.register.emailAldyUsed=This email address is already used bow.register.invalidLogin= bow.register.mailEmail= Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-06 14:22:41 UTC (rev 164) @@ -31,6 +31,21 @@ 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.searchEngineUrlResults= +bow.preferences.searchEngineUrlSuggestions= +bow.preferences.siteLook= +bow.preferences.submit= +bow.preferences.tagsNb= +bow.preferences.title= +bow.preferences.userInfo= bow.register.emailAldyUsed=Cette adresse email est d\u00E9j\u00E0 utilis\u00E9e bow.register.invalidLogin= bow.register.mailEmail= Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/resources/struts.xml 2011-01-06 14:22:41 UTC (rev 164) @@ -8,7 +8,7 @@ <package name="myPackage" extends="struts-default"> <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> <result name="input">/jsp/register.jsp</result> - <result type="redirect">/home.action</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> @@ -20,17 +20,17 @@ </action> <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> <result name="input">/jsp/login.jsp</result> - <result type="redirect">/home.action</result> + <result type="redirectAction">home</result> </action> <action name="logout" class="org.chorem.bow.action.LogoutAction"> - <result type="redirect">/login_input.action</result> + <result type="redirectAction">login_input</result> </action> <action name="home" class="org.chorem.bow.action.HomeAction"> - <result name="login" type="redirect">/login_input.action</result> + <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="redirect">/home.action</result> + <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--> </action> </package> @@ -42,18 +42,27 @@ <result>/jsp/home.jsp</result> </action> <!-- modify, remove, edit --> - <action name="*Bookmark" method="{1}" class="org.chorem.bow.action.BookmarkAction"> - <!-- La redirection change selon le type de page sur laquelle on est, donc je ne vois pas trop comment faire ça pour le moment--> + <action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction"> <result name="home">/jsp/home.jsp</result> <result name="search">/jsp/search.jsp</result> </action> + <action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction"> + <result type="redirectAction">home</result> + <result name="search">/jsp/search.jsp</result> + </action> + <action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction"> + <result name="home">/jsp/home.jsp</result> + <result name="search">/jsp/search.jsp</result> + </action> </package> <package name="toto" extends="struts-default"> <action name="search" class="org.chorem.bow.action.SearchAction"> - <!-- Méthode actionSearch appellée dans d'autres méthodes, à voir comment organiser ça --> <result>/jsp/search.jsp</result> </action> + <action name="fullText" class="org.chorem.bow.action.FullTextSearchAction"> + <result>/jsp/search.jsp</result> + </action> <action name="generateToken" class="org.chorem.bow.action.GenerateTokenAction"> <result>/jsp/preferences.jsp</result> </action> @@ -97,7 +106,7 @@ <result>/jsp/admin.jsp</result> </action> <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> - <result type="redirectAction">/jsp/home.jsp</result> + <result type="redirectAction">home</result> </action> </package> </struts> Modified: trunk/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/src/main/webapp/jsp/home.jsp 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/webapp/jsp/home.jsp 2011-01-06 14:22:41 UTC (rev 164) @@ -66,7 +66,7 @@ request.setAttribute("bookmark", bookmark); request.setAttribute("sdf", sdf); %> - <jsp:include page="/jsp/inc/bookmark.jsp" flush="true" /> + <jsp:include page="inc/bookmark.jsp" flush="true" /> <% ++count; if (count >= nbBookmarks) { @@ -92,7 +92,7 @@ request.setAttribute("bookmark", bookmark); request.setAttribute("sdf", sdf); %> - <jsp:include page="/jsp/inc/bookmark.jsp" flush="true" /> + <jsp:include page="inc/bookmark.jsp" flush="true" /> <% ++count; if (count >= nbBookmarks) { @@ -104,7 +104,7 @@ <p class="nobookmarks"><s:text name="bow.home.noBookmarks" /></p> <% } %> </div> - <jsp:include page="/jsp/inc/rightMenu.jsp" /> + <jsp:include page="inc/rightMenu.jsp" /> </body> </html> <% } %> Modified: trunk/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/header.jsp 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/webapp/jsp/inc/header.jsp 2011-01-06 14:22:41 UTC (rev 164) @@ -1,3 +1,4 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <div id="header"> - <a class="logo" href="">bow</a> + <a class="logo" href="/bow/">bow</a> </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-06 09:56:50 UTC (rev 163) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-01-06 14:22:41 UTC (rev 164) @@ -82,11 +82,9 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <s:form action="logout"> - <div class="input"> - <s:submit name="bow.rightMenu.logout" /> - </div> + <s:submit name="bow.rightMenu.logout" /> </s:form> - <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank"><s:text name="bow.rightMenu.help" /></a> + <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> <div id="side"> <div id="colonneD"> @@ -101,7 +99,7 @@ <div id="extensions"> <h2><s:text name="bow.rightMenu.extensions" /></h2> <ul class="droite"> - <li><a href="extensions/bow4chromium.crx"><img src="img/chromium.png" class="extensionIcon" /><div class="extensionName">Extension pour Chromium</div></a></li> + <li><a href="extensions/bow4chromium.crx"><img src="img/chromium.png" alt="Chromium" class="extensionIcon" />Extension pour Chromium</a></li> <li><strong><s:text name="bow.rightMenu.token.permanent" /></strong> <%= permanentToken %></li> <li><strong><s:text name="bow.rightMenu.token.temporary" /></strong> <%= temporaryToken %></li> </ul> @@ -109,11 +107,11 @@ <div id="add" class="clearfix"> <h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2> <s:form id="bookmarkForm" action="addUrl"> - <div class="input"><s:textfield key="bow.rightMenu.bookmark.link" name="link" /></div><!-- <%=formLink%> --> - <div class="input"><s:textfield key="bow.rightMenu.bookmark.alias" name="alias" /></div><!-- <%=formAlias%> --> - <div class="input"><s:textfield key="bow.rightMenu.bookmark.name" name="name" /></div><!-- <%=formName%> --> - <div class="input"><s:textfield key="bow.rightMenu.bookmark.tags" name="tags" /></div><!-- <%=formTags%> --> - <div class="input"><s:submit key="bow.rightMenu.bookmark.submit" /></div> + <s:textfield key="bow.rightMenu.bookmark.link" name="link" /><!-- <%=formLink%> --> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" /><!-- <%=formAlias%> --> + <s:textfield key="bow.rightMenu.bookmark.name" name="name" /><!-- <%=formName%> --> + <s:textfield key="bow.rightMenu.bookmark.tags" name="tags" /><!-- <%=formTags%> --> + <s:submit key="bow.rightMenu.bookmark.submit" /> </s:form> </div> <div id="nuage"> @@ -126,34 +124,28 @@ <% } %> </div> <div class="recherche"> - <h2><label for="searchLine"><s:text name="bow.rightMenu.search" /></label></h2> + <h2><s:text name="bow.rightMenu.search" /></h2> <s:form action="search"> - <div class="input"> - <s:textfield key="bow.rightMenu.find.searchLine" name="searchLine" /> - <s:submit key="bow.rightMenu.find.submit" /> - </div> + <s:textfield key="bow.rightMenu.find.searchLine" name="searchLine" /> + <s:submit key="bow.rightMenu.find.submit" /> </s:form> </div> <div class="recherche"> - <h2><label for="fullTextLine"><s:text name="bow.rightMenu.fullTextSearch}" /></label></h2> + <h2><s:text name="bow.rightMenu.fullTextSearch" /></h2> <s:form action="fullText"> - <div class="input"> - <% if (fullText != null) { %> - <s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" value="" /> <!-- <%=fullText%> --> - <% } else { %> - <s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" /> - <% } %> - <s:submit key="bow.rightMenu.find" /> - </div> + <% if (fullText != null) { %> + <s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" value="" /> <!-- <%=fullText%> --> + <% } else { %> + <s:textfield key="bow.rightMenu.search.fullTextLine" name="fullTextLine" /> + <% } %> + <s:submit key="bow.rightMenu.find" /> </s:form> </div> <div id="import"> <h2><s:text name="bow.rightMenu.importBookmarks" /></h2> <s:form action="importBookmarks" enctype="multipart/form-data"> - <div class="input"> - <s:file name="upfile" size="15%" key="bow.rightMenu.import.file" /><br /> - <s:submit key="bow.rightMenu.import.submit" /> - </div> + <s:file name="upfile" size="15%" key="bow.rightMenu.import.file" /><br /> + <s:submit key="bow.rightMenu.import.submit" /> </s:form> <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a> </div> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-01-06 14:22:41 UTC (rev 164) @@ -71,42 +71,45 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <head> - <s:url value="/css/bookmark.css" /> + <title><s:text name="bow.preferences.title" /></title> + <s:url id="css" value="/css/bookmark.css" /> <link href="${css}" rel="stylesheet" type="text/css" /> <s:head /> </head> <body> <div id="content"> <div class="menu clearfix"> - <h2><s:property value="%{getText('preferences')}" /></h2> + <h2><s:text name="bow.preferences.title" /></h2> </div> - <s:form action="/bow/changePreferences.action"> + <s:form action="changePreferences"> <div class="formFrame"> - <h3><s:property value="%{getText('userInfo')}" /></h3> + <h3><s:text name="bow.preferences.userInfo" /></h3> <p> - <s:textfield key="email" name="email" label="%{getText('email')}" /><br /><br /><!-- value="<%=user.getEmail()%>" --> - <s:password key="currentPassword" name="currentPassword" label="%{getText('currentPassword')}" /> - <s:password key="newPassword" name="newPassword" label="%{getText('newPassword')}" /> - <s:password key="confirmNewPassword" name="confirmNewPassword" label="%{getText('confirmNewPassword')}" /> - <a href="/bow/generateToken.action" id="regenPermToken"><s:property value="%{getText('regenPermToken')}" /></a> + <s:textfield key="bow.login.email" name="email" /><br /><br /><!-- value="<%=user.getEmail()%>" --> + <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> </p> </div> <div class="formFrame"> - <h3><s:property value="%{getText('siteLook')}" /></h3> + <h3><s:text name="bow.preferences.siteLook" /></h3> <p> - <s:textfield key="colors" name="colors" label="%{getText('siteColor')}" /><br /> <!-- value="<%=preference.getColors()%>" --> - <s:textfield key="tagsNb" name="tagsNb" label="%{getText('tagsNb')}" /><br /> - <s:textfield key="bookmarksHomePage" name="bookmarksHomePage" label="%{getText('bookmarksHomePage')}" /><br /> - <s:textfield key="searchEngineUrlSuggestions" name="searchEngineUrlSuggestions" label="%{getText('searchEngineUrlSuggestions')}" /><br /> - <s:textfield key="searchEngineUrlResults" name="searchEngineUrlResults" label="%{getText('searchEngineUrlResults')}" /> - <s:submit value="%{getText('changePreferences')}" /> + <s:textfield key="bow.preferences.colors" name="colors" /><br /> <!-- value="<%=preference.getColors()%>" --> + <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:submit key="bow.preferences.submit" /> <br /><br /> - <a href="/bow/home.action" id="homePage"><s:property value="%{getText('homePage')}" /></a> + <s:url id="home" action="home" /> + <a href="%{home}" id="homePage"><s:text name="bow.home.title" /></a> </p> </div> </s:form> <div class="menu clearfix"> - <h2><s:property value="%{getText('importedBookmarks')}" /></h2> + <h2><s:text name="bow.preferences.importedBookmarks" /></h2> </div> <% List<FacetTopic> bookmarkImportList = (List<FacetTopic>)request.getAttribute("bookmarksImportDate"); @@ -133,7 +136,7 @@ } else { %> <div class="deleteImport deleteImportWhite"> - <span><s:property value="%{getText('noImportedBookmarks')}" /></span> + <span><s:text name="bow.preferences.noImportedBookmarks" /></span> </div> <% } Modified: trunk/src/main/webapp/jsp/register.jsp =================================================================== --- trunk/src/main/webapp/jsp/register.jsp 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/webapp/jsp/register.jsp 2011-01-06 14:22:41 UTC (rev 164) @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-01-06 09:56:50 UTC (rev 163) +++ trunk/src/main/webapp/jsp/search.jsp 2011-01-06 14:22:41 UTC (rev 164) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow @@ -21,7 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BookmarkActions" %> <%@page import="org.chorem.bow.TokenActions" %> <%@page import="org.chorem.bow.Bookmark" %> @@ -37,14 +39,25 @@ if (tokenActions != null && bookmarkActions != null) { %> - <jsp:include page="header.jsp" flush="true"> - <jsp:param name="cssFile" value="bookmark.css" /> - </jsp:include> - <div id="main"> - <jsp:include page="errorFrame.jsp" flush="true" /> + <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" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <head> + <title><s:text name="bow.search.title" /></title> + <s:url id="css" value="/css/bookmark.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div id="content"> <div class="menu clearfix"> - <h2>Search</h2> - <form method="post" action="bow?action=order&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> + <h2><s:text name="bow.search.title" /></h2> + <s:url id="order" action="order"> + <s:param name="searchLine"><%=searchLine%></s:param> + <s:param name="fullTextLine"><%=fullText%></s:param> + </s:url> + <s:form action="%{order}"> <p> <label for="type">Order By :</label> <select id="type" name="type"> @@ -55,27 +68,33 @@ <option value="ascDate">Asc Date</option> <option value="descDate">Desc Date</option> </select> - <input type="submit" value="OK" /> + <s:submit key="bow.search.submit" /> <% List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); int bookmarksNb = bookmarkList.size(); if (bookmarksNb > 0) { %> - <a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation('bow?action=deleteSearchResults&searchLine=<%= searchLine %>&fullTextLine=<%= fullText %>', <%=bookmarksNb%>); return(false);"></a> + <s:url id="deleteSearchResult" action="deleteSearchResult"> + <s:param name="searchLine"><%=searchLine%></s:param> + <s:param name="fullTextLine"><%=fullText%></s:param> + </s:url> + <s:a id="deleteSearchResultsButton" href="" onclick="deleteConfirmation(%{deleteSearchResult}, <%=bookmarksNb%>); return(false);"></s:a> <% } %> </p> - </form> + </s:form> </div> <div class="content"> <% + List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); for (Bookmark bookmark : bookmarkList) { request.setAttribute("bookmark", bookmark); request.setAttribute("sdf", sdf); %> - <jsp:include page="bookmark.jsp" flush="true"> + <jsp:include page="inc/bookmark.jsp" flush="true"> <jsp:param name="searchLine" value="<%=searchLine%>" /> <jsp:param name="fullTextLine" value="<%=fullText%>" /> </jsp:include> @@ -85,8 +104,7 @@ else { %> <p class="nobookmarks">No Bookmarks</p> <% } %> - </div> - </div> - <jsp:include page="rightMenu.jsp" flush="true" /> - <jsp:include page="footer.jsp" flush="true" /> + </div> + </body> +</html> <% } %>