[Checkins] SVN: z3c.securitytool/trunk/ Layout changes to the principal details (pagetemplate and css)

Daniel Blackburn blackburnd at gmail.com
Sat Feb 16 18:19:30 EST 2008


Log message for revision 83957:
  Layout changes to the principal details (pagetemplate and css)

Changed:
  U   z3c.securitytool/trunk/TODO.txt
  U   z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt
  U   z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css

-=-
Modified: z3c.securitytool/trunk/TODO.txt
===================================================================
--- z3c.securitytool/trunk/TODO.txt	2008-02-16 23:19:01 UTC (rev 83956)
+++ z3c.securitytool/trunk/TODO.txt	2008-02-16 23:19:30 UTC (rev 83957)
@@ -15,11 +15,8 @@
 
             * Permissions for securitytool views cannot be zope.Public
 
-            * Fix permissionDetails
-
             * Specify which context the permission,group and role are attained
               from
-
             
 
             PrincipalDetails
@@ -30,7 +27,7 @@
                 * Directly provided permissions in effect at context level
 
                 * RoleTree (Done)
-                * RoleTree with `global settings`
+                * RoleTree with `global settings` (Done) needs order
                 * Directly provided roles in effect at context level
 
             PermissionDetails

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt	2008-02-16 23:19:01 UTC (rev 83956)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt	2008-02-16 23:19:30 UTC (rev 83957)
@@ -27,70 +27,77 @@
                                      permissionTree view/principalPermissions/permissionTree;
                                      groups view/principalPermissions/groups">
 
-                  <h3 tal:condition="permissions"> Directly provided
-                  permissions in effect at this context</h3>
-                  <div class="contentList"  tal:repeat="permissionItem permissions" >
-                    <ul>
-                        <li class="contentList">
-                         <span tal:content="python: permissionItem['permission']"/>
-                         <span 
-                           tal:attributes="class python: permissionItem['setting']"
-                           tal:content="python: permissionItem['setting']"/>
+                  <div class="context">
+                      <h3 tal:condition="permissions"> Directly provided
+                      permissions in effect at this context</h3>
+                      <div class="contentList"  tal:repeat="permissionItem permissions" >
+                        <ul>
+                            <li class="contentList">
+                             <span   tal:attributes="class python: permissionItem['setting']"
+                                     tal:content="python: permissionItem['permission']"/>
+                            </li>
+                          </ul>
 
-                        </li>
-                      </ul>
+                      </div>
+                      <br tal:condition="permissions">
 
+
+
+                      <h3 tal:condition="roles">Permissions provided by roles</h3>
+                      <div class="contentList"  tal:condition="roles">
+                        <div tal:repeat="role python: roles">
+                          <b tal:content="role">zope.ManageSite:</b>
+                          <tal:block  tal:define="permissions python:roles[role]">
+                             <div class="contentList"
+                      tal:repeat="permission permissions">
+                               <ul>
+                                 <li>
+                                  <span tal:attributes="class permission/setting"
+                                        tal:content="permission/permission"/>
+                                 </li>
+                               </ul>
+                             </div>                      
+                          </tal:block>
+
+                          <br>
+
+                        </div>
+                      </div>
                   </div>
-                  <br tal:condition="permissions">
 
-                  <h3 tal:condition="roleTree">Roles Defined in
-                  Context(s) for this user</h3>
-                  <tal:block tal:repeat="context roleTree">
-                        <span tal:define="curr python:context.values()[0]">
-                            <div class="contextList"
-                  tal:content="python: ' / '.join(curr['parentList'])"/>
-                            <div class="contextListIndent" tal:repeat="role python: curr['roles']">
-                                <div tal:attributes="class  python:role['setting']"
-                                     tal:content="python: role['role']"/>
-                            </div>
-                        </span>
-                  </tal:block>
-                  <br tal:condition="roleTree">
+                  <div class="tree">
 
-                  <h3 tal:condition="permissionTree">Permissions Defined in
-                  Context(s) for this user</h3>
-                  <tal:block tal:repeat="context permissionTree">
-                        <span tal:define="curr python:context.values()[0]">
-                            <div class="contextList"
-                  tal:content="python: ' / '.join(curr['parentList'])"/>
-                            <div class="contextListIndent" tal:repeat="permission python: curr['permissions']">
-                                <div tal:attributes="class  python:permission['setting']"
-                                     tal:content="python: permission['permission']"/>
-                            </div>
-                        </span>
-                  </tal:block>
-                  <br tal:condition="permissionTree">
+                      <h3 tal:condition="permissionTree">Permissions Defined in
+                      Context(s) for this user</h3>
+                      <tal:block tal:repeat="context permissionTree">
+                            <span tal:define="curr python:context.values()[0]">
+                                <div class="contextList"
+                                     tal:content="python: ' / '.join(curr['parentList'])"/>
+                                <div class="contextListIndent" tal:repeat="permission python: curr['permissions']">
+                                    <div tal:attributes="class  python:permission['setting']"
+                                         tal:content="python: permission['permission']"/>
+                                </div>
 
-                  <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>
+                            </span>
 
-                      <!--div class="contentList"
-                           tal:repeat="permission python:roles[role]">
-                        <ul>
-                          <li>
-                           <span tal:content="permission/permission"/>
-                           <span tal:attributes="class permission/setting"
-                                tal:content="permission/setting"/>
-                          </li>
-                        </ul>
-                      </div-->
-                      
-                      <br>
+                      </tal:block>
 
-                    </div>
-                  </div>
+                      <br tal:condition="permissionTree">
+
+                      <h3 tal:condition="roleTree">Roles Defined in
+                      Context(s) for this user</h3>
+                      <tal:block tal:repeat="context roleTree">
+                            <span tal:define="curr python:context.values()[0]">
+                                <div class="contextList"
+                      tal:content="python: ' / '.join(curr['parentList'])"/>
+                                <div class="contextListIndent" tal:repeat="role python: curr['roles']">
+                                    <div tal:attributes="class  python:role['setting']"
+                                         tal:content="python: role['role']"/>
+                                </div>
+                            </span>
+                      </tal:block>
+                      <br tal:condition="roleTree">
+                </div>
                 <div class="contentList" tal:condition="groups">
                   <br>
                   <h3>Permissions provided by group(s)</h3>

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css	2008-02-16 23:19:01 UTC (rev 83956)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css	2008-02-16 23:19:30 UTC (rev 83957)
@@ -124,7 +124,7 @@
 }
 
 .contentList {
-    margin-left: 3em;
+    margin-left: 1em;
 }
 .contextList {
     text-decoration: underline;
@@ -184,6 +184,24 @@
 
 }
 
+.tree{
+   float: left;
+   padding: 10px 20px;
+   margin-bottom: 8px;
+   margin-right: 8px;
+   border: 1px solid #ccc;
+
+}
+.context {
+   float: left;
+   padding: 10px 20px;
+   margin-bottom: 8px;
+   margin-right: 8px;
+   border: 1px solid #ccc;
+
+}
+
+
 /* Permission setting classes */
 .Allow {
   color:green;



More information about the Checkins mailing list