continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1659408 - in /continuum/trunk/continuum-webapp/src/main/webapp: WEB-INF/jsp/buildResult.jsp WEB-INF/jsp/error/error.jsp WEB-INF/jsp/releaseViewResult.jsp WEB-INF/jsp/scmResult.jsp WEB-INF/jsp/surefireReport.jsp css/continuum.css
Date Thu, 12 Feb 2015 21:29:45 GMT
Author: batkinson
Date: Thu Feb 12 21:29:44 2015
New Revision: 1659408

URL: http://svn.apache.org/r1659408
Log:
[CONTINUUM-2733] Large build or test output mangles page layouts

Modified:
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=1659408&r1=1659407&r2=1659408&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Thu Feb 12
21:29:44 2015
@@ -252,9 +252,7 @@
 
         <s:if test="buildResult.state == 4">
           <h4><s:text name="buildResult.buildError"/></h4>
-          <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width:
1px">
-            <pre><s:property value="buildResult.error"/></pre>
-          </div>
+          <div class="cmd-output pre-wrap"><s:property value="buildResult.error"/></div>
         </s:if>
         <s:else>
           <h4><s:text name="buildResult.buildOutput"/></h4>
@@ -268,9 +266,7 @@
                 <s:param name="buildId" value="buildId"/>
               </s:url>
               <s:a href="%{buildOutputTextUrl}"><s:text name="buildResult.buildOutput.text"/></s:a>
-              <div style="width:100%; height:500px; overflow:auto; border-style: solid;
border-width: 1px">
-                <pre><s:property value="buildOutput"/></pre>
-              </div>
+              <div class="cmd-output pre-wrap"><s:property value="buildOutput"/></div>
             </s:else>
           </p>
         </s:else>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp?rev=1659408&r1=1659407&r2=1659408&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp Thu Feb 12
21:29:44 2015
@@ -65,9 +65,7 @@
     </div>
     <p><a href="#" onclick="showhide('stacktrace');">Show/hide Stack Trace</a></p>
     <div id="stacktrace" style="display: none;">
-      <pre>
-        <s:property value="exceptionStack"/>
-      </pre>
+      <div class="pre-wrap"><s:property value="exceptionStack"/></div>
     </div>
   </div>
 </body>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp?rev=1659408&r1=1659407&r2=1659408&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp Thu
Feb 12 21:29:44 2015
@@ -70,9 +70,7 @@
             <s:text name="releaseViewResult.noOutput"/>
         </s:if>
         <s:else>
-          <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width:
1px">
-            <pre><s:property value="result.output"/></pre>
-          </div>
+          <div class="cmd-output pre-wrap"><s:property value="result.output"/></div>
         </s:else>
       </p>
       <input type="button" value="<s:text name="back"/>" onClick="history.go(-1)">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=1659408&r1=1659407&r2=1659408&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Thu Feb 12
21:29:44 2015
@@ -46,9 +46,7 @@
         </div>
         
         <h4><s:text name="scmResult.scmError"/></h4>
-        <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width:
1px">
-          <pre><s:property value="projectScmRoot.error"/></pre>
-        </div>
+        <div class="cmd-output pre-wrap"><s:property value="projectScmRoot.error"/></div>
       </div>
     </body>
   </s:i18n>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp?rev=1659408&r1=1659407&r2=1659408&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp Thu Feb
12 21:29:44 2015
@@ -132,9 +132,7 @@
                   </ec:column>
                   <ec:column property="name" title="surefireReport.testCase" sortable="false">
                     <c:out value="${pageScope.testCase.name}"/><br/><br/>
-                    <pre>
-                      <c:out value="${pageScope.testCase.failureDetails}"/>
-                    </pre>
+                    <div class="pre-wrap"><c:out value="${pageScope.testCase.failureDetails}"/><div>
                   </ec:column>
                 </s:if>
                 <s:else>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css?rev=1659408&r1=1659407&r2=1659408&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/css/continuum.css Thu Feb 12 21:29:44
2015
@@ -20,4 +20,22 @@
 /* Cleanup oddball redback labels (compare to .axial th in tigris.css) */
 td.tdLabel {
   width: 12em;
+}
+
+.cmd-output {
+  width:100%;
+  height:500px;
+  overflow:auto;
+  border-style: solid;
+  border-width: 1px;
+  font-size: normal;
+  font-family: monospace;
+}
+
+.pre-wrap {
+  white-space: pre-wrap;
+  white-space: -moz-pre-wrap;
+  white-space: -pre-wrap;
+  white-space: -o-pre-wrap;
+  word-wrap: break-word;
 }
\ No newline at end of file



Mime
View raw message