Changeset 66 for trunk/templates

Timestamp:

11/26/10 17:43:34 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Basic group permissions editing functional - enforcing is trivial

• add group now adds the permissions entry. TBD: permission inheritance
• edit group Does The Right Thing(TM) - either editing the existing entry, or converting an inherited permission group to a separate one. still needs to rewrite subgroup and contained user inherited permissions
• the HTML permissions table rows have been moved. edit-user should pick this up, and will require calling the template explicitly so as to show both the default and custom permissions.
• the list of individual permissions have been moved to a list in DNSDB.pm code that refers to this should not assume any given length - this makes adding new permission types (somewhat) easier

Tweak menu group-tree CSS (again) add some (broken) images

• this should probalby revert to an earlier setup that uses an image as the <li> bullet point rather than pushing the text to the right, since many (most?) nodes will usually be leaf nodes

HTML changes not validated

Location:

trunk/templates

Files:

• addgroup.tmpl (modified) (1 diff)
• dns.css (modified) (2 diffs)
• edgroup.tmpl (modified) (3 diffs)
• grptree.tmpl (modified) (1 diff)
• newgrp.tmpl (modified) (1 diff)
• permlist.tmpl (added)

trunk/templates/addgroup.tmpl

@@ -1 +1 @@
 <TMPL_IF add_failed>
-<TMPL_INCLUDE NAME="newdomain.tmpl">
+<TMPL_INCLUDE NAME="newgrp.tmpl">
 <TMPL_ELSE>
 <TMPL_INCLUDE NAME="grpman.tmpl">

trunk/templates/dns.css

@@ -164 +164 @@
 /* Need to find a way to vertically centre the plus image on the text.  >:(  */
 li.hassub {
-        background-image: url('../images/fwd.png');
+        background-image: url('../images/plus.png');
         background-repeat: no-repeat;
         background-position: 0px 1px;
-        padding-left: 10px;
+        padding-left: 14px;
         //list-style: none outside url('../images/fwd.png');
-        margin-left: 0px;
+        margin-left: -12px;
 }
 li.leaf {
         //list-style: none outside none;
         //margin-left: 0px;
-}
-li.lastinlvl {
-        background-image: url('../images/ASC.png');
+        background-image: url('../images/midleaf.png');
         background-repeat: no-repeat;
         background-position: 0px 1px;
-        padding-left: 10px;
-        //list-style: none outside url('../images/fwd.png');
-        margin-left: 0px;
+        padding-left: 14px;
+        margin-left: -12px;
+}
+li.lastinlvl {
+        background-image: url('../images/lastleaf.png');
+        background-repeat: no-repeat;
+        background-position: 0px 1px;
+        padding-left: 14px;
+        //list-style: none outside url('../images/lastleaf.png');
+        margin-left: -12px;
 }
 ul.grptree {
         list-style-type: none;
         padding: 0px;
-        margin: 0px;
+        margin-left: 14px;
 }
 #grptree {
@@ -246 +251 @@
         border-right: thin solid #000000;
         margin-right: 5px;
-        padding: 3px;
+        padding: 5px;
 }
 #soadetail {

trunk/templates/edgroup.tmpl

@@ -4 +4 @@
 
 <td align="center">
-
-<TMPL_IF msg>
-</TMPL_IF>
 
 <form action="dns.cgi" method="post">
@@ -16 +13 @@
 
 <table class="border" border="0" cellspacing="5" cellpadding="0">
+<TMPL_IF errmsg><tr>
+        <td class="errhead" colspan="4">Error updating group <TMPL_VAR NAME=grpmeddle>: <TMPL_VAR NAME=errmsg></td>
+</tr></TMPL_IF>
 <tr>
         <th align="center" colspan="5">Default permissions for group <TMPL_VAR NAME=grpmeddle></th>
@@ -22 +22 @@
         <td align="center" colspan="5" class="border">By default, users of this group will inherit the following privileges:</td>
 </tr>
