Author: bbrossaud Date: 2010-06-08 17:12:08 +0200 (Tue, 08 Jun 2010) New Revision: 69 Url: http://chorem.org/repositories/revision/bow/69 Log: deleted unused files Removed: trunk/src/main/webapp/home.jsp trunk/src/main/webapp/openSearchResult.jsp trunk/src/main/webapp/preference.jsp trunk/src/main/webapp/search.jsp trunk/src/main/webapp/search2.jsp Modified: trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-06-08 15:07:02 UTC (rev 68) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-06-08 15:12:08 UTC (rev 69) @@ -214,16 +214,6 @@ <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Current permanent token</a></li> <li><a href="bow?action=generateToken">Regenerate permanent token</a></li> </ul> - <div id="add"> - <h2>Add / Modify</h2> - <form id="bookmarkForm" method="POST" action="<%=formAction%>"> - <div class="input"><label>URL</label><input type="text" name="url" value="<%=formLink%>" /></div> - <div class="input"><label>ALIAS</label><input type="text" name="alias" value="<%=formAlias%>" /></div> - <div class="input"><label>DESC</label><input type="text" name="name" value="<%=formName%>" /></div> - <div class="input"><label>TAGS</label><input type="text" name="tags" value="<%=formTags%>" /></div> - <button>Save</button> - </form> - </div> <div id="nuage"> <% if (bookmarkActions != null) { List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud(); @@ -271,6 +261,16 @@ </form> <a href="bow?action=exportBookmarks">Export bookmarks</a> </div> + <div id="add"> + <h2>Add / Modify</h2> + <form id="bookmarkForm" method="POST" action="<%=formAction%>"> + <div class="input"><label>URL</label><input type="text" name="url" value="<%=formLink%>" /></div> + <div class="input"><label>ALIAS</label><input type="text" name="alias" value="<%=formAlias%>" /></div> + <div class="input"><label>DESC</label><input type="text" name="name" value="<%=formName%>" /></div> + <div class="input"><label>TAGS</label><input type="text" name="tags" value="<%=formTags%>" /></div> + <button>Save</button> + </form> + </div> <div class="colonnebas"></div> </div> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-06-08 15:07:02 UTC (rev 68) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-06-08 15:12:08 UTC (rev 69) @@ -148,16 +148,6 @@ <li><a 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='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Regenerate permanent token</a></li> </ul> - <div id="add"> - <h2>Add / Modify</h2> - <form id="bookmarkForm" method="POST" action="<%=formAction%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <div class="input"><label>URL</label><input type="text" name="url" value="<%=formLink%>" /></div> - <div class="input"><label>ALIAS</label><input type="text" name="alias" value="<%=formAlias%>" /></div> - <div class="input"><label>DESC</label><input type="text" name="name" value="<%=formName%>" /></div> - <div class="input"><label>TAGS</label><input type="text" name="tags" value="<%=formTags%>" /></div> - <button>Save</button> - </form> - </div> <div id="nuage"> <% if (bookmarkActions != null) { List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud(); @@ -206,6 +196,16 @@ </form> <a href="bow?action=exportBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Export bookmarks</a> </div> + <div id="add"> + <h2>Add / Modify</h2> + <form id="bookmarkForm" method="POST" action="<%=formAction%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> + <div class="input"><label>URL</label><input type="text" name="url" value="<%=formLink%>" /></div> + <div class="input"><label>ALIAS</label><input type="text" name="alias" value="<%=formAlias%>" /></div> + <div class="input"><label>DESC</label><input type="text" name="name" value="<%=formName%>" /></div> + <div class="input"><label>TAGS</label><input type="text" name="tags" value="<%=formTags%>" /></div> + <button>Save</button> + </form> + </div> <div class="colonnebas"></div> </div> Deleted: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-06-08 15:07:02 UTC (rev 68) +++ trunk/src/main/webapp/home.jsp 2010-06-08 15:12:08 UTC (rev 69) @@ -1,284 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.chorem.bow.Bookmark" %> -<%@page import="org.chorem.bow.BookmarkActions" %> -<%@page import="java.text.SimpleDateFormat" %> -<%@page import="java.util.Iterator" %> -<%@page import="java.util.Set" %> -<%@page import="java.util.ArrayList" %> -<%@page import="java.util.List" %> -<%@page import="org.chorem.bow.TokenActions" %> -<%@page import="org.nuiton.wikitty.FacetTopic" %> - -<% - TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); - BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); - if (tokenActions != null && bookmarkActions != null) { - String temporaryToken = tokenActions.getTemporaryToken(); - String permanentToken = tokenActions.getPermanentToken(); - String url = (String) request.getAttribute("bowUrl"); - - String formLink = (String) request.getAttribute("link"); - String formName = (String) request.getAttribute("name"); - String formBookmarkId = (String) request.getAttribute("bookmarkId"); - String formTags = (String) request.getAttribute("tags"); - String formAlias = (String) request.getAttribute("alias"); - String formButton = (String) request.getAttribute("button"); - String formAction = (String) request.getAttribute("action"); - - if (formLink == null) { - formLink = "URL"; - } - if (formName == null) { - formName = "name"; - } - if (formTags == null) { - formTags = "tag1 tag2..."; - } - if (formAlias == null) { - formAlias = "alias"; - } - if (formButton == null) { - formButton = "Add"; - } - if (formAction == null) { - formAction = "bow?action=addUrl"; - } -%> -<body> - <div id="table"> - <h1 class="result"> - <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a> - Home - </h1> - <% - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { - %> - <h2 class="result">The most used bookmarks</h2> - - <% - for (Bookmark bookmark : bookmarkList) { - String link = bookmark.getLink(); - link = link.replace("'", "\\'"); - %> - <table class="result"> - <tr class="result"> - <th> - - <div style="float: left"> - <input type="image" src="img/img.png" title="bookmark" /> - <%=bookmark.getAlias()%> - (<%=sdf.format(bookmark.getDate())%>) - </div> - - <div style="float: right"> - <a style="border:none;text-decoration: none" href="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>" onclick="return modify('<%=bookmark.getDescription()%>', '<%=bookmark.getAlias()%>', '<%=BookmarkActions.getBookmarkTagsString(bookmark)%>', '<%=link%>', 'bow?action=modifyBookmark&bookmarkId=<%=bookmark.getWikittyId()%>', '<%=bookmark.getWikittyId()%>');"> - <IMG style="border:none;" src="img/edit.png" title="Edit" ALT="Edit Bookmark" /> - </a> - <a style="border:none;text-decoration: none" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>"> - <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> - </a> - </div> - - </th> - </tr> - - <tr> - <td class="result"> - <div class="test"> - Clicks: - <br /> - <%=bookmark.getClick()%> - </div> - <div style="float: left; margin: 5px;"> - <input type="image" src="img/img.png" title="bookmark" /> - </div> - - <div style="float: left;margin: 5px"> - <a title ="<%=bookmark.getLink()%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> - <br /> - tags : - <% - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - int count = 0; - for (String tag : tagList) { - if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) { - %> - <a id="<%=bookmark.getWikittyId() + count%>" style="text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>" > - <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <%} else {%> - <a id="<%=bookmark.getWikittyId() + count%>" style="display:none; text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>" > - <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <%}%> - <a href="bow?action=search&searchLine=<%=tag%>" style="text-decoration: none"><%=tag%></a> - <% - ++count; - } - %> - </div> - </td> - <% - } - %> - </tr> - <br /> - </table> - - <% - } - } else { - %> - <h2 class="result">No Bookmarks</h2> - <% } - %> - <% - List<Bookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); - if (!lastBookmarks.isEmpty()) { - %> - <h2 class="result">The last addition bookmarks</h2> - <% - for (Bookmark bookmark : lastBookmarks) { - String link = bookmark.getLink(); - link = link.replace("'", "\\'"); - %> - <table class="result"> - <tr class="result"> - <th> - - <div style="float: left"> - <input type="image" src="img/img.png" title="bookmark" /> - <%=bookmark.getAlias()%> - (<%=sdf.format(bookmark.getDate())%>) - </div> - - <div style="float: right"> - <a style="border:none;text-decoration: none" href="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>" onclick="return modifyLast('<%=bookmark.getDescription()%>', '<%=bookmark.getAlias()%>', '<%=BookmarkActions.getBookmarkTagsString(bookmark)%>', '<%=link%>', 'bow?action=modifyBookmark&bookmarkId=<%=bookmark.getWikittyId()%>', '<%=bookmark.getWikittyId()%>');"> - <IMG style="border:none;" src="img/edit.png" title="Edit" ALT="Edit Bookmark" /> - </a> - <a style="border:none;text-decoration: none" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>"> - <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> - </a> - </div> - - </th> - </tr> - - <tr> - <td class="result"> - <div class="test"> - Clicks: - <br /> - <%=bookmark.getClick()%> - </div> - <div style="float: left; margin: 5px;"> - <input type="image" src="img/img.png" title="bookmark" /> - </div> - - <div style="float: left;margin: 5px"> - <a title ="<%=bookmark.getLink()%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> - <br /> - tags : - <% - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - int count = 0; - for (String tag : tagList) { - if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) { - %> - <a id="<%=count + bookmark.getWikittyId()%>" style="text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>" > - <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <%} else {%> - <a id="<%=count + bookmark.getWikittyId()%>" style="display:none; text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>" > - <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <%}%> - <a href="bow?action=search&searchLine=<%=tag%>" style="text-decoration: none"><%=tag%></a> - <% - ++count; - } - %> - </div> - </td> - <% - } - %> - </tr> - <br /> - </table> - - <% - } - } else { - %> - <h2 class="result">No Bookmarks</h2> - <% } - %> - - </div> - <div id="menu"> - <div class="menu"> - <ul id="meta"> - <li><a href="bow?action=logout">Logout</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Temporary token</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Current permanent token</a></li> - <li><a href="bow?action=generateToken">Regenerate permanent token</a></li> - </ul> - </div> - <div class="menu"> - <form id="bookmarkForm" method="POST" action="<%=formAction%>"> - URL<br /> - <input type="text" name="url" size="20" value="<%=formLink%>" /><br /> - Name<br /> - <input type="text" name="name" size="20" value="<%=formName%>" /><br /> - Tags<br /> - <input type="text" name="tags" size="20" value="<%=formTags%>" /><br /> - Alias<br /><input type="text" name="alias" size="20" value="<%=formAlias%>" /><br /> - <input type="submit" name="submit" value="<%=formButton%>" /> - </form> - </div> - - <div class="menu"> - <div class="tagCloud"> - <% if (bookmarkActions - != null) { - List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud(); - for (FacetTopic tag : tagCloud) { - int value = tag.getCount(); - String tagName = tag.getTopicName(); - int font = bookmarkActions.getFont(value); - %> - <a href="bow?action=search&addTag=<%=tagName%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a> - <% - } - } - %> - <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;"> - <input style="float: left" type="text" name="searchLine" size="15" /> - <input style="float: left;" type="submit" value="Find" /> - </form> - </div> - </div> - <div class="menu"> - <form method="POST" action="bow?action=fullText" style="text-align: center;"> - Full text research - <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>"/> - <input style="float: left;" type="submit" value="Find" /> - </form> - </div> - <div class="menu"> - <form method="POST" action="bow?action=importBookmarks" enctype="multipart/form-data"> - Import Bookmarks - <input type="file" name="upfile" /> - <input type="submit" value="Import"/> - </form> - <br /> - <a href="bow?action=exportBookmarks">Export bookmarks</a> - </div> - </div> -</body> -<%}%> \ No newline at end of file Deleted: trunk/src/main/webapp/openSearchResult.jsp =================================================================== --- trunk/src/main/webapp/openSearchResult.jsp 2010-06-08 15:07:02 UTC (rev 68) +++ trunk/src/main/webapp/openSearchResult.jsp 2010-06-08 15:12:08 UTC (rev 69) @@ -1,99 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.chorem.bow.Bookmark" %> -<%@page import="org.chorem.bow.BookmarkActions" %> -<%@page import="java.text.SimpleDateFormat" %> -<%@page import="java.util.Iterator" %> -<%@page import="java.util.Set" %> -<%@page import="java.util.ArrayList" %> -<%@page import="java.util.List" %> -<%@page import="org.chorem.bow.TokenActions" %> - -<% - BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); - if (bookmarkActions != null) { - String searchLine = ""; - if (bookmarkActions != null) { - searchLine = bookmarkActions.getSearchLine(); - } - String version = (String) request.getAttribute("version"); - String url = (String) request.getAttribute("bowUrl"); -%> - -<html> - <jsp:include page="header.jsp" flush="true"> - <jsp:param name="bowUrl" value="<%=url%>"/> - </jsp:include> - <body> - <div id="mainbodyback" class="clearfix"> - <div id="mainbody"> - - <div id="content"> - <div class="menu clearfix"><p>Result</p> - <form method="POST" action="bow?action=orderOS&searchLine=<%=searchLine%>"> - <label>Order By :</label> - <select name="type"> - <option value="ascName">Asc Name</option> - <option value="descName">Desc Name</option> - <option value="ascClick">Asc Click</option> - <option value="descClick">Desc Click</option> - <option value="ascDate">Asc Date</option> - <option value="descDate">Desc Date</option> - </select> - <button type="submit">OK</button> - </form> - </div> - <div id="contenu"> - <% - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { - String link = bookmark.getLink(); - link = link.replace("'", "\\'"); - %> - <body> - <div class="bookmark"> - <div class="bookmarkhead clearfix"> - <a href="<%=url + bookmark.getAlias()%>" title="<%=url + bookmark.getAlias()%>" target="_blank"> - <%=bookmark.getAlias()%> - </a> - <span> (<%=sdf.format(bookmark.getDate())%>)</span> - </div> - <div class="bookmarkcontenu clearfix"> - <div class="screenshot"></div> - <div class="description"> - <h3>Description :</h3> - <p><a title ="<%=bookmark.getLink()%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a></p> - <p class="tags"><strong>Tags :</strong> - <% - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - for (String tag : tagList) { - %> - <%=tag%> - <% - } - } - %> - </p> - </div> - <div class="click"><%=bookmark.getClick()%></div> - </div> - </div> - <% - } - } else { - %> - <h2>No Bookmarks</h2> - <%}%> - </div> - </div> - </div> - </div> - <jsp:include page="footer.jsp" flush="true" > - <jsp:param name="bowUrl" value="<%=url%>" /> - <jsp:param name="version" value="<%=version%>" /> - </jsp:include> - </body> -</html> -<%}%> \ No newline at end of file Deleted: trunk/src/main/webapp/preference.jsp =================================================================== --- trunk/src/main/webapp/preference.jsp 2010-06-08 15:07:02 UTC (rev 68) +++ trunk/src/main/webapp/preference.jsp 2010-06-08 15:12:08 UTC (rev 69) @@ -1,34 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.chorem.bow.Preference" %> -<% - String error = (String) request.getAttribute("msgError"); - String url = (String) request.getAttribute("bowUrl"); - String version = (String) request.getAttribute("version"); - Preference preference = (Preference) request.getAttribute("preference"); - User user = session.getAttribute("user"); -%> - -<html> - <jsp:include page="header.jsp" flush="true"> - <jsp:param name="bowUrl" value="<%=url%>"/> - </jsp:include> - <body> - <h1 class="login">Login</h1> - <form method="POST" action="bow?action=login"> - email <input type="text" name="email" size="20"> - <br /> - password <input type=password name="password" size="20"> - <br /> - <input type="submit" value="login"> - </form> - <a href="bow?action=registration">register</a> - <br /> - <%if (error != null) {%> - <font color="red"><%=error%></font> - <%}%> - <jsp:include page="footer.jsp" flush="true" > - <jsp:param name="bowUrl" value="<%=url%>" /> - <jsp:param name="version" value="<%=version%>" /> - </jsp:include> - </body> -</html> \ No newline at end of file Deleted: trunk/src/main/webapp/search.jsp =================================================================== --- trunk/src/main/webapp/search.jsp 2010-06-08 15:07:02 UTC (rev 68) +++ trunk/src/main/webapp/search.jsp 2010-06-08 15:12:08 UTC (rev 69) @@ -1,193 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.chorem.bow.Bookmark" %> -<%@page import="org.chorem.bow.BookmarkActions" %> -<%@page import="java.text.SimpleDateFormat" %> -<%@page import="java.util.Iterator" %> -<%@page import="java.util.Set" %> -<%@page import="java.util.ArrayList" %> -<%@page import="java.util.List" %> -<%@page import="org.chorem.bow.TokenActions" %> -<%@page import="org.nuiton.wikitty.FacetTopic" %> - -<% - TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); - BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); - if (tokenActions != null && bookmarkActions != null) { - String temporaryToken = tokenActions.getTemporaryToken(); - String permanentToken = tokenActions.getPermanentToken(); - String searchLine = bookmarkActions.getSearchLine(); - String fullText = bookmarkActions.getFullTextLine(); - String url = (String) request.getAttribute("bowUrl"); -%> - -<body> - <div id="table"> - <h1 class="result"> - <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a> - My Bookmarks - </h1> - <% - if (bookmarkActions != null) { - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { - %> - <table class="result"> - <tr class="result"> - <th class="result remove">Remove</th> - <th class="result date"> - Date - <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" > - <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> - </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - </th> - <th class="result name"> - Name - <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> - </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - </th> - <th class ="result tags">Tags</th> - <th class=" result click"> - Click - <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> - </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - </th> - </tr> - <% - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { - %> - <tr class="result"> - <td class="result"> - <a style="border:none;" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> - </a> - </td> - <td class="result"> - <%=sdf.format(bookmark.getDate())%> - </td> - <% - String alias = bookmark.getAlias(); - if (alias != null && !alias.isEmpty()) { - alias = url + "alias/" + alias; - } - %> - <td class="result"> - <a title ="<%=alias%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> - <form method="POST" action="bow?action=addAlias&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" style="display: inline"> - <input type="text" name="alias" size="10" value="<%=bookmark.getAlias()%>" /> - <input style="display: inline;" type="submit" value="Add alias" /> - </form> - <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <input type="text" name="name" size="35" value="<%=bookmark.getDescription()%>" /> - <input type="image" src="img/edit.png" title="Edit"/> - </form> - </td> - <td class="result" style="text-align: left"> - <% - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - for (String tag : tagList) { - %> - <div style="display: inline"> - <a style="text-decoration:none" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <a href="bow?action=search&addTag=<%=tag%>&searchLine=<%=searchLine%>" style="text-decoration: none"><%=tag%></a> - </div> - <% - } - } - %> - <form method="POST" action="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <input type="text" name="tags" size="35" value="<%=BookmarkActions.getBookmarkTagsString(bookmark)%>" /> - <input type="image" src="img/edit.png" title="Edit"/> - </form> - </td> - <td class="result"> - <%=bookmark.getClick()%> - </td> - </tr> - <% - } - %> - </table> - <% - } else { - %> - <h2 class="result">No Bookmarks</h2> - <% } - } - %> - </div> - <div id="menu"> - <div class="menu"> - <ul id="meta"> - <li><a href="bow?action=logout">Logout</a></li> - <li><a href="bow?action=home">Home</a></li> - <li><a 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='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> - <li><a 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='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> - <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Regenerate permanent token</a></li> - </ul> - </div> - <div class="menu"> - <form method="POST" action="bow?action=addUrl&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - URL<br /> - <input type="text" name="url" size="20" value="URL" /><br /> - Name<br /> - <input type="text" name="name" size="20" value="name" /><br /> - Tags<br /> - <input type="text" name="tags" size="20" value="tag1 tag2..." /><br /> - <input name="submit" type="submit" value="add" /> - </form> - </div> - - <div class="menu"> - <div class="tagCloud"> - <% if (bookmarkActions != null) { - List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud(); - for (FacetTopic tag : tagCloud) { - int value = tag.getCount(); - String tagName = tag.getTopicName(); - int font = bookmarkActions.getFont(value); - %> - <a href="bow?action=search&addTag=<%=tagName%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a> - <% - } - } - %> - <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;"> - <input style="float: left" type="text" name="searchLine" size="15" value="<%=searchLine%>" /> - <input style="float: left" type="submit" value="Find" /> - </form> - </div> - <div class="menu"> - <form method="POST" action="bow?action=fullText" style="text-align: center;"> - Full text research - <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>" /> - <input style="float: left;" type="submit" value="Find" /> - </form> - </div> - <div class="menu"> - <form method="post" action="bow?action=importBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" enctype="multipart/form-data"> - Import Bookmarks - <input type="file" name="upfile" /> - <input type="submit" value="Import"/> - </form> - <br /> - <a href="bow?action=exportBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Export bookmarks</a> - </div> - </div> - </div> -</body> -<%}%> \ No newline at end of file Deleted: trunk/src/main/webapp/search2.jsp =================================================================== --- trunk/src/main/webapp/search2.jsp 2010-06-08 15:07:02 UTC (rev 68) +++ trunk/src/main/webapp/search2.jsp 2010-06-08 15:12:08 UTC (rev 69) @@ -1,224 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.chorem.bow.Bookmark" %> -<%@page import="org.chorem.bow.BookmarkActions" %> -<%@page import="java.text.SimpleDateFormat" %> -<%@page import="java.util.Iterator" %> -<%@page import="java.util.Set" %> -<%@page import="java.util.ArrayList" %> -<%@page import="java.util.List" %> -<%@page import="org.chorem.bow.TokenActions" %> -<%@page import="org.nuiton.wikitty.FacetTopic" %> - -<% - TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); - BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); - if (tokenActions != null && bookmarkActions != null) { - String temporaryToken = tokenActions.getTemporaryToken(); - String permanentToken = tokenActions.getPermanentToken(); - String searchLine = bookmarkActions.getSearchLine(); - String fullText = bookmarkActions.getFullTextLine(); - String url = (String) request.getAttribute("bowUrl"); - - String formLink = (String) request.getAttribute("link"); - String formName = (String) request.getAttribute("name"); - String formBookmarkId = (String) request.getAttribute("bookmarkId"); - String formTags = (String) request.getAttribute("tags"); - String formAlias = (String) request.getAttribute("alias"); - String formButton = (String) request.getAttribute("button"); - String formAction = (String) request.getAttribute("action"); - - if (formLink == null) { - formLink = "URL"; - } - if (formName == null) { - formName = "name"; - } - if (formTags == null) { - formTags = "tag1 tag2..."; - } - if (formAlias == null) { - formAlias = "alias"; - } - if (formButton == null) { - formButton = "Add"; - } - if (formAction == null) { - formAction = "bow?action=addUrl"; - } -%> - -<body> - <div id="table"> - <h1 class="result"> - <a style="float: left;font-size: 12px; margin-left: 10px;" href="<%=url%>bow?action=home">home</a> - My Bookmarks - </h1> - <div style="text-align: center"> - Date - <a style="text-decoration:none" href="bow?action=orderAsc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" > - <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> - </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=date&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - Name - <a style="text-decoration:none" href="bow?action=orderAsc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> - </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=name&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - Click - <a style="text-decoration:none" href="bow?action=orderAsc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/asc.png" ALT="order ASC" TITLE="Asc" /> - </a> - <a style="text-decoration:none" href="bow?action=orderDesc&type=click&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none" SRC="img/desc.png" ALT="order DESC" TITLE="Desc" /> - </a> - </div> - <br /> - <% - List<Bookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - for (Bookmark bookmark : bookmarkList) { - String link = bookmark.getLink(); - link = link.replace("'", "\\'"); - %> - <table class="result"> - <tr class="result"> - <th> - - <div style="float: left"> - <input type="image" src="img/img.png" title="bookmark" /> - <%=bookmark.getAlias()%> - (<%=sdf.format(bookmark.getDate())%>) - </div> - - <div style="float: right"> - <a style="border:none;text-decoration: none" href="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" onclick="return modify('<%=bookmark.getDescription()%>', '<%=bookmark.getAlias()%>', '<%=BookmarkActions.getBookmarkTagsString(bookmark)%>', '<%=link%>', 'bow?action=modifyBookmark&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>&bookmarkId=<%=bookmark.getWikittyId()%>', '<%=bookmark.getWikittyId()%>');"> - <IMG style="border:none;" src="img/edit.png" title="Edit" ALT="Edit Bookmark" /> - </a> - <a style="border:none;text-decoration: none" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - <IMG style="border:none;" SRC="img/remove.png" ALT="Remove bookmark" TITLE="Remove" /> - </a> - </div> - - </th> - </tr> - - <tr> - <td class="result"> - <div class="test"> - Clicks: - <br /> - <%=bookmark.getClick()%> - </div> - <div style="float: left; margin: 5px;"> - <input type="image" src="img/img.png" title="bookmark" /> - </div> - - <div style="float: left;margin: 5px"> - <a title ="<%=bookmark.getLink()%>" href="bow?action=addClick&bookmarkId=<%=bookmark.getWikittyId()%>" target="_blank"><%=bookmark.getDescription()%></a> - <br /> - tags : - <% - Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) { - int count = 0; - for (String tag : tagList) { - if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) { - %> - <a id="<%=bookmark.getWikittyId() + count%>" style="text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" > - <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <%} else {%> - <a id="<%=bookmark.getWikittyId() + count%>" style="display:none; text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" > - <IMG style="border:none;" SRC="img/delete.png" ALT="Delete tag" TITLE="Delete" /> - </a> - <%}%> - <a href="bow?action=search&searchLine=<%=tag%>" style="text-decoration: none;"><%=tag%></a> - <% - ++count; - } - %> - </div> - </td> - <% - } - %> - </tr> - </table> - <br /> - <% - } - } else { - %> - <h2 class="result">No Bookmarks</h2> - <% } - %> - </div> - - <div id="menu"> - <div class="menu"> - <ul id="meta"> - <li><a href="bow?action=logout">Logout</a></li> - <li><a href="bow?action=home">Home</a></li> - <li><a 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='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> - <li><a 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='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> - <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Regenerate permanent token</a></li> - </ul> - </div> - <div class="menu"> - <form id="bookmarkForm" method="POST" action="<%=formAction%>&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>"> - URL<br /> - <input type="text" name="url" size="20" value="<%=formLink%>" /><br /> - Name<br /> - <input type="text" name="name" size="20" value="<%=formName%>" /><br /> - Tags<br /> - <input type="text" name="tags" size="20" value="<%=formTags%>" /><br /> - Alias<br /> - <input type="text" name="alias" size="20" value="<%=formAlias%>" /><br /> - <input type="submit" name="submit" value="<%=formButton%>" /> - </form> - </div> - - <div class="menu"> - <div class="tagCloud"> - <% if (bookmarkActions != null) { - List<FacetTopic> tagCloud = bookmarkActions.getTagsCloud(); - for (FacetTopic tag : tagCloud) { - int value = tag.getCount(); - String tagName = tag.getTopicName(); - int font = bookmarkActions.getFont(value); - %> - <a href="bow?action=search&addTag=<%=tagName%>&searchLine=<%=searchLine%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a> - <% - } - } - %> - <form method="POST" action="bow?action=search" style="text-align: center;margin-left: 20px;"> - <input style="float: left" type="text" name="searchLine" size="15" value="<%=searchLine%>" /> - <input style="float: left" type="submit" value="Find" /> - </form> - </div> - <div class="menu"> - <form method="POST" action="bow?action=fullText" style="text-align: center;"> - Full text research - <input style="float: left" type="text" name="fullTextLine" size="15" value="<%=bookmarkActions.getFullTextLine()%>" /> - <input style="float: left;" type="submit" value="Find" /> - </form> - </div> - <div class="menu"> - <form method="post" action="bow?action=importBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>" enctype="multipart/form-data"> - Import Bookmarks - <input type="file" name="upfile" /> - <input type="submit" value="Import"/> - </form> - <br /> - <a href="bow?action=exportBookmarks&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Export bookmarks</a> - </div> - </div> - </div> -</body> -<%}%> \ No newline at end of file