Changeset 126

Timestamp:

09/20/11 17:22:24 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

UI cleanup: Remove dropdown group list from sidebar now that
the nifty collapsing group tree works

Location:

trunk

Files:

• dns.cgi (modified) (4 diffs)
• templates/menu.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -236 +236 @@
         unless ($permissions{admin} || $permissions{domain_create});
 
-  # hmm.  nothing to do here?
-  # - group list is filled by the same bit that fills the group list in the menu
+  fill_grouplist("grouplist");
+
   if ($webvar{add_failed}) {
     $page->param(add_failed => 1);
@@ -664 +664 @@
   changepage(page => "domlist", errmsg => "You are not permitted to make bulk domain changes")
         unless ($permissions{admin} || $permissions{domain_edit} || $permissions{domain_create} || $permissions{domain_delete});
+
+  fill_grouplist("grouplist");
 
 ##fixme
@@ -1120 +1122 @@
 
   # don't need this while we've got the dropdown in the menu.  hmm.
-  #fill_grouplist;
+  fill_grouplist("grouplist");
 
   $page->param(ifrom => $webvar{ifrom}) if $webvar{ifrom};
@@ -1248 +1250 @@
   $page->param(subs => ($tmpgrplist ? 1 : 0));  # probably not useful to pass gobs of data in for a boolean
   $page->param(inlogingrp => $curgroup == $logingroup);
-
-  # stuff for menu group change.  nb: this is icky.
-  fill_grouplist("grouplist");
 
 # fill in the URL-to-self

trunk/templates/menu.tmpl

@@ -9 +9 @@
 <TMPL_IF mayimport><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=axfr">AXFR Import</a><br /></TMPL_IF>
 <TMPL_IF maybulk><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=bulkdomain">Bulk Domain Operations</a><br /></TMPL_IF>
-<hr />
-Current group:
-<form action="<TMPL_VAR NAME=whereami>" method="post">
-<fieldset>
-<select name="group">
-        <TMPL_LOOP NAME=grouplist><option value="<TMPL_VAR NAME=groupval>"<TMPL_IF NAME=groupactive> selected="selected"</TMPL_IF>><TMPL_VAR NAME=groupname></option>
-        </TMPL_LOOP>
-</select>
-<input type="hidden" name="action" value="chgroup" />
-<input type="submit" value="Change group" />
-</fieldset>
-</form>
 <hr />
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=grpman">Manage groups</a><br />