r222 - in branches/nuiton-web-1.11-security/nuiton-security/src/main: java/org/nuiton/web/security/actions resources/WEB-INF/security
Author: echatellier Date: 2012-10-18 16:28:45 +0200 (Thu, 18 Oct 2012) New Revision: 222 Url: http://nuiton.org/repositories/revision/nuiton-web/222 Log: Add div and class for css style Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 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.jsp 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 Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-10-18 14:28:45 UTC (rev 222) @@ -8,6 +8,7 @@ import org.apache.struts2.util.ServletContextAware; import org.nuiton.topia.TopiaContext; import org.nuiton.util.ApplicationConfig; +import org.nuiton.web.security.SecurityShiroFilter; import com.opensymphony.xwork2.ActionSupport; @@ -27,8 +28,8 @@ @Override public void setServletContext(ServletContext context) { - config = (ApplicationConfig)context.getAttribute("ApplicationConfig"); - rootContext = (TopiaContext)context.getAttribute("rootContext"); + config = (ApplicationConfig)context.getAttribute(SecurityShiroFilter.APP_CONFIG_CONTEXT); + rootContext = (TopiaContext)context.getAttribute(SecurityShiroFilter.ROOT_CONTEXT_CONTEXT); } /** Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2012-10-18 14:28:45 UTC (rev 222) @@ -9,8 +9,6 @@ import org.nuiton.web.security.SecurityUserDAO; import org.nuiton.web.security.SecurityUserImpl; -import com.opensymphony.xwork2.Preparable; - public class UserAction extends AbstractAction { /** serialVersionUID. */ Modified: branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -7,16 +7,18 @@ </head> <body> - - <h1>Authentification requise</h1> + + <div class="security-div"> + <h1>Authentification requise</h1> + + <h2>Connexion</h2> - <h2>Connexion</h2> - - <s:form action="login" namespace="/security"> - <s:actionerror /> - <s:textfield label="Identifiant" name="login" /> - <s:password label="Mot de passe" name="password" /> - <s:submit label="Connexion" /> - </s:form> + <s:form action="login" namespace="/security" class="security-form"> + <s:actionerror /> + <s:textfield label="Identifiant" name="login" /> + <s:password label="Mot de passe" name="password" /> + <s:submit label="Connexion" /> + </s:form> + </div> </body> </html> \ No newline at end of file Modified: 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 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -8,58 +8,62 @@ <body> - <h1>Sécurité</h1> + <div class="security-div"> - <h2>Permissions des rôles</h2> + <h1>Sécurité</h1> - <form action="<s:url action="role-permissions" namespace="/security" />" method="post"> - <s:iterator value="roles"> - <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> - </s:iterator> - <table class="secu-roletable"> - <tr> - <td class="empty" /> + <h2>Permissions des rôles</h2> + + <form action="<s:url action="role-permissions" namespace="/security" />" method="post" class="security-form"> <s:iterator value="roles"> - <td><a href="<s:url action='role!input' namespace='/security'> - <s:param name="roleId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="name" /> - </a></td> + <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> </s:iterator> - </tr> - <s:iterator value="categories.keys" var="category"> - <s:set name="categoryName" value="categories.get(#category)" /> + <table class="security-table"> <tr> - <th colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></th> + <td class="security-empty" /> + <s:iterator value="roles"> + <td><a href="<s:url action='role!input' namespace='/security'> + <s:param name="roleId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="name" /> + </a></td> + </s:iterator> </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" var="role"> - <td><input type="checkbox" name="permissions-<s:property value="topiaId" />" - value="<s:property value="#categoryPermission"/>" - <s:if test="#role.permissions.contains(#categoryPermission)" > - checked="checked" - </s:if> /></td> + <s:iterator value="categories.keys" var="category"> + <s:set name="categoryName" value="categories.get(#category)" /> + <tr> + <th colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></th> + </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" var="role"> + <td><input type="checkbox" name="permissions-<s:property value="topiaId" />" + value="<s:property value="#categoryPermission"/>" + <s:if test="#role.permissions.contains(#categoryPermission)" > + checked="checked" + </s:if> /></td> + </s:iterator> + </tr> </s:iterator> - </tr> </s:iterator> - </s:iterator> - </table> - <input type="submit" value="Valider" /> - </form> + </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> + </div> - <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/role.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -7,16 +7,19 @@ </head> <body> + + <div class="security-div"> + <h1>Sécurité</h1> + + <h2>Nouveau Rôle</h2> - <h1>Sécurité</h1> - - <h2>Role</h2> + <s:form action="role" namespace="/security" class="security-form"> + <s:actionerror /> + <s:hidden name="roleId" value="%{role.topiaId}" /> + <s:textfield label="Nom" name="role.name" value="%{role.name}"/> + <s:submit label="Valider" /> + </s:form> + </div> - <s:form action="role" namespace="/security"> - <s:actionerror /> - <s:hidden name="roleId" value="%{role.topiaId}" /> - <s:textfield label="Nom" name="role.name" value="%{role.name}"/> - <s:submit label="Valider" /> - </s:form> </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-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -8,69 +8,71 @@ <body> - <h1>Sécurité</h1> - - <h2>Rôles des utilisateurs</h2> + <div class="security-div"> + <h1>Sécurité</h1> - <form action="<s:url action="user-roles" namespace="/security" />" method="post"> - <table class="secu-roletable"> - <tr> - <td colspan="2" class="empty"/> - <s:if test="!roles.empty"> - <th colspan="<s:property value="roles.size()" />">Rôles</th> - </s:if> - </tr> - <tr> - <td colspan="2" class="empty"/> - <s:iterator value="roles"> - <td> - <a href="<s:url action='role!input' namespace='/security'> - <s:param name="roleId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="name" /> - </a> - </td> - </s:iterator> - </tr> - <s:iterator value="users" var="user" status="userStatus"> - <input type="hidden" name="userIds" value="<s:property value="topiaId" />" /> + <h2>Rôles des utilisateurs</h2> + + <form action="<s:url action="user-roles" namespace="/security" />" method="post" class="security-form"> + <table class="security-table"> <tr> - <s:if test="#userStatus.first"> - <th rowspan="<s:property value="users.size()" />" class="vertical">Utilisateurs</th> + <td colspan="2" class="security-empty"/> + <s:if test="!roles.empty"> + <th colspan="<s:property value="roles.size()" />">Rôles</th> </s:if> - <td> - <a href="<s:url action='user!input' namespace='/security'> - <s:param name="userId"><s:property value="topiaId" /></s:param> - </s:url>"> - <s:property value="login" /> - </a> - </td> - <s:iterator value="roles" var="role"> + </tr> + <tr> + <td colspan="2" class="security-empty"/> + <s:iterator value="roles"> <td> - - <input id="<s:property value="#user.topiaId" /><s:property value="#user.topiaId" />" - type="checkbox" name="roles-<s:property value="#user.topiaId" />" value="<s:property value="#role.topiaId" />" - <s:if test="#user.securityRole.contains(#role)" > - checked="checked" - </s:if> /> + <a href="<s:url action='role!input' namespace='/security'> + <s:param name="roleId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="name" /> + </a> </td> </s:iterator> </tr> - </s:iterator> - </table> - <input type="submit" value="Valider" /> - </form> - - <h2>Gestion</h2> - - <div class="secu-newuser"> - <a href="<s:url action='role-permissions!input' namespace='/security' />">Permissions des rôles</a> + <s:iterator value="users" var="user" status="userStatus"> + <input type="hidden" name="userIds" value="<s:property value="topiaId" />" /> + <tr> + <s:if test="#userStatus.first"> + <th rowspan="<s:property value="users.size()" />" class="vertical">Utilisateurs</th> + </s:if> + <td> + <a href="<s:url action='user!input' namespace='/security'> + <s:param name="userId"><s:property value="topiaId" /></s:param> + </s:url>"> + <s:property value="login" /> + </a> + </td> + <s:iterator value="roles" var="role"> + <td> + + <input id="<s:property value="#user.topiaId" /><s:property value="#user.topiaId" />" + type="checkbox" name="roles-<s:property value="#user.topiaId" />" value="<s:property value="#role.topiaId" />" + <s:if test="#user.securityRole.contains(#role)" > + checked="checked" + </s:if> /> + </td> + </s:iterator> + </tr> + </s:iterator> + </table> + <input type="submit" value="Valider" /> + </form> + + <h2>Gestion</h2> + + <div class="secu-newuser"> + <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='role!input' namespace='/security' />">Nouveau rôle</a> + </div> </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.jsp =================================================================== --- branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-18 14:28:15 UTC (rev 221) +++ branches/nuiton-web-1.11-security/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-18 14:28:45 UTC (rev 222) @@ -8,14 +8,17 @@ <body> - <h1>Sécurité</h1> + <div class="security-div"> + <h1>Sécurité</h1> - <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}"/> - <s:password label="Mot de passe" name="user.password" value="%{user.password}" /> - <s:submit label="Valider" /> - </s:form> + <h2>Nouvel utilisateur</h2> + <s:form action="user" namespace="/security" class="security-form"> + <s:actionerror /> + <s:hidden name="userId" value="%{user.topiaId}" /> + <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> + <s:password label="Mot de passe" name="user.password" value="%{user.password}" /> + <s:submit label="Valider" /> + </s:form> + </div> </body> </html> \ No newline at end of file
participants (1)
-
echatellier＠users.nuiton.org