continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r450340 - in /maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp: navigations/DefaultTop.jsp projectGroupSummary.jsp
Date Wed, 27 Sep 2006 06:21:47 GMT
Author: jmcconnell
Date: Tue Sep 26 23:21:47 2006
New Revision: 450340

URL: http://svn.apache.org/viewvc?view=rev&rev=450340
Log:
nicely aligned welcome bar is back

Modified:
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp?view=diff&rev=450340&r1=450339&r2=450340
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/navigations/DefaultTop.jsp
Tue Sep 26 23:21:47 2006
@@ -21,14 +21,11 @@
 
 <div id="breadcrumbs">
 
-  <div style="float: left;">
-    <%@include file="/WEB-INF/jsp/pss/include/securityLinks.jsp" %>
-  </div>
-
   <div style="float: right;">
     <a href="http://maven.apache.org/continuum">Continuum</a> |
     <a href="http://maven.apache.org/">Maven</a> |
     <a href="http://www.apache.org/">Apache</a>
   </div>
+  <%@include file="/WEB-INF/jsp/pss/include/securityLinks.jsp" %>
 </div>
 </ww:i18n>

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp?view=diff&rev=450340&r1=450339&r2=450340
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
(original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp
Tue Sep 26 23:21:47 2006
@@ -1,48 +1,59 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
+
 <html>
-  <ww:i18n name="localization.Continuum">
-    <head>
-        <title><ww:text name="projectView.page.title"/></title>
-    </head>
-    <body>    
-      <div id="h3">
-        <ww:action name="projectGroupTab" executeResult="true">
-            <ww:param name="tabName" value="'Summary'"/>
-        </ww:action>
-      
-        <h3>Project Group Information</h3>
-            
-        <div class="axial">
-          <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
-            <c1:data label="Group Id" name="projectGroup.groupId"/>
-            <c1:data label="Description" name="projectGroup.description"/>
-           </table>
-        </div>
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title>
+      <ww:text name="projectView.page.title"/>
+    </title>
+  </head>
+  <body>
+  <div id="h3">
+    <ww:action name="projectGroupTab" executeResult="true">
+      <ww:param name="tabName" value="'Summary'"/>
+    </ww:action>
+
+    <h3>Project Group Information</h3>
+
+    <div class="axial">
+      <table border="1" cellspacing="2" cellpadding="3" width="100%">
+        <c1:data label="%{getText('projectView.project.name')}" name="projectGroup.name"/>
+        <c1:data label="Group Id" name="projectGroup.groupId"/>
+        <c1:data label="Description" name="projectGroup.description"/>
+      </table>
+    </div>
 
-        <h3>Project Group Actions</h3>
+    <pss:ifAnyAuthorized permissions="continuum-build-group,continuum-remove-group" resource="${projectGroupId}">
+      <h3>Project Group Actions</h3>
 
-        <div class="functnbar3">
+      <div class="functnbar3">
+        <pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupId}">
           <ww:url id="buildProjectGroupUrl" action="buildProjectGroup">
             <ww:param name="projectGroupId" value="projectGroupId"/>
           </ww:url>
+          <ww:a href="%{buildProjectGroupUrl}">Build</ww:a>
+        </pss:ifAuthorized>
+        <pss:ifAuthorized permission="continuum-remove-group" resource="${projectGroupId}">
           <ww:url id="removeProjectGroupUrl" action="removeProjectGroup">
-            <ww:param name="projectGroupId" value="projectGroupId"/>           
+            <ww:param name="projectGroupId" value="projectGroupId"/>
             <ww:param name="confirmed" value="false"/>
           </ww:url>
-          <ww:a href="%{buildProjectGroupUrl}">Build</ww:a>&nbsp;<ww:a
href="%{removeProjectGroupUrl}">Remove</ww:a>
-        </div>
+          <ww:a href="%{removeProjectGroupUrl}">Remove</ww:a>
+        </pss:ifAuthorized>
+      </div>
+    </pss:ifAnyAuthorized>
 
-        <h3>Projects</h3>
+    <h3>Projects</h3>
 
-        <ww:action name="projectSummary" executeResult="true" namespace="component">
-          <ww:param name="projectGroupId" value="%{projectGroupId}"/>
-        </ww:action>
+    <ww:action name="projectSummary" executeResult="true" namespace="component">
+      <ww:param name="projectGroupId" value="%{projectGroupId}"/>
+    </ww:action>
 
-      </div>
-    </body>
-  </ww:i18n>
+  </div>
+  </body>
+</ww:i18n>
 </html>



Mime
View raw message