Author: bpoussin Date: 2011-08-21 20:31:08 +0200 (Sun, 21 Aug 2011) New Revision: 319 Url: http://chorem.org/repositories/revision/bow/319 Log: Evolution #438: Refactore source code and simplify all - move jsp page to WEB-INF dir for more security Added: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp trunk/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp Modified: trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp Modified: trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp 2011-08-21 18:30:58 UTC (rev 318) +++ trunk/bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -62,15 +62,15 @@ <body id="page-home"> <div id="wrap"> <div id="page"> - <%@include file="/jsp/inc/header.jsp" %> + <%@include file="/WEB-INF/jsp/inc/header.jsp" %> <div id="main"> <decorator:body /> </div> <s:if test="%{#session.BowSession.user != null}"> - <jsp:include page="/jsp/inc/rightMenu.jsp" /> + <jsp:include page="/WEB-INF/jsp/inc/rightMenu.jsp" /> </s:if> </div> </div> - <%@include file="/jsp/inc/footer.jsp" %> + <%@include file="/WEB-INF/jsp/inc/footer.jsp" %> </body> </html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/admin.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,58 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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"%> + +<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> + <s:url var="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:text name="bow.admin.panel" /></h2> + </div> + <div class="formFrame fond"> + <br /><br /> + + <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="migrateData?versionFrom=0.4&versionTo=0.5"><s:text name="bow.admin.dataMigration04to05" /></s:a></li> + <li><s:a action="migrateData?versionFrom=0.6&versionTo=1.1"><s:text name="bow.admin.dataMigration05to06" /></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> +</html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/editBookmark.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,61 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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"%> + +<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> + <s:url var="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:text name="popup.addurl.title" /></h2> + </div> + <div class="formFrame fond"> + <s:form id="popupAddUrlForm" action="addUrl" method="post"> + <s:hidden name="tagLine" value="%{tagLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <s:hidden name="bookmarkId" value="%{bookmark.wikittyId}"/> + <s:textfield name="link" labelSeparator=" " key="popup.addurl.link" + value="%{bookmark.link}" /> + <s:textarea name="name" labelSeparator=" " key="popup.addurl.name" + value="%{bookmark.description}" /> + <s:textfield name="privateAlias" labelSeparator=" " key="popup.addurl.alias.private" + value="%{bookmark.privateAlias}" /> + <s:textfield name="publicAlias" labelSeparator=" " key="popup.addurl.alias.public" + value="%{bookmark.publicAlias}" /> + <s:textfield name="tags" labelSeparator=" " key="popup.addurl.tags" + value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(bookmark)}" /> + <s:submit key="popup.commons.submit" name="submit" /> + </s:form> + </div> + </div> + </body> +</html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/error.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,48 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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"%> + +<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> + <s:url var="css" value="/css/connexion.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div id="main"> + <div id="msg"> + <div id="actionmessageHeader"> + <s:actionmessage /> + </div> + <div id="actionerrorHeader"> + <s:actionerror /> + </div> + </div> + </div> + </body> +</html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/forgotPassword.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/forgotPassword.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,51 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" 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" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <head> + <title><s:text name="bow.forgotpwd.title" /></title> + <s:url var="css" value="/css/connexion.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame fond"> + <h1><s:text name="bow.forgotpwd.title" /></h1> + <s:form action="forgotPassword"> + <p> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <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> + </div> + </div> + </body> +</html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/home.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,75 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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" %> + +<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"> + + <head> + <title><s:text name="bow.search.title" /></title> + <s:url var="css" value="/css/bookmark.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div class="menu clearfix"> + <h2> + <s:text name="bow.search.found" /> + <s:property value="%{searchResult.bookmarkCount}"/> + </h2> + + <s:set name="bookmarksToDelete" value="%{searchResult.bookmarkCount}" /> + <s:if test="%{#bookmarksToDelete > 0}"> + <s:url var="deleteSearchResults" action="deleteSearchResults" escapeAmp="false"> + <s:param name="tagLine"><s:property value="searchResult.tagLine" /></s:param> + <s:param name="fullTextLine"><s:property value="searchResult.fullTextLine" /></s:param> + </s:url> + <s:a id="deleteSearchResultsButton" title="delete all" href="" onclick="deleteConfirmation('%{deleteSearchResults}', %{#bookmarksToDelete}); return(false);"></s:a> + </s:if> + <s:form action="home" method="get" theme="simple"> + <label for="order"><s:text name="bow.search.orderby" /></label> + <s:select id="order" name="order" list="possibleOrder"/> + <s:submit key="bow.search.submit" name="submit" /> + <s:hidden name="tagLine" value="%{searchResult.tagLine}" /> + <s:hidden name="fullTextLine" value="%{searchResult.fullTextLine}" /> + </s:form> + </div> + <div class="content"> + <s:if test="searchResult.bookmarks.empty"> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + </s:if> + <s:else> + <s:iterator value="searchResult.bookmarks" var="bookmark"> + <s:set name="bookmark" value="bookmark"/> + <jsp:include page="inc/bookmark.jsp" flush="true"> + <jsp:param name="tagLine" value="%{searchResult.tagLine}" /> + <jsp:param name="fullTextLine" value="%{searchResult.fullTextLine}" /> + </jsp:include> + </s:iterator> + </s:else> + </div> + </body> +</html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,84 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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" %> +<%@taglib prefix="sj" uri="/struts-jquery-tags" %> + +<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"> + + <div class="bookmarkhead"> + <p class="date"><s:property value="#bookmark.creationDate"/></p> + <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.wikittyId}.action" + title="%{#bookmark.link}" target="_blank"> + a:<s:property value="%{#bookmark.privateAlias}" /> + </s:a> + <s:if test="%{!#bookmark.publicAlias.empty}"> + <s:a cssClass="alias" href="%{config.aliasUrl + #bookmark.publicAlias}.action" + title="%{#bookmark.link}" target="_blank"> + <s:property value="%{#bookmark.publicAlias}" /> + </s:a> + </s:if> + <s:url var="editBookmark" action="editBookmark" escapeAmp="true"> + <s:param name="id"><s:property value="%{#bookmark.wikittyId}" /></s:param> + <s:param name="tagLine"><s:property value="%{tagLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{fullTextLine}" /></s:param> + </s:url> + <s:a cssClass="edit" href="%{editBookmark}"/> + + <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> + <s:param name="bookmarkId"><s:property value="%{#bookmark.wikittyId}" /></s:param> + <s:param name="tagLine"><s:property value="%{tagLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{fullTextLine}" /></s:param> + </s:url> + <s:a cssClass="supprim" href="%{removeBookmark}" + onclick="return deleteConfirmation('%{#removeBookmark}','%{#bookmark.link}');"></s:a> + </div> + + <div class="bookmarkcontenu"> + <s:a title="%{#bookmark.link}" href="alias/%{#bookmark.wikittyId}.action" target="_blank"> + <div class="screenshot"></div> + </s:a> + <div class="click"><s:property value="%{#bookmark.click}" /></div> + <div class="description"> + <h3><s:text name="bow.bookmark.description" /> :</h3> + <p> + <s:property value="%{#bookmark.description}"/> + </p> + <p class="tags"> + <strong><s:text name="bow.bookmark.tags" /> :</strong> + <s:iterator value="#bookmark.labels" var="tag"> + <s:url var="search" action="home"> + <s:param name="tagLine" value="%{tagLine}"/> + <s:param name="addTag" value="%{#tag}"/> + <s:param name="fullTextLine" value="%{fullTextLine}"/> + </s:url> + <s:a href="%{search}" cssClass="tag"><s:property value="%{#tag}"/></s:a> + </s:iterator> + </p> + </div> + </div> + +</div> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/inc/footer.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,47 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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" %> + +<div id="footer" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <p> + <a shape="rect" href="http://www.chorem.org/projects/show/bow">bow</a> + <a shape="rect" href="http://www.chorem.org/projects/bow/files"></a> - + <a shape="rect" href="http://www.gnu.org/licenses/agpl.html"><s:text name="bow.footer.license" /></a> - + <span title="Copyright">©2011</span> + <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - + <a shape="rect" href="http://www.chorem.org/projects/bow/issues"><s:text name="bow.footer.bugreport" /></a> - + <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users"><s:text name="bow.footer.userSupport" /></a> - + <s:url var="localeEN"> + <s:param name="request_locale">en_GB</s:param> + </s:url> + <s:url var="localeFR"> + <s:param name="request_locale">fr_FR</s:param> + </s:url> + <s:a href="%{localeEN}"><s:text name="bow.action.locale.english" /></s:a> - + <s:a href="%{localeFR}"><s:text name="bow.action.locale.french" /></s:a> + </p> +</div> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,71 @@ +<%-- +#%L + bow + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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" %> + +<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"> + <div> + <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> + </div> + <s:if test="%{#session.BowSession.user != null}"> + <div class="recherche right"> + <h3>Recherche</h3> + <div class="input"> + <s:form action="home" theme="simple"> + <s:textfield name="tagLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.search.tags" name="submit" /> + </s:form> + </div> + <div class="input"> + <s:form action="home" theme="simple"> + <s:textfield name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.fullTextSearch" name="submit" /> + </s:form> + </div> + <div class="input"> + <s:form action="openSearchResult" theme="simple"> + <s:textfield name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.externSearchEngine" name="submit" /> + </s:form> + </div> + </div> + </s:if> + <div id="msg"> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> + </div> +</div> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,73 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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" %> +<%@taglib prefix="sj" uri="/struts-jquery-tags" %> + +<sj:dialog id="editBookmark" + title="Ajout/Modification d'un bookmark" + modal="true" + autoOpen="false" /> + +<div id="logoutDiv" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <s:form action="logout" theme="simple"> + <div class="input"> + <s:submit key="bow.rightMenu.logout" name="submit" /> + </div> + </s:form> + <a href="http://maven-site.chorem.org/bow/" class="help" target="_blank"> + <s:text name="bow.rightMenu.help" /> + </a> +</div> + +<div id="side" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <div id="colonneD"> + <ul class="droite"> + <s:if test="bowSession.admin"> + <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> + </s:if> + <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> + <li> + <s:url var="editBookmark" action="editBookmark" escapeAmp="true"> + <s:param name="tagLine"><s:property value="%{tagLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{fullTextLine}" /></s:param> + </s:url> + <s:a href="%{editBookmark}"> + <s:text name="bow.rightMenu.addUrl.link" /> + </s:a> + </li> + </ul> + <!--div id="nuage"--> + <jsp:include page="tagsCloud.jsp" flush="true"> + <jsp:param name="tagLine" value="%{tagLine}" /> + <jsp:param name="fullTextLine" value="%{fullTextLine}"/> + </jsp:include> + <!--/div--> + <div class="colonnebas"> + <img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" /> + </div> + </div> +</div> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/inc/tagsCloud.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,42 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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" %> + +<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:iterator value="%{searchResult.tagsCloud}" status="tagStatus" var="tag"> + <s:url var="search" action="home" escapeAmp="true"> + <s:param name="tagLine" value="%{tagLine}"/> + <s:param name="addTag" value="%{#tag.topicName}"/> + <s:param name="fullTextLine" value="%{fullTextLine}"/> + </s:url> + <!-- --> + <s:a href="%{search}" title="%{#tag.count} results" cssClass="tag" + cssStyle="font-size: %{searchResult.getFont(#tag.count)}px"> + <s:property value="%{#tag.topicName}" /> + </s:a> + </s:iterator> +</div> \ No newline at end of file Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/login.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,52 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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"%> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="bow.login.title" /></title> + <s:url var="css" value="/css/connexion.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame" class="fond"> + <h1><s:text name="bow.login.title" /></h1> + <br/> + <br/> + <s:actionerror /> + <s:form action="login"> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:submit key="bow.login.submit" name="submit" /> + </s:form> + <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> + <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> + </div> + </div> + </body> +</html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/permanentXml.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,43 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<%@page import="org.chorem.bow.BowConfig" %> + +<% +String url = BowConfig.getBowUrl(); +%> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" + 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> + <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> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp (from rev 316, trunk/bow-ui/src/main/webapp/jsp/preferences.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,188 @@ +<%-- +#%L +bow + +$Id$ +$HeadURL$ +%% +Copyright (C) 2010 CodeLutin +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +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" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> +<head> + <title><s:text name="bow.preferences.title"/></title> + <s:url var="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:text name="bow.preferences.title"/></h2> + </div> + <s:actionerror/> + + <div class="formFrame fond"> + <s:set var="permanentToken" value="bowSession.getPermanentToken()" /> + <s:set var="temporaryToken" value="bowSession.getTemporaryToken()" /> + <ul> + <li> + <s:a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" + href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='%{config.bowUrl}addUrl.action?token=%{temporaryToken}&link='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);"> + <s:text name="bow.rightMenu.bookmark.temporaryLink" /> + </s:a> + </li> + <li> + <s:a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" + href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='%{config.bowUrl}addUrl.action?token=%{permanentToken}&link='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);"> + <s:text name="bow.rightMenu.bookmark.permanentLink" /> + </s:a> + </li> + <li> + <a href="extensions/bow4chromium.crx"> + <img src="img/chromium.png" alt="Chromium" class="extensionIcon" /> + <s:text name="bow.rightMenu.chromiumExtension" /> + </a> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> + <s:property value="%{#permanentToken}"/> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> + <s:property value="%{#temporaryToken}"/> + </li> + </ul> + + <s:url var="regenPermToken" action="generateToken"/> + <s:a href="%{regenPermToken}" id="regenPermToken"> + <s:text name="bow.preferences.regenPermToken"/> + </s:a> + </div> + + <div class="formFrame fond"> + <h3><s:text name="bow.preferences.userInfo"/></h3> + <br/> + <s:form action="updateUserPref" theme="simple"> + <s:text name="bow.login.email"/><br/> + <s:textfield name="email" + labelposition="top"/><br/> + + <s:text name="bow.preferences.currentPassword"/><br/> + <s:password name="currentPassword" + labelposition="top"/><br/> + + <s:text name="bow.preferences.newPassword"/><br/> + <s:password name="newPassword" + labelposition="top"/><br/> + + <s:text name="bow.preferences.confirmNewPassword"/><br/> + <s:password name="confirmNewPassword" + labelposition="top"/><br/> + <s:hidden name="update" value="user"/> + <s:submit key="bow.preferences.submit" name="submit"/> + </s:form> + </div> + <div class="formFrame fond"> + <h3><s:text name="bow.preferences.siteLook"/></h3> + <br/> + <s:form action="updateSitePref" theme="simple"> + <s:text name="bow.preferences.tagsNb"/><br/> + <s:textfield name="tagsNb" labelposition="top"/><br/> + + <s:text name="bow.preferences.bookmarksHomePage"/><br/> + <s:textfield name="bookmarksHomePage" labelposition="top"/><br/> + + <s:text name="bow.preferences.searchEngineUrlSuggestions"/><br/> + <s:textfield name="searchEngineUrlSuggestions" + labelposition="top"/><br/> + + <s:text name="bow.preferences.searchEngineUrlResults"/><br/> + <s:textfield name="searchEngineUrlResults" + size="50" + labelposition="top"/><br/> + + <s:hidden name="update" value="site"/> + <s:submit key="bow.preferences.submit" name="submit"/> + </s:form> + </div> + + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.tagsManagement"/></h2> + </div> + + <div class="formFrame fond"> + <h3><s:text name="bow.preferences.labels"/>(<s:property value="labels.size()"/>)</h3> + <br/> + <s:form id="labelsForm" action="adminlabels" method="post" theme="simple"> + <div class="list"> + <s:checkboxlist name="selectedLabels" list="labels" + listKey="topicName" listValue="%{topicName+'('+count+')'}"/> + </div> + <div class="action"> + <s:text name="bow.preferences.labels.name.field"/><s:textfield name="newLabel" /> + <s:submit name="rename" key="bow.preferences.labels.rename.submit" /> + <s:submit name="delete" key="bow.preferences.labels.delete.submit" /> + </div> + </s:form> + </div> + + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.importExport"/></h2> + </div> + + <div class="formFrame fond"> + <s:a action="exportBookmarks"><s:text name="bow.preferences.export.bookmarks"/></s:a> + <br/> + + <h3><s:text name="bow.preferences.import.bookmarks"/></h3> + <br/> + <s:form action="importBookmarks" method="post" enctype="multipart/form-data" theme="simple"> + <s:file name="upfile" labelSeparator=""/> + <s:hidden name="tagLine" value="%{tagLine}"/> + <s:hidden name="fullTextLine" value="%{fullTextLine}"/> + <s:submit key="bow.preferences.import.submit" name="submit"/> + </s:form> + <br/><br/> + + <s:if test="bookmarksImportDate != null"> + <s:iterator value="bookmarksImportDate"> + <s:set name="date" value="%{key}"/> + <s:set name="nb" value="%{value}"/> + <s:date name="%{stringToDate(#date)}" var="dateString"/> + <div class="deleteImport"> + <span><s:property value="dateString"/> (<s:property value="#nb"/> bookmarks)</span> + <s:url var="deleteImport" action="deleteImport"> + <s:param name="date" value="#date"/> + </s:url> + <s:a cssClass="deleteImportButton" href="%{deleteImport}" + onclick="return deleteConfirmation('%{deleteImport}','%{nb}','%{dateString}');"> + </s:a> + </div> + </s:iterator> + </s:if> + <s:else> + <span><s:text name="bow.preferences.noImportedBookmarks"/></span> + </s:else> + </div> + +</div> +</body> +</html> \ No newline at end of file Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/register.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,54 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + 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" %> + +<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.register.title" /></title> + <s:url var="css" value="/css/connexion.css" /> + <link href="${css}" rel="stylesheet" type="text/css" /> + <s:head /> + </head> + <body> + <div id="content"> + <div id="formFrame" class="fond"> + <h1><s:text name="bow.register.title" /></h1> + <s:form action="register"> + <s:actionerror /> + <p> + <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" name="submit" /> + </p> + </s:form> + <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> + </div> + </div> + </body> +</html> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/suggestions.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,44 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page import="org.chorem.bow.OpenSearchActions" %> +<%@page import="org.nuiton.wikitty.search.FacetTopic" %> +<%@page import="org.chorem.bow.action.OpenSearchSuggestionAction"%> +<%@page import="java.util.List" %> + +<% +OpenSearchSuggestionAction action = OpenSearchSuggestionAction.getAction(); +OpenSearchActions osa = action.getOpenSearchActions(); +if (osa != null) { + String[] word = osa.getSearch(); + if (word != null) { + List<FacetTopic> suggestions = osa.getSuggestionList(); + if (suggestions != null) { +%> +<%=osa.getJsonResult()%> +<% + } + } +} +%> Copied: trunk/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp (from rev 313, trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp) =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp (rev 0) +++ trunk/bow-ui/src/main/webapp/WEB-INF/jsp/temporaryXml.jsp 2011-08-21 18:31:08 UTC (rev 319) @@ -0,0 +1,43 @@ +<%-- + #%L + bow + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/xml" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<%@page import="org.chorem.bow.BowConfig" %> + +<% +String url = BowConfig.getBowUrl(); +%> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" + 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> + <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>