continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r418061 - in /maven/continuum/trunk/continuum-webapp/src/main: resources/template/default/submit.ftl webapp/summary.jsp
Date Thu, 29 Jun 2006 14:46:40 GMT
Author: evenisse
Date: Thu Jun 29 07:46:40 2006
New Revision: 418061

URL: http://svn.apache.org/viewvc?rev=418061&view=rev
Log:
Fix columns size and use icons instead of text

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.ftl
    maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.ftl
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.ftl?rev=418061&r1=418060&r2=418061&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.ftl
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/default/submit.ftl
Thu Jun 29 07:46:40 2006
@@ -4,6 +4,12 @@
     align="${parameters.align?html}"<#t/>
 </#if>
 ><#t/>
+<#if parameters.before?exists>
+${parameters.before}
+</#if>
 <#include "/${parameters.templateDir}/simple/submit.ftl" />
+<#if parameters.after?exists>
+${parameters.after}
+</#if>
 </div><#t/>
 <#include "/${parameters.templateDir}/${parameters.theme}/controlfooter.ftl" />

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?rev=418061&r1=418060&r2=418061&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Thu Jun 29 07:46:40
2006
@@ -1,5 +1,6 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
@@ -16,34 +17,57 @@
                   showStatusBar="false"
                   filterable="false">
           <ec:row highlightRow="true">
-            <ec:column property="state" title="&nbsp;" cell="org.apache.maven.continuum.web.view.StateCell"/>
-            <ec:column property="name" title="summary.projectTable.name">
+            <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
+            <ec:column property="name" title="summary.projectTable.name" width="48%">
                 <a href="${pageContext.request.contextPath}/projectView.action?projectId=${pageScope.project.id}">${pageScope.project.name}</a>
             </ec:column>
-            <ec:column property="version" title="summary.projectTable.version"/>
-            <ec:column property="buildNumber" title="summary.projectTable.build" cell="org.apache.maven.continuum.web.view.BuildCell"/>
-            <ec:column property="projectGroupName" title="summary.projectTable.group"/>
-            <ec:column property="buildNowAction" title="&nbsp;" cell="org.apache.maven.continuum.web.view.BuildNowCell"
sortable="false"/>
-            <ec:column property="buildHistoryAction" title="&nbsp;" sortable="false">
-                <a href="<ww:url value="/buildResults.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><ww:text
name="summary.buildHistory"/></a>
+            <ec:column property="version" title="summary.projectTable.version" width="13%"/>
+            <ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
cell="org.apache.maven.continuum.web.view.BuildCell"/>
+            <ec:column property="projectGroupName" title="summary.projectTable.group"
width="13%"/>
+            <ec:column property="buildNowAction" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.BuildNowCell"
sortable="false"/>
+            <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
+              <c:choose>
+                <c:when test="${pageScope.project.latestBuildId > 0}">
+                  <a href="<ww:url value="/buildResults.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><img
src="<ww:url value="/images/buildhistory.gif"/>" alt="Build History" title="Build History"
border="0"></a>
+                </c:when>
+                <c:otherwise>
+                  <img src="<ww:url value="/images/buildhistory_disabled.gif"/>"
alt="Build History" title="Build History" border="0">
+                </c:otherwise>
+              </c:choose>
             </ec:column>
-            <ec:column property="workingCopyAction" title="&nbsp;" sortable="false">
-                <a href="<ww:url value="/workingCopy.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><ww:text
name="workingCopy"/></a>
+            <ec:column property="workingCopyAction" title="&nbsp;" width="1%" sortable="false">
+              <c:choose>
+                <c:when test="${pageScope.project.state == 10 || pageScope.project.state
== 2 || pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state
== 6}">
+                  <a href="<ww:url value="/workingCopy.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><img
src="<ww:url value="/images/workingcopy.gif"/>" alt="Working Copy" title="Working Copy"
border="0"></a>
+                </c:when>
+                <c:otherwise>
+                  <img src="<ww:url value="/images/workingcopy_disabled.gif"/>"
alt="Working Copy" title="Working Copy" border="0">
+                </c:otherwise>
+              </c:choose>
             </ec:column>
-            <ec:column property="deleteAction" title="&nbsp;" sortable="false">
-                <a href="${pageContext.request.contextPath}/deleteProject!default.action?projectId=${pageScope.project.id}&projectName=${pageScope.project.name}"><ww:text
name="delete"/></a>
+            <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
+              <c:choose>
+                <c:when test="${pageScope.project.state == 1 || pageScope.project.state
== 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state
== 4}">
+                  <a href="${pageContext.request.contextPath}/deleteProject!default.action?projectId=${pageScope.project.id}&projectName=${pageScope.project.name}"><img
src="<ww:url value="/images/delete.gif"/>" alt="Delete" title="Delete" border="0"></a>
+                </c:when>
+                <c:otherwise>
+                  <img src="<ww:url value="/images/delete_disabled.gif"/>" alt="Delete"
title="Delete" border="0">
+                </c:otherwise>
+              </c:choose>
             </ec:column>
           </ec:row>
         </ec:table>
-        <ww:form action="buildProject.action" method="post">
+        <div class="functnbar3">
+          <ww:form action="buildProject.action" method="post">
             <ww:submit value="%{getText('summary.buildAll')}">
-                <ww:param name="before">
-                  <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>" title="<ww:text name="message.success"/>"/> <ww:property
value="nbSuccesses"/>
-                  <img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text
name="message.failed"/>" title="<ww:text name="message.failed"/>"/> <ww:property
value="nbFailures"/>
-                  <img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text
name="message.error"/>" title="<ww:text name="message.error"/>"/> <ww:property
value="nbErrors"/>
-                </ww:param>
+              <ww:param name="before">
+                <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>" title="<ww:text name="message.success"/>"/> <ww:property
value="nbSuccesses"/>
+                <img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text
name="message.failed"/>" title="<ww:text name="message.failed"/>"/> <ww:property
value="nbFailures"/>
+                <img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text
name="message.error"/>" title="<ww:text name="message.error"/>"/> <ww:property
value="nbErrors"/>
+              </ww:param>
             </ww:submit>
-        </ww:form>
+          </ww:form>
+        </div>
       </div>
     </body>
   </ww:i18n>



Mime
View raw message