[Checkins]
SVN: z3c.securitytool/trunk/src/z3c/securitytool/browser/
Restructured some of the pagetemplate code to be more
consistent across pages
Daniel Blackburn
blackburnd at gmail.com
Sun Feb 3 00:14:20 EST 2008
Log message for revision 83437:
Restructured some of the pagetemplate code to be more consistent across pages
Changed:
U z3c.securitytool/trunk/src/z3c/securitytool/browser/permdetails.pt
U z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt
U z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css
U z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/permdetails.pt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/permdetails.pt 2008-02-03 04:00:18 UTC (rev 83436)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/permdetails.pt 2008-02-03 05:14:19 UTC (rev 83437)
@@ -5,49 +5,45 @@
</head>
<body>
<h1>Security Checking Tool</h1>
- <h2>Permission Details</h2>
- <p tal:content="structure view/message">This permission details
- for the user</p>
- <tal:div define="permissions view/permissionDetails/permissions;
- roles view/permissionDetails/roles;
- groups view/permissionDetails/groups">
- <div tal:condition="view/legend" tal:content="structure view/legend"/>
+ <div class="sub_heading" tal:content="structure view/message">This permission details for the user</div>
+ <div class="legend"
+ tal:condition="view/legend"
+ tal:content="structure view/legend"/>
+ <!--ul tal:condition="python: permissions or roles or groups"-->
+ <metal:block define-macro="permission-details"
+ tal:define="permissions view/permissionDetails/permissions;
+ roles view/permissionDetails/roles;
+ groups view/permissionDetails/groups">
+
+ <b3 tal:condition="permissions">Directly provided in context(s)</b3>
+ <div class="contentList" tal:condition="permissions">
- <div>
- <br><br>
- <metal:block define-macro="permission-details">
- <ul tal:condition="python: permissions or roles or groups">
- <li>
- <tal:block tal:condition="permissions">
- <div>
- <b>Directly provided in context(s)</b>
- </div>
+ <ul>
<div tal:repeat="permission permissions">
- <div tal:attributes="class permission/setting"
- tal:content="permission/name"></div>
+ <li>
+ <div tal:attributes="class permission/setting"
+ tal:content="permission/name"></div>
+ <li>
</div>
- </tal:block>
- <tal:block tal:condition="roles">
- <div>
- <b>Provided by role in context(s)</b>
- </div>
- <div tal:repeat="role_context roles">
- <div>
+ </ul>
+ </div>
+
+ <h3 tal:condition="roles">Provided by role in context(s)</h3>
+ <div class="contentList" tal:condition="roles">
+ <div tal:repeat="role_context roles">
<span tal:content="role_context" />:
<span tal:repeat="perm
python:roles[role_context]">
- <span tal:attributes="class perm/setting"
- tal:content="perm/name"/>
- <span tal:condition="not:repeat/perm/end"
- tal:replace="string:,"/>
- </span></div>
-
+ <span tal:attributes="class perm/setting"
+ tal:content="perm/name"/>
+ <span tal:condition="not:repeat/perm/end"
+ tal:replace="string:,"/>
+ </span>
</div>
- </tal:block>
- <tal:block tal:condition="groups">
- <div>
- <b>Provided by group(s) in context(s)</b>
- </div>
+ </div>
+
+ <b3 tal:condition="groups">Provided by group(s) in context(s)</b3>
+ <div class="contentList" tal:condition="groups">
<div tal:repeat="group_id groups">
<div tal:content="group_id">zope.Authenticated</div>
<div tal:define="group python:groups[group_id];
@@ -57,10 +53,7 @@
<div metal:use-macro="macro:permission-details" />
</div>
</div>
- </tal:block>
- </li>
- </ul>
- </metal:block>
- </tal:div>
- </body>
+ </div>
+ </metal:block>
+ </body>
</html>
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt 2008-02-03 04:00:18 UTC (rev 83436)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt 2008-02-03 05:14:19 UTC (rev 83437)
@@ -1,44 +1,41 @@
<html>
-<head>
- <link type="text/css" rel="stylesheet" media="all" href=""
- tal:attributes="href context/++resource++securitytool.css"/>
-</head>
+ <head>
+ <link type="text/css" rel="stylesheet" media="all" href=""
+ tal:attributes="href context/++resource++securitytool.css"/>
+ </head>
<body>
<h1>Security Checking Tool</h1>
<div class="sub_heading">Permission settings for principal <em tal:content="view/principal"></em></div>
-
- <tal:block define="permissions view/principalPermissions/permissions;
- roles view/principalPermissions/roles;
- groups view/principalPermissions/groups">
+ <div class="legend" tal:condition="view/legend" tal:content="structure view/legend"/>
+ <metal:block define-macro="user-details"
+ tal:define="permissions view/principalPermissions/permissions;
+ roles view/principalPermissions/roles;
+ groups view/principalPermissions/groups">
- <div class="legend" tal:condition="view/legend" tal:content="structure view/legend"/>
+ <tal:block tal:condition="permissions">
+ <h3>Directly provided permissions</h3>
+ <div tal:repeat="permission permissions">
+ <span tal:replace="permission">zope.ManageSite</span>
+ </div>
+ </tal:block>
+ <h3 tal:condition="roles">Permissions provided by roles</h3>
+ <div class="contentList" tal:condition="roles">
+ <div tal:repeat="role roles">
+ <b tal:content="role">zope.ManageSite:</b>
+ <div tal:repeat="permission python:roles[role]">
+ <ul>
+ <li>
+ <div tal:content="permission/permission"/>
+ <div tal:attributes="class permission/setting"
+ tal:content="permission/setting"/>
+ </li>
+ </ul>
+ </div>
+ <br>
- <div>
-
- <metal:block define-macro="user-details">
- <tal:block tal:condition="permissions">
- <h3>Directly provided permissions</h3>
- <div tal:repeat="permission permissions"><span tal:replace="permission">zope.ManageSite</span>, </div>
- </tal:block>
- <div class="contentList" tal:condition="roles">
- <br>
- <h3>Permissions provided by roles</h3>
-
- <div tal:repeat="role roles">
- <b tal:content="role">zope.ManageSite:</b>
- <div tal:repeat="permission python:roles[role]">
- <ul>
- <li>
- <div tal:content="permission/permission"/>
- <div tal:attributes="class permission/setting"
- tal:content="permission/setting"/>
- </li>
- <ul>
</div>
-
</div>
- </div>
<div class="contentList" tal:condition="groups">
<br>
<h3>Permissions provided by group(s)</h3>
@@ -53,7 +50,5 @@
</div>
</div>
</metal:block>
- </div>
- </tal:block>
</body>
</html>
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css 2008-02-03 04:00:18 UTC (rev 83436)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css 2008-02-03 05:14:19 UTC (rev 83437)
@@ -39,6 +39,13 @@
padding: 5px 25px;
}
+h3 {
+ color:grey;
+ font-weight: bold;
+ text-decoration: underline;
+ margin-left: 2em;
+ }
+
form {
margin-top: 25px;
}
@@ -107,6 +114,8 @@
font-style: italic;
margin-left: 2em;
font-size: 85%;
+ margin-bottom: 2em;
+
}
@@ -115,9 +124,9 @@
}
.sub_heading {
- font-size: 125%;
+ font-size: 115%;
color: grey;
- margin-bottom: 25px;
+ margin-bottom: 8px;
margin-left: 25px;
}
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py 2008-02-03 04:00:18 UTC (rev 83436)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py 2008-02-03 05:14:19 UTC (rev 83437)
@@ -166,9 +166,9 @@
self.legend = u""
else:
- self.message = (u"These are the security settings for the "
- u"principal <b>%(principal)s</b> and the view "
- u"<b>%(view)s</b> with the permission "
+ self.message = (u"Permission settings for "
+ u"<b>%(principal)s</b> with the view "
+ u"<b>%(view)s</b> and the permission "
u"<b>%(read_perm)s</b>."
% self.__dict__
)
More information about the Checkins
mailing list