fix UI for forwards - use HTML::Widgets::SelectLayers, closes: Bug#303

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index 5f1466b..bc19fe1 100755 (executable)
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -119,105 +119,58 @@ my($srcsvc,$dstsvc,$dst)=(
 
 #display
 
-my $p1 = popurl(1);
-print header("Mail Forward $action", '',
-      " onLoad=\"visualize()\"");
-
 %>
 
-<SCRIPT>
-function visualize(what){
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-    }
-}
-function fixup(what){
-    if (document.getElementById) {
-      if (document.getElementById('dother').style.visibility == 'hidden') {
-        what.dst.value='';
-      }
-    }
-}
-</SCRIPT>
-
-<%
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+<%= header("Mail Forward $action") %>
 
-print qq!<FORM ACTION="${p1}process/svc_forward.cgi" onSubmit="fixup(this)" METHOD=POST>!;
+<% if ( $cgi->param('error') ) { %>
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
+  <BR><BR>
+<% } %>
 
-#svcnum
-print qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!;
-print qq!Service #<FONT SIZE=+1><B>!, $svcnum ? $svcnum : " (NEW)", "</B></FONT>";
-print qq!<BR>!;
+Service #<%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
+Service: <B><%= $part_svc->svc %></B><BR><BR>
 
-#pkgnum
-print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!;
- 
-#svcpart
-print qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!;
-
-#srcsvc
-print qq!\n\nMail to <SELECT NAME="srcsvc" SIZE=1>!;
-foreach $_ (keys %email) {
-  print "<OPTION", $_ eq $srcsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$email{$_}!;
-}
-print "</SELECT>";
+<FORM NAME="dummy">
 
-#dstsvc
-print qq! forwards to <SELECT NAME="dstsvc" SIZE=1 onChange="changed(this)">!;
-foreach $_ (keys %email) {
-  print "<OPTION", $_ eq $dstsvc ? " SELECTED" : "",
-        qq! VALUE="$_">$email{$_}!;
-}
-print "<OPTION", 0 eq $dstsvc ? " SELECTED" : "",
-      qq! VALUE="0">(other)!;
-print "</SELECT> mailbox.";
-
-%>
-
-<SCRIPT>
-var selectchoice = null;
-function changed(what) {
-  selectchoice = what.options[what.selectedIndex].value;
-  if (selectchoice == "0") {
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = "visible";
-    }
-  }else{
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = "hidden";
-    }
-  }
-}
-if (document.getElementById) {
-    document.write("<DIV ID=\"dother\" STYLE=\"visibility: hidden\">");
-}
-</SCRIPT>
+<%= ntable("#cccccc",2) %>
+<TR><TD ALIGN="right">Email to</TD><TD><SELECT NAME="srcsvc" SIZE=1>
+<% foreach $_ (keys %email) { %>
+  <OPTION<%= $_ eq $srcsvc ? " SELECTED" : "" %> VALUE="<%= $_ %>"><%= $email{$_} %></OPTION>
+<% } %>
+</SELECT></TD></TR>
 
 <%
-print qq! Other destination: <INPUT TYPE="text" NAME="dst" VALUE="$dst">!;
+  tie my %tied_email, 'Tie::IxHash',
+    ''  => 'SELECT DESTINATION',
+    %email,
+    '0' => '(other email address)';
+  my $widget = new HTML::Widgets::SelectLayers(
+    'selected_layer' => $dstsvc,
+    'options'        => \%tied_email,
+    'form_name'      => 'dummy',
+    'form_action'    => 'process/svc_forward.cgi',
+    'form_select'    => ['srcsvc'],
+    'html_between'   => '</TD></TR></TABLE>',
+    'layer_callback' => sub {
+      my $layer = shift;
+      my $html = qq!<INPUT TYPE="hidden" NAME="svcnum" VALUE="$svcnum">!.
+                 qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="$pkgnum">!.
+                 qq!<INPUT TYPE="hidden" NAME="svcpart" VALUE="$svcpart">!.
+                 qq!<INPUT TYPE="hidden" NAME="dstsvc" VALUE="$layer">!;
+      if ( $layer eq '0' ) {
+        $html .= ntable("#cccccc",2).
+                 '<TR><TD ALIGN="right">Destination email</TD>'.
+                 qq!<TD><INPUT TYPE="text" NAME="dst" VALUE="$dst"></TD>!.
+                 '</TR></TABLE>';
+      }
+      $html .= '<BR><INPUT TYPE="submit" VALUE="Submit">';
+      $html;
+    },
+  );
 %>
 
-<SCRIPT>
-if (document.getElementById) {
-    document.write("</DIV>");
-}
-</SCRIPT>
-
-<CENTER><INPUT TYPE="submit" VALUE="Submit"></CENTER>
-</FORM>
-
-<TAG onLoad="
-    if (document.getElementById) {
-      document.getElementById('dother').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-      document.getElementById('dlabel').style.visibility = '<%= $dstsvc ? 'hidden' : 'visible' %>';
-    }
-">
-
-
+<TR><TD ALIGN="right">Forwards to</TD>
+<TD><%= $widget->html %>
   </BODY>
 </HTML>

diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 8d2afc8..c8d1d62 100755 (executable)
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -53,9 +53,15 @@ if ($dstsvc) {
 }
 
 print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
-      "<BR>Service #$svcnum".
-      "<BR>Service: <B>$svc</B>".
-      qq!<BR>Mail to <B>$source</B> forwards to <B>$destination</B> mailbox.!.
+      ntable("#cccccc",2).
+      '<TR><TD ALIGN="right">Service number</TD>'.
+        qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
+      '<TR><TD ALIGN="right">Service</TD>'.
+        qq!<TD BGCOLOR="#ffffff">$svc</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Email to</TD>!.
+        qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
+      qq!<TR><TD ALIGN="right">Forwards to </TD>!.
+        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR></TABLE>!.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;