-<tr>
-        <td align="right">Group:</td>
-        <td<TMPL_UNLESS may_group_edit> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="group_edit"<TMPL_IF group_edit> checked="checked"</TMPL_IF><TMPL_UNLESS may_group_edit> disabled="disabled"</TMPL_UNLESS> /> Edit</td>
-        <td<TMPL_UNLESS may_group_create> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="group_create"<TMPL_IF group_create> checked="checked"</TMPL_IF><TMPL_UNLESS may_group_create> disabled="disabled"</TMPL_UNLESS> /> Create</td>
-        <td<TMPL_UNLESS may_group_delete> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="group_delete"<TMPL_IF group_delete> checked="checked"</TMPL_IF><TMPL_UNLESS may_group_delete> disabled="disabled"</TMPL_UNLESS> /> Delete</td> </tr>
-<tr>
-        <td align="right">User:</td>
-        <td<TMPL_UNLESS may_user_edit> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="user_edit"<TMPL_IF user_edit> checked="checked"</TMPL_IF><TMPL_UNLESS may_user_edit> disabled="disabled"</TMPL_UNLESS> /> Edit</td>
-        <td<TMPL_UNLESS may_user_create> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="user_create"<TMPL_IF user_create> checked="checked"</TMPL_IF><TMPL_UNLESS may_user_create> disabled="disabled"</TMPL_UNLESS> /> Create</td>
-        <td<TMPL_UNLESS may_user_delete> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="user_delete"<TMPL_IF user_delete> checked="checked"</TMPL_IF><TMPL_UNLESS may_user_delete> disabled="disabled"</TMPL_UNLESS> /> Delete</td>
-</tr>
-<tr>
-        <td align="right">Domain:</td>
-        <td<TMPL_UNLESS may_domain_edit> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="domain_edit"<TMPL_IF domain_edit> checked="checked"</TMPL_IF><TMPL_UNLESS may_domain_edit> disabled="disabled"</TMPL_UNLESS> /> Edit</td>
-        <td<TMPL_UNLESS may_domain_create> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="domain_create"<TMPL_IF domain_create> checked="checked"</TMPL_IF><TMPL_UNLESS may_domain_create> disabled="disabled"</TMPL_UNLESS> /> Create</td>
-        <td<TMPL_UNLESS may_domain_delete> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="domain_delete"<TMPL_IF domain_delete> checked="checked"</TMPL_IF><TMPL_UNLESS may_domain_delete> disabled="disabled"</TMPL_UNLESS> /> Delete</td>
-        <!-- td class="noaccess"> - Delegate [fixme: WTF?]</td -->
-</tr>
-<tr>
-        <td align="right">Domain Record:</td>
-        <td<TMPL_UNLESS may_record_edit> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="record_edit"<TMPL_IF record_edit> checked="checked"</TMPL_IF><TMPL_UNLESS may_record_edit> disabled="disabled"</TMPL_UNLESS> /> Edit</td>
-        <td<TMPL_UNLESS may_record_create> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="record_create"<TMPL_IF record_create> checked="checked"</TMPL_IF><TMPL_UNLESS may_record_create> disabled="disabled"</TMPL_UNLESS> /> Create</td>
-        <td<TMPL_UNLESS may_record_delete> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="record_delete"<TMPL_IF record_delete> checked="checked"</TMPL_IF><TMPL_UNLESS may_record_delete> disabled="disabled"</TMPL_UNLESS> /> Delete</td>
-        <!-- td class="noaccess"> - Delegate</td -->
-</tr>
-<tr>
-        <td align="right">Self:</td>
-        <td<TMPL_UNLESS may_self_edit> class="noaccess"</TMPL_UNLESS>><input type="checkbox" name="self_edit"<TMPL_IF self_edit> checked="checked"</TMPL_IF><TMPL_UNLESS may_self_edit> disabled="disabled"</TMPL_UNLESS> /> Edit</td>
-</tr>
+<TMPL_INCLUDE name="permlist.tmpl">
 <tr>
         <td colspan="6" align="center"><input type="submit" value="edit" /></td>

trunk/templates/grptree.tmpl

@@ -1 +1 @@
 <ul>
-<TMPL_LOOP NAME=treelvl><li class="<TMPL_IF NAME=subs>hassub<TMPL_ELSE>leaf</TMPL_IF><TMPL_IF last> lastinlvl</TMPL_IF>"><TMPL_VAR NAME=grpname>
+<TMPL_LOOP NAME=treelvl><li class="<TMPL_IF last>lastinlvl </TMPL_IF><TMPL_IF NAME=subs>hassub<TMPL_ELSE>leaf</TMPL_IF>"><TMPL_VAR NAME=grpname>
 <TMPL_VAR NAME=subs></li>
 </TMPL_LOOP></ul>

trunk/templates/newgrp.tmpl

@@ -15 +15 @@
 <tr><td>
     <table border="0" cellspacing="2" cellpadding="2" width="100%">
-<TMPL_IF add_failed>    <tr><td class="errhead" colspan="2">Error adding group <TMPL_VAR NAME=newgroup>: <TMPL_VAR NAME=errmsg></td></tr></TMPL_IF>
-        <tr class="darkrowheader"><td colspan="2" align="center">Add Group</td></tr>
+<TMPL_IF add_failed>    <tr><td class="errhead" colspan="4">Error adding group <TMPL_VAR NAME=newgroup>: <TMPL_VAR NAME=errmsg></td></tr></TMPL_IF>
+        <tr class="darkrowheader"><td colspan="4" align="center">Add Group</td></tr>
 
         <tr class="datalinelight">
-                <td>Group Name:</td>
-                <td align="left"><input type="text" name="newgroup" value="<TMPL_VAR NAME=newgroup>" /></td>
+                <td colspan=2>Group Name:</td>
+                <td align="left" colspan=2><input type="text" name="newgroup" value="<TMPL_VAR NAME=newgroup>" /></td>
         </tr>
         <tr class="datalinelight">
-                <td>Add as subgroup of:</td>
-                <td><select name="pargroup">
+                <td colspan=2>Add as subgroup of:</td>
+                <td colspan=2><select name="pargroup">
 <TMPL_LOOP name=pargroup>               <option value="<TMPL_VAR NAME=groupval>"<TMPL_IF groupactive> selected="selected"</TMPL_IF>><TMPL_VAR name=groupname></option>
 </TMPL_LOOP>
                 </select></td>
         </tr>
-        <tr><td colspan="2" align="center"><input type="submit" value="Add group" /></td></tr>
-<tr><td colspan="2">tmp note:  radio button select "group template" vs "clone group"?</td></tr>
+        <tr class="darkrowheader border">
+                <td colspan="4" align="center">Default permissions for users created in this group:</td>
+        </tr>
+<TMPL_INCLUDE name="permlist.tmpl">
+        <tr class="darkrowheader">
+                <td colspan="4" align="center"><input type="submit" value="Add group" /></td>
+        </tr>
+<tr><td colspan="4">tmp note:  radio button select "group template" vs "clone group"?</td></tr>
     </table>
     </td>