December 2010 - Bow-commits - mailman.cloud.codelutin.com

r136 - trunk/src/main/java/org/chorem/bow
by vbriand＠users.chorem.org 10 Dec '10

10 Dec '10

Author: vbriand Date: 2010-12-10 16:55:34 +0100 (Fri, 10 Dec 2010) New Revision: 136 Url: http://chorem.org/repositories/revision/bow/136 Log: Removed hard coded alias url Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-12-10 15:38:05 UTC (rev 135) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-12-10 15:55:34 UTC (rev 136) @@ -74,7 +74,6 @@ public class ControllerServlet extends HttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(ControllerServlet.class); - private static final String ALIAS_URL = "http://alias.chorem.org/"; protected String version = ""; protected String bowServletUrl = ""; @@ -386,7 +385,7 @@ response.sendRedirect(searchEngineURL); } else if (searchLine != null && searchLine.startsWith("a:")) { //Alias - response.sendRedirect(ALIAS_URL + searchLine.substring(2)); + response.sendRedirect(BowConfig.getInstance().getAliasUrl() + searchLine.substring(2)); } else { session.setAttribute("user", user); initializeToken(session, user);

1 0

r135 - in trunk/src/main: java/org/chorem/bow webapp webapp/css
by vbriand＠users.chorem.org 10 Dec '10

10 Dec '10

Author: vbriand Date: 2010-12-10 16:38:05 +0100 (Fri, 10 Dec 2010) New Revision: 135 Url: http://chorem.org/repositories/revision/bow/135 Log: Added an alias redirection in the search engine Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/bookmark.jsp trunk/src/main/webapp/css/global.css trunk/src/main/webapp/home.jsp Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-12-10 09:28:35 UTC (rev 134) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-12-10 15:38:05 UTC (rev 135) @@ -74,6 +74,7 @@ public class ControllerServlet extends HttpServlet { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(ControllerServlet.class); + private static final String ALIAS_URL = "http://alias.chorem.org/"; protected String version = ""; protected String bowServletUrl = ""; @@ -384,6 +385,8 @@ searchEngineURL = response.encodeRedirectURL(searchEngineURL); response.sendRedirect(searchEngineURL); + } else if (searchLine != null && searchLine.startsWith("a:")) { //Alias + response.sendRedirect(ALIAS_URL + searchLine.substring(2)); } else { session.setAttribute("user", user); initializeToken(session, user); Modified: trunk/src/main/webapp/bookmark.jsp =================================================================== --- trunk/src/main/webapp/bookmark.jsp 2010-12-10 09:28:35 UTC (rev 134) +++ trunk/src/main/webapp/bookmark.jsp 2010-12-10 15:38:05 UTC (rev 135) @@ -91,6 +91,4 @@ <div class="click"><%=bookmark.getClick()%></div> </div> </div> -<% -} -%> +<% } %> Modified: trunk/src/main/webapp/css/global.css =================================================================== --- trunk/src/main/webapp/css/global.css 2010-12-10 09:28:35 UTC (rev 134) +++ trunk/src/main/webapp/css/global.css 2010-12-10 15:38:05 UTC (rev 135) @@ -63,7 +63,7 @@ margin-bottom:15px; padding:0 40px; line-height:35px; - clear: both; + clear:both; } #main div[class="menu clearfix"] h2{ @@ -80,18 +80,18 @@ } #import .input input{ - width: 90%; - margin-bottom: 10px; + width:90%; + margin-bottom:10px; } .error{ - float: left; + float:left; color:red; font-size:medium; background-color:white; overflow:auto; - margin-bottom: 25px; - padding: 4px; + margin-bottom:25px; + padding:4px; } #footer{ Modified: trunk/src/main/webapp/home.jsp =================================================================== --- trunk/src/main/webapp/home.jsp 2010-12-10 09:28:35 UTC (rev 134) +++ trunk/src/main/webapp/home.jsp 2010-12-10 15:38:05 UTC (rev 135) @@ -72,7 +72,7 @@ </div> <div class="menu clearfix"> - <h2>The last addition bookmarks</h2> + <h2>The latest added bookmarks</h2> </div> <div class="content"> <%

1 0

r134 - trunk/src/main/webapp/css
by vbriand＠users.chorem.org 10 Dec '10

10 Dec '10

