r173 - in trunk/src/main/webapp: WEB-INF/decorators jsp
Author: vbriand Date: 2011-01-14 15:25:43 +0100 (Fri, 14 Jan 2011) New Revision: 173 Url: http://chorem.org/repositories/revision/bow/173 Log: Fixed the major design issue when logged in Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/jsp/home.jsp trunk/src/main/webapp/jsp/preferences.jsp trunk/src/main/webapp/jsp/search.jsp Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-14 13:24:54 UTC (rev 172) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-01-14 14:25:43 UTC (rev 173) @@ -23,11 +23,14 @@ <body id="page-home"> <div id="wrap"> <div id="page"> - <%@include file="/jsp/inc/header.jsp" %> + <%@include file="/jsp/inc/header.jsp" %> <div id="main"> - <%@include file="/jsp/inc/errorFrame.jsp" %> - <decorator:body /> - </div> + <%@include file="/jsp/inc/errorFrame.jsp" %> + <decorator:body /> + </div> + <s:if test="#session.user"> + <jsp:include page="/jsp/inc/rightMenu.jsp" /> + </s:if> </div> </div> <%@include file="/jsp/inc/footer.jsp" %> Modified: trunk/src/main/webapp/jsp/home.jsp =================================================================== --- trunk/src/main/webapp/jsp/home.jsp 2011-01-14 13:24:54 UTC (rev 172) +++ trunk/src/main/webapp/jsp/home.jsp 2011-01-14 14:25:43 UTC (rev 173) @@ -104,7 +104,6 @@ <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> <% } %> </div> - <jsp:include page="inc/rightMenu.jsp" /> </body> </html> <% } %> Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-01-14 13:24:54 UTC (rev 172) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-01-14 14:25:43 UTC (rev 173) @@ -39,7 +39,6 @@ <s:head /> </head> <body> - <s:property value="#session.put" /> <div id="content"> <div class="menu clearfix"> <h2><s:text name="bow.preferences.title" /></h2> @@ -113,6 +112,5 @@ } %> </div> - <jsp:include page="inc/rightMenu.jsp" flush="true" /> </body> </html> \ No newline at end of file Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-01-14 13:24:54 UTC (rev 172) +++ trunk/src/main/webapp/jsp/search.jsp 2011-01-14 14:25:43 UTC (rev 173) @@ -50,7 +50,6 @@ <s:head /> </head> <body> - <div id="content"> <div class="menu clearfix"> <h2><s:text name="bow.search.title" /></h2> <s:url id="order" action="order" escapeAmp="false"> @@ -101,7 +100,6 @@ <p class="nobookmarks"><s:text name="bow.bookmarks.noBookmarks" /></p> <% } %> </div> - <jsp:include page="inc/rightMenu.jsp" /> </body> </html> <% } %>
participants (1)
-
vbriand＠users.chorem.org