Author: ssthkjer
Date: 2007-07-11 10:06:33 +0200 (Wed, 11 Jul 2007)
New Revision: 5514
Modified:
trunk/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp
Log:
moved bottom elements outside main table
Modified: trunk/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp
===================================================================
--- trunk/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp
2007-07-10 17:29:28 UTC (rev 5513)
+++ trunk/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp
2007-07-11 08:06:33 UTC (rev 5514)
@@ -14,74 +14,46 @@
<head>
<search:include include="head-element"/>
</head>
-
<body>
-
-
-<search:include include="topBar"/>
-<search:include include="header"/>
-
-<table cellspacing="0" cellpadding="0" id="body_table">
- <tr>
+ <search:include include="topBar"/>
+ <search:include include="header"/>
+ <table cellspacing="0" cellpadding="0" id="body_table">
+ <tr>
<c:choose>
<c:when test="${tab.layout.properties['left-column-hide'] == 'true'}">
- <td valign="top" colspan="3">
- </c:when>
- <c:otherwise>
- <td class="cell_one" valign="top">
- <search:include include="left-col-one"/>
-
- <search:include include="left-col-two"/>
-
- <search:include include="left-col-three"/>
-
- <search:include include="left-col-four"/>
-
- <search:include include="left-col-five"/>
- </td>
- <td class="cell_three" valign="top" colspan="2">
- </c:otherwise>
- </c:choose>
-
- <search:include include="middle-col-one"/>
-
- <search:include include="spellcheck"/>
- <search:include include="middle-col-two"/>
- <search:include include="middle-col-three"/>
- <search:include include="middle-col-four"/>
- <search:include include="middle-col-five"/>
-
- </td>
- <td class="cell_four">
- <search:include include="right-col-one"/>
- <search:include include="right-col-two"/>
- </td>
- </tr>
- <search:include include="bottom-ads"/>
- <c:if test="${tab.layout.properties['offset-pager-hide'] != 'true'}">
- <tr>
- <td> </td>
- <td colspan="2">
- <search:include include="offsetPager"/>
+ <td valign="top" colspan="3">
+ </c:when>
+ <c:otherwise>
+ <td class="cell_one" valign="top">
+ <search:include include="left-col-one"/>
+ <search:include include="left-col-two"/>
+ <search:include include="left-col-three"/>
+ <search:include include="left-col-four"/>
+ <search:include include="left-col-five"/>
</td>
- </tr>
- </c:if>
- <c:if test="${tab.layout.properties['top3-ads-bottom-hide'] != 'true'}">
- <tr>
- <td> </td>
- <td>
- <search:include include="top3-ads-bottom"/>
+ <td class="cell_three" valign="top" colspan="2">
+ </c:otherwise>
+ </c:choose>
+ <search:include include="middle-col-one"/>
+ <search:include include="spellcheck"/>
+ <search:include include="middle-col-two"/>
+ <search:include include="middle-col-three"/>
+ <search:include include="middle-col-four"/>
+ <search:include include="middle-col-five"/>
</td>
- <td> </td>
- </tr>
- </c:if>
-</table>
-<search:include include="verbosePager"/>
-<search:include include="footer"/>
-<search:include include="bottom-one"/>
-
-<search:include include="map-script"/>
-
-<search:include include="gallup"/>
+ <td class="cell_four">
+ <search:include include="right-col-one"/>
+ <search:include include="right-col-two"/>
+ </td>
+ </tr>
+ </table>
+ <search:include include="bottom-ads"/>
+ <search:include include="offsetPager"/>
+ <search:include include="top3-ads-bottom"/>
+ <search:include include="verbosePager"/>
+ <search:include include="footer"/>
+ <search:include include="bottom-one"/>
+ <search:include include="map-script"/>
+ <search:include include="gallup"/>
</body>
</html>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