Author: vbriand Date: 2010-12-10 10:28:35 +0100 (Fri, 10 Dec 2010) New Revision: 134 Url: http://chorem.org/repositories/revision/bow/134 Log: The clicks counter doesn't overlap the tags anymore when the screen resolution is very narrow The right menu links don't overlap when the screen resolution is narrow Modified: trunk/src/main/webapp/css/bookmark.css Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-12-09 17:39:38 UTC (rev 133) +++ trunk/src/main/webapp/css/bookmark.css 2010-12-10 09:28:35 UTC (rev 134) @@ -177,7 +177,7 @@ width:100%; line-height:28px; padding-top:10px; - margin-bottom: -140px; + margin-bottom:-90px; } .bookmark .click{ @@ -240,8 +240,8 @@ } #colonneD{ - overflow-x: auto; - background-color: #804561; + overflow-x:auto; + background-color:#804561; } #colonneD a{ @@ -256,7 +256,7 @@ #colonneD ul.droite li{ list-style:none; - height:22px; + height:auto; font-size:100%; } @@ -343,8 +343,8 @@ } #import .input input{ - width: 90%; - margin-bottom: 10px; + width:90%; + margin-bottom:10px; } .formFrame{ @@ -352,14 +352,14 @@ height:315px; background:url('/bow/img/fondconnexion.jpg') no-repeat; position:relative; - margin-top: 20px; - margin-bottom: 20px; - margin-right: 100px; - margin-left: 100px; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 40px; - padding-right: 70px; + margin-top:20px; + margin-bottom:20px; + margin-right:100px; + margin-left:100px; + padding-top:10px; + padding-bottom:10px; + padding-left:40px; + padding-right:70px; } .formFrame h1{ @@ -382,7 +382,7 @@ } .formFrame input[type="submit"]{ - float: left; + float:left; margin-top:20px; background:url('/bow/img/fdboutonV.jpg') repeat-x; height:31px; @@ -391,67 +391,67 @@ font-weight:bold; border:none; width:auto; - padding: 2px; + padding:2px; } .formFrame p a{ - position: absolute; + position:absolute; color:#804561; left:75px; font-weight:bold; - font-size: 12px; - margin-top: 2px; + font-size:12px; + margin-top:2px; } .formFrame #homePage, .formFrame #regenPermToken{ - bottom: 50px; - left: 185px; - font-size: 10px; + bottom:50px; + left:185px; + font-size:10px; } .formFrame p input{ - margin-bottom: 2px; + margin-bottom:2px; } .deleteImport{ - width: 100%; - height: 32px; - border: 1px solid black; - margin-bottom: 4px; + width:100%; + height:32px; + border:1px solid black; + margin-bottom:4px; padding-top:10px; - padding-left: 15px; + padding-left:15px; } .deleteImportPink{ - background-color: #BF8A9C; + background-color:#BF8A9C; } .deleteImportWhite{ - background-color: white; - margin-left: 30px; + background-color:white; + margin-left:30px; } .deleteImport span{ - color: blue; - font-size: large; + color:blue; + font-size:large; } .deleteImport .deleteImportButton{ - background: url('/bow/img/croixtr.png') no-repeat; - width: 31px; - height: 32px; - float: right; - margin-right: 15px; - position: relative; - top: -5px; + background:url('/bow/img/croixtr.png') no-repeat; + width:31px; + height:32px; + float:right; + margin-right:15px; + position:relative; + top:-5px; } #deleteSearchResultsButton{ - background: url('/bow/img/croixtr.png') no-repeat; - width: 31px; - height: 32px; - float: right; - margin-left: 25px; - margin-right: 11px; + background:url('/bow/img/croixtr.png') no-repeat; + width:31px; + height:32px; + float:right; + margin-left:25px; + margin-right:11px; }

1 0

r133 - in trunk/src/main/webapp: . css
by vbriand＠users.chorem.org 09 Dec '10

09 Dec '10

