r218 - branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security - Nuiton-web-commits

16 Oct 2012

Author: echatellier
Date: 2012-10-16 18:31:45 +0200 (Tue, 16 Oct 2012)
New Revision: 218

Url: http://nuiton.org/repositories/revision/nuiton-web/218

Log:
Update view

Added:
   branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp
Modified:
   branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp
   branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp

Added: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp
===================================================================

--- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp	                        (rev 0)
+++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp	2012-10-16 16:31:45 UTC (rev 218)
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<%@taglib uri="/struts-tags" prefix="s" %>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Sécurité</title>
+ </head>
+
+ <body>
+
+  <h1>Sécurité</h1>
+
+  <h2>Permissions des rôles</h2>
+  
+  <form action="<s:url action="user-roles" namespace="/security" />" method="post">
+    <table class="secu-roletable">
+     <tr>
+      <td class="empty" />
+      <s:iterator value="roles">
+       <td><s:property value="name" /></td>
+      </s:iterator>
+     </tr>
+     <s:iterator value="categories.keys" var="category">
+       <s:set name="categoryName" value="categories.get(#category)" />
+       <tr>
+        <td colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></td>
+       </tr>
+       <s:iterator value="categoryPermissions.get(#category)" var="categoryPermission">
+       <s:set name="permissionName" value="permissions.get(#categoryPermission)" />
+        <tr>
+         <td><s:property value="#permissionName" /></td>
+         <s:iterator value="roles">
+           <td><input type="checkbox" value="" /></td>
+         </s:iterator>
+        </tr>
+       </s:iterator>
+     </s:iterator>
+    </table>
+    <input type="submit" value="Valider" />
+  </form>
+
+  <h2>Gestion</h2>
+
+  <div class="secu-newuser">
+    <a href="<s:url action='user-roles!input' namespace='/security' />">Rôles des utilisateurs</a>
+  </div>
+  <div class="secu-newuser">
+    <a href="<s:url action='user!input' namespace='/security' />">Nouvel utilisateur</a>
+  </div>
+  <div class="secu-newrole">
+    <a href="<s:url action='role!input' namespace='/security' />">Nouveau rôle</a>
+  </div>
+ </body>
+</html>
\ No newline at end of file

Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp
===================================================================
--- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp	2012-10-16 15:25:59 UTC (rev 217)
+++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp	2012-10-16 16:31:45 UTC (rev 218)
@@ -10,7 +10,7 @@
 
   <h1>Sécurité</h1>
 
-  <h2>Permission</h2>
+  <h2>Rôles des utilisateurs</h2>
   
   <form action="<s:url action="user-roles" namespace="/security" />" method="post">
     <table class="secu-roletable">
@@ -63,10 +63,13 @@
   <h2>Gestion</h2>
 
   <div class="secu-newuser">
-    <a href="<s:url action='secu-user!input' namespace='/secu' />">Nouvel utilisateur</a>
+    <a href="<s:url action='role-permissions!input' namespace='/security' />">Permissions des rôles</a>
   </div>
+  <div class="secu-newuser">
+    <a href="<s:url action='user!input' namespace='/security' />">Nouvel utilisateur</a>
+  </div>
   <div class="secu-newrole">
-    <a href="<s:url action='secu-role!input' namespace='/secu' />">Nouveau rôle</a>
+    <a href="<s:url action='role!input' namespace='/security' />">Nouveau rôle</a>
   </div>
  </body>
 </html>
\ No newline at end of file

Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp
===================================================================
--- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp	2012-10-16 15:25:59 UTC (rev 217)
+++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp	2012-10-16 16:31:45 UTC (rev 218)
@@ -10,7 +10,7 @@
  
   <h1>Sécurité</h1>
 
-  <s:form action="secu-user" namespace="/secu">
+  <s:form action="user" namespace="/security">
     <s:actionerror />
     <s:hidden name="userId" value="%{user.topiaId}" />
     <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/>

    

r218 - branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security

echatellier＠users.nuiton.org

tags

participants (1)