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{