Author: ssmiweve
Date: 2007-06-05 10:27:58 +0200 (Tue, 05 Jun 2007)
New Revision: 5269

Modified:
   branches/2.13/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp
Log:
move ugly scriptlet to pluto. hopefully it can be rewritten using el & tags...

Modified: branches/2.13/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp
===================================================================
--- branches/2.13/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp       
2007-06-05 08:13:46 UTC (rev 5268)
+++ branches/2.13/war/src/webapp/WEB-INF/jsp/decorators/httpDecorator.jsp       
2007-06-05 08:27:58 UTC (rev 5269)
@@ -16,34 +16,34 @@
 
 <body>
 
-<%-- FIXME please remove the following scriptlet code from this jsp --%>
-<% // If velocity debug is turned on, display developer bar .
-    // TODO Move to wanted place or add show/hide function to the developerbar
-    if ("true".equals(System.getProperty("VELOCITY_DEBUG")) && 
!"true".equals(System.getProperty("VELOCITY_DEVELOPERBAR_HIDDEN"))) {
-        String loadPath = System.getProperty("VELOCITY_DEBUG_TEMPLATE_DIR");
-        if (loadPath == null) {
-            loadPath = "(URLResourceLoader)";
-        }
-%>
-<%
-    boolean VELOCITY_DEBUG_ON = 
"true".equals(System.getProperty("VELOCITY_DEBUG_ON"));
-    String background = "#DDDDDD";
-    String color = "black";
-    String linkText = VELOCITY_DEBUG_ON ? "Off" : "On";
-%>
+<%-- FIXME please remove the following scriptlet code (on the right) from this 
jsp --%>
+                                                                               
                                         <% // If velocity debug is turned on, 
display developer bar .
+                                                                               
                                             // TODO Move to wanted place or 
add show/hide function to the developerbar
+                                                                               
                                             if 
("true".equals(System.getProperty("VELOCITY_DEBUG")) && 
!"true".equals(System.getProperty("VELOCITY_DEVELOPERBAR_HIDDEN"))) {
+                                                                               
                                                 String loadPath = 
System.getProperty("VELOCITY_DEBUG_TEMPLATE_DIR");
+                                                                               
                                                 if (loadPath == null) {
+                                                                               
                                                     loadPath = 
"(URLResourceLoader)";
+                                                                               
                                                 }
+                                                                               
                                         %>
+                                                                               
                                         <%
+                                                                               
                                             boolean VELOCITY_DEBUG_ON = 
"true".equals(System.getProperty("VELOCITY_DEBUG_ON"));
+                                                                               
                                             String background = "#DDDDDD";
+                                                                               
                                             String color = "black";
+                                                                               
                                             String linkText = 
VELOCITY_DEBUG_ON ? "Off" : "On";
+                                                                               
                                         %>
 
-<div width="100%" 
style="font-size:12px;background-color:<%=background%>;border:1px solid 
#C0C0C0; color:<%=color%>">
-    DeveloperBar:
-    VelocityDebug: <a style="color: blue" href="/servlet/VelocityDebug?<%= 
request.getQueryString()%>"><%= linkText %>
-    </a>
-    |
-    TemplatePath:  <%= loadPath %>
-</div>
+                                                                               
                                         <div width="100%" 
style="font-size:12px;background-color:<%=background%>;border:1px solid 
#C0C0C0; color:<%=color%>">
+                                                                               
                                             DeveloperBar:
+                                                                               
                                             VelocityDebug: <a style="color: 
blue" href="/servlet/VelocityDebug?<%= request.getQueryString()%>"><%= linkText 
%>
+                                                                               
                                             </a>
+                                                                               
                                             |
+                                                                               
                                             TemplatePath:  <%= loadPath %>
+                                                                               
                                         </div>
 
 
-<%
-    }
-%>
+                                                                               
                                         <%
+                                                                               
                                             }
+                                                                               
                                         %>
 
 <search:include include="topBar"/>
 <search:include include="header"/>

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to