Author: vbriand Date: 2010-12-09 18:39:38 +0100 (Thu, 09 Dec 2010) New Revision: 133 Url: http://chorem.org/repositories/revision/bow/133 Log: A long list of tags doesn't overlap the following bookmark anymore Modified: trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/tagsCloud.jsp Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-12-09 16:13:01 UTC (rev 132) +++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 17:39:38 UTC (rev 133) @@ -79,8 +79,8 @@ .bookmark{ width:100%; - height: auto; - word-wrap: break-word; + height:auto; + word-wrap:break-word; } .bookmark .bookmarkhead{ @@ -95,7 +95,7 @@ .bookmark .bookmarkcontenu{ clear:both; padding-top:5px; - padding-right: 108px; + padding-right: 132px; } .bookmark .bookmarkhead .date{ @@ -173,7 +173,8 @@ background:url('/bow/img/tag.jpg') no-repeat left center; font-size:12px; padding-left:30px; - height:28px; + height:auto; + width:100%; line-height:28px; padding-top:10px; margin-bottom: -140px; @@ -308,7 +309,7 @@ display:inline-block; padding-right:9%; text-align:right; - width:10%; + width:45px; } #colonneD form input[type="submit"]{ Modified: trunk/src/main/webapp/tagsCloud.jsp =================================================================== --- trunk/src/main/webapp/tagsCloud.jsp 2010-12-09 16:13:01 UTC (rev 132) +++ trunk/src/main/webapp/tagsCloud.jsp 2010-12-09 17:39:38 UTC (rev 133) @@ -40,7 +40,7 @@ String tagName = tag.getTopicName(); int font = bookmarkActions.getFont(value); %> - <a href="bow?action=search&addTag=<%=tagName%><%=search%>" title="<%=value%> results" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a> + <a href="bow?action=search&addTag=<%=tagName%><%=search%>" title="<%=value%> result<%=(value != 1 ? "s" : "")%>" class="tag" style="font-size: <%=font%>px;"><%=tagName%></a> <% ++count; if (count >= nbTags) {

1 0

r132 - trunk/src/main/webapp/css
by vbriand＠users.chorem.org 09 Dec '10

09 Dec '10

Author: vbriand Date: 2010-12-09 17:13:01 +0100 (Thu, 09 Dec 2010) New Revision: 132 Url: http://chorem.org/repositories/revision/bow/132 Log: Fixed the tags cloud display which was bugged on Firefox Modified: trunk/src/main/webapp/css/bookmark.css Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-12-09 15:26:41 UTC (rev 131) +++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 16:13:01 UTC (rev 132) @@ -274,7 +274,7 @@ #colonneD .recherche, #colonneD #import, #colonneD #add{ - padding: 4% 10%; + padding:4% 10%; border-bottom:2px solid #9edcf8; } @@ -284,6 +284,10 @@ font-weight:normal; } +#colonneD #add{ + height:auto; +} + #colonneD #add form{ clear:both; } @@ -297,7 +301,7 @@ width:50%; border:none; height:28px; - padding-left: 4px; + padding-left:4px; } #colonneD #add form label{

1 0

r131 - trunk/src/main/webapp/css
by vbriand＠users.chorem.org 09 Dec '10

09 Dec '10

Author: vbriand Date: 2010-12-09 16:26:41 +0100 (Thu, 09 Dec 2010) New Revision: 131 Url: http://chorem.org/repositories/revision/bow/131 Log: Fixed the links color in the footer Modified: trunk/src/main/webapp/css/global.css Modified: trunk/src/main/webapp/css/global.css =================================================================== --- trunk/src/main/webapp/css/global.css 2010-12-09 15:10:22 UTC (rev 130) +++ trunk/src/main/webapp/css/global.css 2010-12-09 15:26:41 UTC (rev 131) @@ -99,8 +99,11 @@ padding-top:30px; } +#footer a{ + color:#bf8a9c; +} + #footer p{ - color:#bf8a9c; font-size:14px; text-align:center; line-height:50px;

1 0

r130 - in trunk/src/main/webapp: . css
by vbriand＠users.chorem.org 09 Dec '10

09 Dec '10

Author: vbriand Date: 2010-12-09 16:10:22 +0100 (Thu, 09 Dec 2010) New Revision: 130 Url: http://chorem.org/repositories/revision/bow/130 Log: When there is a lot of tags, they are now displayed correctly on the tags cloud Modified: trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/rightMenu.jsp Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-12-09 13:27:00 UTC (rev 129) +++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 15:10:22 UTC (rev 130) @@ -325,7 +325,9 @@ } #colonneD #nuage{ + padding-right:80px; min-height:100px; + text-align:justify; } .colonnebas img{ Modified: trunk/src/main/webapp/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/rightMenu.jsp 2010-12-09 13:27:00 UTC (rev 129) +++ trunk/src/main/webapp/rightMenu.jsp 2010-12-09 15:10:22 UTC (rev 130) @@ -91,7 +91,6 @@ <li><a title="Add this link to your favourites to bookmark others in the future. This link is just available while you are connected on the site!" 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%>?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);">Bookmark add link (session)</a></li> <li><a title="Add this link to your favourites to bookmark others in the future. This link is always available!" 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%>?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);">Bookmark add link (permanent)</a></li> </ul> - <div id="add" class="clearfix"> <h2>Add / Modify</h2> <form id="bookmarkForm" method="post" action="<%=formAction%>"> @@ -102,7 +101,6 @@ <div class="input"><input type="submit" value="Save" /></div> </form> </div> - <div id="nuage"> <% if (searchLine != null) { %> <jsp:include page="tagsCloud.jsp" flush="true">

