Re-factored mover arrows UI

diff --git a/images/movedown.gif b/images/movedown.gif
new file mode 100644 (file)
index 0000000..73025ba
Binary files /dev/null and b/images/movedown.gif differ

diff --git a/images/movegap.gif b/images/movegap.gif
new file mode 100644 (file)
index 0000000..1a77764
Binary files /dev/null and b/images/movegap.gif differ

diff --git a/images/moveup.gif b/images/moveup.gif
new file mode 100644 (file)
index 0000000..23ff2fe
Binary files /dev/null and b/images/moveup.gif differ

diff --git a/squid/edit_acl.cgi b/squid/edit_acl.cgi
index 9de18bc..1167b06 100755 (executable)
--- a/squid/edit_acl.cgi
+++ b/squid/edit_acl.cgi
@@ -78,21 +78,12 @@ if (@http) {
                push(@cols, "<a href=\"http_access.cgi?index=$h->{'index'}\">".
                            "$v[0]</a>");
                push(@cols, &html_escape(join(' ', @v[1..$#v])));
-               local $mover;
-               if ($hc != @http-1) {
-                       $mover .= "<a href=\"move_http.cgi?$hc+1\">".
-                                 "<img src=images/down.gif border=0></a>";
-                       }
-               else {
-                       $mover .= "<img src=images/gap.gif>";
-                       }
-               if ($hc != 0) {
-                       $mover .= "<a href=\"move_http.cgi?$hc+-1\">".
-                                 "<img src=images/up.gif border=0></a>";
-                       }
-               else {
-                       $mover .= "<img src=images/gap.gif>";
-                       }
+               local $mover = &ui_up_down_arrows(
+                       "move_http.cgi?$hc+-1",
+                       "move_http.cgi?$hc+1",
+                       $hc != 0,
+                       $hc != @http-1
+                       );
                push(@cols, $mover);
                print &ui_checked_columns_row(\@cols, \@tds, "d",$h->{'index'});
                $hc++;
@@ -131,21 +122,11 @@ if (@icp) {
                push(@cols, "<a href=\"icp_access.cgi?index=$i->{'index'}\">".
                            "$v[0]</a>");
                push(@cols, &html_escape(join(' ', @v[1..$#v])));
-               local $mover;
-               if ($hc != @icp-1) {
-                       $mover .= "<a href=\"move_icp.cgi?$hc+1\">".
-                                 "<img src=images/down.gif border=0></a>";
-                       }
-               else {
-                       $mover .= "<img src=images/gap.gif>";
-                       }
-               if ($hc != 0) {
-                       $mover .= "<a href=\"move_icp.cgi?$hc+-1\">".
-                                 "<img src=images/up.gif border=0></a>";
-                       }
-               else {
-                       $mover .= "<img src=images/gap.gif>";
-                       }
+               local $mover = &ui_up_down_arrows(
+                       "move_icp.cgi?$ic+-1",
+                       "move_icp.cgi?$ic+1",
+                       $ic != 0,
+                       $ic != @icp-1);
                push(@cols, $mover);
                print &ui_checked_columns_row(\@cols, \@tds, "d",$i->{'index'});
                $ic++;

diff --git a/ui-lib.pl b/ui-lib.pl
index 5b3a085..be12d2a 100644 (file)
--- a/ui-lib.pl
+++ b/ui-lib.pl
@@ -788,7 +788,7 @@ local $divid = "hiddendiv_$name";
 local $openerid = "hiddenopener_$name";
 local $defimg = $status ? "open.gif" : "closed.gif";
 local $defclass = $status ? 'opener_shown' : 'opener_hidden';
-$rv .= "<a href=\"javascript:hidden_opener('$divid', '$openerid')\" id='$openerid'><img border=0 src='$gconfig{'webprefix'}/images/$defimg'></a>\n";
+$rv .= "<a href=\"javascript:hidden_opener('$divid', '$openerid')\" id='$openerid'><img border=0 src='$gconfig{'webprefix'}/images/$defimg' alt='*'></a>\n";
 $rv .= "<a href=\"javascript:hidden_opener('$divid', '$openerid')\">$title</a><br>\n";
 $rv .= "<div class='$defclass' id='$divid'>\n";
 return $rv;
@@ -1115,6 +1115,31 @@ $rv .= "</table>\n";
 return $rv;
 }
 
+# ui_up_down_arrows(uplink, downlink, up-show, down-show)
+# Returns HTML for moving some objects in a table up or down
+sub ui_up_down_arrows
+{
+return &theme_ui_up_down_arrows(@_) if (defined(&theme_ui_up_down_arrows));
+local ($uplink, $downlink, $upshow, $downshow) = @_;
+local $mover;
+local $imgdir = "$gconfig{'webprefix'}/images";
+if ($downshow) {
+       $mover .= "<a href=\"$downlink\">".
+                 "<img src=$imgdir/movedown.gif border=0></a>";
+       }
+else {
+       $mover .= "<img src=$imgdir/movegap.gif>";
+       }
+if ($upshow) {
+       $mover .= "<a href=\"$uplink\">".
+                 "<img src=$imgdir/moveup.gif border=0></a>";
+       }
+else {
+       $mover .= "<img src=$imgdir/movegap.gif>";
+       }
+return $mover;
+}
+
 ####################### javascript functions
 
 # js_disable_input(&disable-inputs, &enable-inputs, [tag])