java/code/webapp/WEB-INF/decorators/layout_c.jsp | 23 +++++++++-----------
java/code/webapp/WEB-INF/decorators/layout_head.jsp | 11 ++++-----
2 files changed, 16 insertions(+), 18 deletions(-)
New commits:
commit f0e8c3ef31cce8f331566a9ce30b740cb14dc4fc
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Fri Nov 29 13:24:06 2013 +0100
Reformat so less unnecessary whitespace gets to output
At leas at the beginning of the document, the most visible place in the
generated code.
diff --git a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
index d4d07b8..ec4b821 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_c.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_c.jsp
@@ -1,17 +1,16 @@
-<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
-<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<%@ taglib
uri="http://struts.apache.org/tags-logic"
prefix="logic" %>
-<%@ taglib
uri="http://www.opensymphony.com/sitemesh/decorator"
prefix="decorator" %>
-<%@ taglib
uri="http://www.opensymphony.com/sitemesh/page"
prefix="page" %>
-<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ page contentType="text/html; charset=UTF-8" %>
-
-<!DOCTYPE HTML>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
+%><%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"
+%><%@ taglib
uri="http://struts.apache.org/tags-html"
prefix="html"
+%><%@ taglib
uri="http://struts.apache.org/tags-logic"
prefix="logic"
+%><%@ taglib
uri="http://www.opensymphony.com/sitemesh/decorator"
prefix="decorator"
+%><%@ taglib
uri="http://www.opensymphony.com/sitemesh/page"
prefix="page"
+%><%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn"
+%><%@ page contentType="text/html; charset=UTF-8"
+%><!DOCTYPE HTML>
<html:html>
<head>
- <jsp:include page="layout_head.jsp" />
- <decorator:head />
+ <jsp:include page="layout_head.jsp" />
+ <decorator:head />
</head>
<body onload="<decorator:getProperty property="body.onload"
/>">
<div class="spacewalk-top-wrap">
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index 65d9605..ad3ccd6 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -1,9 +1,8 @@
-<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
-<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
-<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
-
-<!-- enclosing head tags in layout_c.jsp -->
+<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
+%><%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn"
+%><%@ taglib
uri="http://java.sun.com/jsp/jstl/core"
prefix="c"
+%><%@ taglib
uri="http://struts.apache.org/tags-bean"
prefix="bean"
+%><!-- enclosing head tags in layout_c.jsp -->
<c:if test="${pageContext.request.requestURI ==
'/rhn/Load.do'}">
<meta http-equiv="refresh" content="0; url=<c:out
value="${param.return_url}" />" />
</c:if>