Author: ssthkjer
Date: 2006-11-16 13:42:25 +0100 (Thu, 16 Nov 2006)
New Revision: 3968
Modified:
trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
Log:
more logic out of maindecorator
Modified: trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
===================================================================
--- trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
2006-11-16 12:23:13 UTC (rev 3967)
+++ trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
2006-11-16 12:42:25 UTC (rev 3968)
@@ -244,19 +244,16 @@
<%if(q.trim().equals("") && currentC.equals("d") && publish) {%>
<%} else {%>
<td class="cell_four" valign="top" width="225">
- <% if(q.trim().equals("") && currentC.equals("m") &&
vertikal.equals("m")){ %>
- <% } else { %>
- <% if (currentC.equals("p") || currentC.equals("pp") ||
currentC.equals("pip") ) {%>
- <decorator:getProperty property="page.ads"/>
- <decorator:getProperty property="page.ads-logo"/>
- <%}else if (currentC.equals("b") ) {%>
- <decorator:getProperty property="page.feedback"/>
- <%} else if (currentC.equals("t")) {%>
- <decorator:getProperty property="page.tvSearchWebTv"/>
- <decorator:getProperty property="page.ads"/>
- <%} else {%>
- <decorator:getProperty property="page.ads"/>
- <%}%>
+ <% if (currentC.equals("p") || currentC.equals("pp") ||
currentC.equals("pip") ) {%>
+ <decorator:getProperty property="page.ads"/>
+ <decorator:getProperty property="page.ads-logo"/>
+ <%}else if (currentC.equals("b") ) {%>
+ <decorator:getProperty property="page.feedback"/>
+ <%} else if (currentC.equals("t")) {%>
+ <decorator:getProperty property="page.tvSearchWebTv"/>
+ <decorator:getProperty property="page.ads"/>
+ <%} else {%>
+ <decorator:getProperty property="page.ads"/>
<%}%>
</td>
<%}%>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