1 0

r129 - in trunk/src/main: java/org/chorem/bow webapp webapp/css
by vbriand＠users.chorem.org 09 Dec '10

09 Dec '10

Author: vbriand Date: 2010-12-09 14:27:00 +0100 (Thu, 09 Dec 2010) New Revision: 129 Url: http://chorem.org/repositories/revision/bow/129 Log: Fixed css issue when the bookmark description is too long or if there are too many tags Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java trunk/src/main/webapp/bookmark.jsp trunk/src/main/webapp/css/bookmark.css Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java =================================================================== --- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-11-23 10:08:11 UTC (rev 128) +++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-12-09 13:27:00 UTC (rev 129) @@ -68,7 +68,7 @@ try { password = StringUtil.encodeMD5(password); } catch (RuntimeException ex) { - throw new WikittyException("Could not encore password", ex); + throw new WikittyException("Could not encode password", ex); } obj = password; } Modified: trunk/src/main/webapp/bookmark.jsp =================================================================== --- trunk/src/main/webapp/bookmark.jsp 2010-11-23 10:08:11 UTC (rev 128) +++ trunk/src/main/webapp/bookmark.jsp 2010-12-09 13:27:00 UTC (rev 129) @@ -35,17 +35,14 @@ String aliasUrl = BowConfig.getInstance().getServletAliasUrl(); String search = ""; String searchLine = request.getParameter("searchLine"); -if (searchLine != null) -{ +if (searchLine != null) { search += "&searchLine=" + searchLine; } String fullTextLine = request.getParameter("fullTextLine"); -if (fullTextLine != null) -{ +if (fullTextLine != null) { search += "&fullTextLine=" + fullTextLine; } -if (url != null && bookmark != null && sdf != null && bookmarkActions != null) -{ +if (url != null && bookmark != null && sdf != null && bookmarkActions != null) { String formBookmarkId = (String) request.getAttribute("formBookmarkId"); String link = bookmark.getLink(); link = link.replace("'", "\\'"); @@ -70,27 +67,20 @@ <strong>Tags :</strong> <% Set<String> tagList = bookmark.getTags(); - if (tagList != null && !tagList.isEmpty()) - { - for (String tag : tagList) - { - if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) - { + if (tagList != null && !tagList.isEmpty()) { + for (String tag : tagList) { + if (formBookmarkId != null && formBookmarkId.equals(bookmark.getWikittyId())) { %> <a style="text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%><%=search%>"> <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> </a> <% - } - else - { + } else { %> <a name="<%=bookmark.getWikittyId()%>" style="display:none; text-decoration: none;" href="bow?action=deleteTag&bookmarkId=<%=bookmark.getWikittyId()%>&deleteTag=<%=tag%><%=search%>"> <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> <% } Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-11-23 10:08:11 UTC (rev 128) +++ trunk/src/main/webapp/css/bookmark.css 2010-12-09 13:27:00 UTC (rev 129) @@ -79,6 +79,8 @@ .bookmark{ width:100%; + height: auto; + word-wrap: break-word; } .bookmark .bookmarkhead{ @@ -93,6 +95,7 @@ .bookmark .bookmarkcontenu{ clear:both; padding-top:5px; + padding-right: 108px; } .bookmark .bookmarkhead .date{ @@ -155,7 +158,10 @@ margin:5px 5px; color:#999999; font-size:12px; - width:auto; + position: relative; + width: 100%; + top:-80px; + left: 100px; } .bookmark .description h3{ @@ -170,16 +176,17 @@ height:28px; line-height:28px; padding-top:10px; + margin-bottom: -140px; } .bookmark .click{ background:transparent url('/bow/img/click.jpg') no-repeat scroll 0 0; float:right; height:27px; - margin:5% 5px 5px; + margin:5px 5px 5px 5px; padding-top:31px; position:relative; - right:0; + right:-100px; width:31px; text-align:center; } @@ -325,7 +332,7 @@ width:86%; height:auto; display:block; - posit:relative; + position:relative; } #import .input input{

1 0