[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/browser/ Cleaned up permdetails.pt and principalinfo.pt

Daniel Blackburn blackburnd at gmail.com
Mon Feb 4 08:42:19 EST 2008


Log message for revision 83496:
  Cleaned up permdetails.pt and principalinfo.pt

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

-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/permdetails.pt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/permdetails.pt	2008-02-04 13:29:08 UTC (rev 83495)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/permdetails.pt	2008-02-04 13:42:18 UTC (rev 83496)
@@ -13,61 +13,64 @@
    intersection of the view and principal are displayed here. This
    view displays the permissions, roles, and groups applied to the
    view and principal previously selected on the securityMatrix.html page. You
-   can go back to the securityMatrix page by selecting the `Security
+   can go back to the matrix page by selecting the `Security
    Matrix` link above. </p>
-   <h1 class="just_border">&nbsp</h1>
-    <div class="sub_heading">
-      <span  tal:content="structure view/message">This permission details
-	for the user </span>
-    </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">
 
-            <ul>
-              <div tal:repeat="permission permissions">
-                <li>
-                  <div tal:attributes="class permission/setting" 
-                       tal:content="permission/name"></div>
-                <li>
-              </div>
-             </ul>
-           </div>
+   <div class="matrix_body">
+       <h1 class="just_border">&nbsp</h1>
+        <div class="sub_heading">
+          <span  tal:content="structure view/message">This permission details
+    	for the user </span>
+        </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">
 
-          <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>
-            </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]; 
-                                 permissions group/permissions; 
-                                 roles group/roles; 
-                                 groups group/groups">
-                  <div metal:use-macro="macro:permission-details" />
+                <ul>
+                  <div tal:repeat="permission permissions">
+                    <li>
+                      <div tal:attributes="class permission/setting" 
+                           tal:content="permission/name"></div>
+                    <li>
+                  </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>
                 </div>
-              </div>
-            </div>
-        </metal:block>
+                
+                <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]; 
+                                     permissions group/permissions; 
+                                     roles group/roles; 
+                                     groups group/groups">
+                      <div metal:use-macro="macro:permission-details" />
+                    </div>
+                  </div>
+                </div>
+            </metal:block>
+        </div>
     </body>
 </html>

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt	2008-02-04 13:29:08 UTC (rev 83495)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/principalinfo.pt	2008-02-04 13:42:18 UTC (rev 83496)
@@ -5,7 +5,6 @@
     </head>
     <body>
        <h1>Security Checking Tool</h1>
-
        <div class="top_nav">
          <span class="top_nav_val"  onclick="javascript:history.back()"><u>Security Matrix</u>&nbsp|&nbsp</span>
          <span class="top_nav_val">Principal Settings </span>
@@ -14,53 +13,56 @@
          roles for the selected principal are listed below. These are
          all the settings applied to the principal in the system
          regardless of the context or view. The settings Allow or Deny
-         are also listed next to each permission.
+         are also listed next to each permission.You can go back to
+         the matrix page by selecting the `Security Matrix` link above. 
        </p>
-       <h1 class="just_border">&nbsp</h1>
-       <div class="sub_heading">Permission settings for principal <em tal:content="view/principal"></em></div>
-       <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="matrix_body">
+           <h1 class="just_border">&nbsp</h1>
+           <div class="sub_heading">Permission settings for principal <em tal:content="view/principal"></em></div>
+           <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">
 
-              <tal:block tal:condition="permissions">
-                  <h3>Directly provided permissions</h3>
-                  <div tal:repeat="permission permissions">
-                    <span tal:replace="permission">zope.ManageSite</span>
+                  <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>
                   </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>
+
+                <div class="contentList" tal:condition="groups">
                   <br>
-
+                  <h3>Permissions provided by group(s)</h3>
+                    <div class="contentList" tal:repeat="group_id groups">
+                      <div tal:content="group_id">zope.Authenticated</div>
+                      <div tal:define="group python:groups[group_id];
+                                       permissions group/permissions;
+                                       roles group/roles;
+                                       groups group/groups">
+                       <div metal:use-macro="macro:user-details" />
+                     </div>
+                    </div>
                 </div>
-              </div>
-
-            <div class="contentList" tal:condition="groups">
-              <br>
-              <h3>Permissions provided by group(s)</h3>
-                <div class="contentList" tal:repeat="group_id groups">
-                  <div tal:content="group_id">zope.Authenticated</div>
-                  <div tal:define="group python:groups[group_id];
-                                   permissions group/permissions;
-                                   roles group/roles;
-                                   groups group/groups">
-                   <div metal:use-macro="macro:user-details" />
-                 </div>
-                </div>
-            </div>
-          </metal:block>
+              </metal:block>
+        </div>
     </body>
 </html>

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css	2008-02-04 13:29:08 UTC (rev 83495)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/securitytool.css	2008-02-04 13:42:18 UTC (rev 83496)
@@ -114,7 +114,7 @@
 
 .legend {
    font-style: italic;
-   margin-left: 2em;
+   /*margin-left: 25px;*/
    font-size: 85%;
    margin-bottom: 2em;
 
@@ -127,7 +127,7 @@
 
 .top_nav {
     margin-top: 5px;
-    margin-left: 2em;
+    margin-left: 38px;
     margin-bottom: 10px;
 }
 
@@ -152,7 +152,7 @@
    font-size: 115%;
    color: grey;
    margin-bottom: 8px;
-   margin-left: 25px;
+   /*margin-left: 25px;*/
 
 }
 



More information about the Checkins mailing list