Author: bpoussin Date: 2011-04-20 15:25:07 +0200 (Wed, 20 Apr 2011) New Revision: 247 Url: http://chorem.org/repositories/revision/bow/247 Log: suppression des tabulations et reformatage Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp Modified: trunk/bow-ui/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 13:15:52 UTC (rev 246) +++ trunk/bow-ui/src/main/webapp/jsp/home.jsp 2011-04-20 13:25:07 UTC (rev 247) @@ -35,99 +35,97 @@ BowPreference preference = bowSession.getPreference(); if (bookmarkActions != null) { - %> - <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.home.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.home.mostUsedBookmarks" /></h2> - </div> - <div class="content"> - <% - int nbBookmarks = preference.getBookmarks(); - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); - if (!bookmarkList.isEmpty()) { - int count = 0; - for (BowBookmark bookmark : bookmarkList) { - request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); - %> - <s:include value="inc/bookmark.jsp" /> - <% - ++count; - if (count >= nbBookmarks) { - break; - } - } - } - else { %> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - <% } %> - </div> - - <div class="menu clearfix"> - <h2><s:text name="bow.home.latestBookmarks" /></h2> - </div> - <div class="content"> - <% - List<BowBookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); - - if (!lastBookmarks.isEmpty()) { - int count = 0; - for (BowBookmark bookmark : lastBookmarks) { - request.setAttribute("bookmark", bookmark); - request.setAttribute("sdf", sdf); - %> - <s:include value="inc/bookmark.jsp" /> - <% - ++count; - if (count >= nbBookmarks) { - break; - } - } - } - else { %> - <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> - <% } %> - </div> +%> +<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.home.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.home.mostUsedBookmarks" /></h2> + </div> + <div class="content"> + <% + int nbBookmarks = preference.getBookmarks(); + + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + List<BowBookmark> bookmarkList = bookmarkActions.getBookmarks(); + if (!bookmarkList.isEmpty()) { + int count = 0; + for (BowBookmark bookmark : bookmarkList) { + request.setAttribute("bookmark", bookmark); + request.setAttribute("sdf", sdf); + %> + <s:include value="inc/bookmark.jsp" /> + <% + ++count; + if (count >= nbBookmarks) { + break; + } + } + } else { %> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + <% } %> + </div> + + <div class="menu clearfix"> + <h2><s:text name="bow.home.latestBookmarks" /></h2> + </div> + <div class="content"> + <% + List<BowBookmark> lastBookmarks = bookmarkActions.getLastBookmarks(); - <script> - $(function() { - $( "#setPublicAliasPopup" ).dialog({ - autoOpen: false, - height: 100, - width: 200, - modal: true, - buttons: { - "Validate": function() { - var bValid = true; - $("#setPublicAliasForm").submit(); - $( this ).dialog( "close" ); - }, - Cancel: function() { - $( this ).dialog( "close" ); - } + if (!lastBookmarks.isEmpty()) { + int count = 0; + for (BowBookmark bookmark : lastBookmarks) { + request.setAttribute("bookmark", bookmark); + request.setAttribute("sdf", sdf); + %> + <s:include value="inc/bookmark.jsp" /> + <% + ++count; + if (count >= nbBookmarks) { + break; + } + } + } else { %> + <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> + <% } %> + </div> + + <script> + $(function() { + $( "#setPublicAliasPopup" ).dialog({ + autoOpen: false, + height: 100, + width: 200, + modal: true, + buttons: { + "Validate": function() { + var bValid = true; + $("#setPublicAliasForm").submit(); + $( this ).dialog( "close" ); }, - close: function() { - //allFields.val( "" ).removeClass( "ui-state-error" ); + Cancel: function() { + $( this ).dialog( "close" ); } - }); + }, + close: function() { + //allFields.val( "" ).removeClass( "ui-state-error" ); + } }); - </script> - <div id="setPublicAliasPopup" title="Enter the public alias"> - <s:form id="setPublicAliasForm" action="createAlias"> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> - <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> - </s:form> - </div> - </body> - </html> + }); + </script> + <div id="setPublicAliasPopup" title="Enter the public alias"> + <s:form id="setPublicAliasForm" action="createAlias"> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> + <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> + </s:form> + </div> + </body> +</html> <% } %>