[Kernel-commits] r3992 - trunk/war/src/webapp/WEB-INF/jsp/decorators

[ssthkjer]

Author: ssthkjer
Date: 2006-11-20 14:48:20 +0100 (Mon, 20 Nov 2006)
New Revision: 3992

Modified:
   trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
Log:
created main.vm for sesam.se

Modified: trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
===================================================================
--- trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp       
2006-11-20 12:33:56 UTC (rev 3991)
+++ trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp       
2006-11-20 13:48:20 UTC (rev 3992)
@@ -138,16 +138,7 @@
            <decorator:getProperty property="page.search-bar"/>
        <% } %>
 
-        <%-- temporary sesam.se header fix for pub system --%>        
-        <% if ( !"sv".equals(locale) ) { %>      
         <table border="0" cellspacing="0" cellpadding="0" id="body_table">
-        <% } else { %>
-            <%if (currentC.equals("d") && publish) {%>
-                <table width="100%" cellspacing="0" cellpadding="0" 
id="body_table">    
-            <% } else { %>
-                <table border="0" cellspacing="0" cellpadding="0" 
id="body_table">    
-            <% } %>
-        <% } %>
         <%if(q.trim().equals("") && currentC.equals("d") && publish) {%>
             <tr>
         <%} else if (q.trim().equals("") && !currentC.equals("m") && 
!currentC.equals("l") && !currentC.equals("t") && !currentC.equals("wt")) {%>
@@ -193,13 +184,9 @@
 
         <%if (q.trim().equals("") && !currentC.equals("m") && 
!currentC.equals("l") && !currentC.equals("t") && !currentC.equals("wt")) {%>
        <%}else {%>
-            <% if ( !"sv".equals(locale) ) { %>        
-                <%if (currentC.equals("p") || currentC.equals("pp") || 
currentC.equals("pip") || currentC.equals("pipn")) {%>
-                    <search:velocity template="fragments/middlebar" 
command="scanpix"/>
-                <% }else if(q.trim().equals("") && currentC.equals("m") && 
vertikal.equals("m")){ %>   
-                <% }else { %>
-                    <decorator:getProperty property="page.middle-bar"/>
-                <% } %>
+            <%if (currentC.equals("p") || currentC.equals("pp") || 
currentC.equals("pip") || currentC.equals("pipn")) {%>
+                <search:velocity template="fragments/middlebar" 
command="scanpix"/>
+            <% }else if(q.trim().equals("") && currentC.equals("m") && 
vertikal.equals("m")){ %>       
             <% }else { %>
                 <decorator:getProperty property="page.middle-bar"/>
             <% } %>
@@ -213,16 +200,12 @@
         <% } else if (q.trim().equals("") && currentC.equals("m") && 
vertikal.equals("m")) {%>
         <% } else if (currentC.equals("p") || currentC.equals("pp") || 
currentC.equals("pip")) {%>
             <div>            
-                <% if ( !"sv".equals(locale) ) { %>
-                    <% if (currentC.equals("p")) {%>
-                        <decorator:getProperty 
property="page.picsearch-results"/>
-                    <% } else { %>
-                        <search:velocity template="results/scanpix" 
command="scanpix"/>
-                        <decorator:getProperty 
property="page.picsearch-results"/>
-                    <%}%>
+                <% if (currentC.equals("p")) {%>
+                    <decorator:getProperty property="page.picsearch-results"/>
                 <% } else { %>
+                    <search:velocity template="results/scanpix" 
command="scanpix"/>
                     <decorator:getProperty property="page.picsearch-results"/>
-                <% } %>
+                <%}%>
                 <div class="clearFloat">&nbsp;</div>
             </div>
         <% } else { %>
@@ -232,11 +215,9 @@
 
         <%--  offset  --%>
         <%if (currentC.equals("pp")) {%>
-                <search:velocity template="fragments/offsetPager" 
command="scanpix"/>
+            <search:velocity template="fragments/offsetPager" 
command="scanpix"/>
         <% } else { %>
-            <% if ( !"sv".equals(locale) ) { %>
-                <decorator:getProperty property="page.offsetPager"/>
-            <% } %>            
+            <decorator:getProperty property="page.offsetPager"/>
          <% } %>
 
         </td>
@@ -257,21 +238,15 @@
     <% if ( currentC.equals("sw") || currentC.equals("swip") ) {%>
         <decorator:getProperty property="page.ads_floating"/>
     <% } %>
-    
-    <% if ( "sv".equals(locale) ) { %>
-        <tr>
-            <td>&nbsp;</td>
-            <td colspan="2"><decorator:getProperty 
property="page.offsetPager"/></td>
-        </tr>     
-     <% } %>    
+     
 </table>
     <decorator:getProperty property="page.verbosePager"/>
     <decorator:getProperty property="page.footer"/>
 <%}%>
 
+<decorator:getProperty property="page.map-script"/>
     </c:if>
 
-<decorator:getProperty property="page.map-script"/>
 <search:velocity template="fragments/gallup" />
 </body>
 </html>

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits