[Rt-commit] [rtir] 03/03: Make lookup tools tabular

[Shawn Moore]

This is an automated email from the git hooks/post-receive script.

shawn pushed a commit to branch 3.4/lookup-improvements
in repository rtir.

commit 002952264ab01037a9dd6700e0ccdd362a75de9b
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Tue Feb 9 21:54:01 2016 +0000

    Make lookup tools tabular
    
        Looks much nicer!
    
    Fixes: I#31300
---
 html/RTIR/Tools/Elements/ToolFormIframe     |  6 +++++-
 html/RTIR/Tools/Elements/ToolFormTraceroute |  6 +++++-
 html/RTIR/Tools/Elements/ToolFormWhois      |  6 +++++-
 html/RTIR/Tools/Elements/Tools              | 19 ++++++++++++-------
 static/css/rtir-styles.css                  |  4 ++++
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/html/RTIR/Tools/Elements/ToolFormIframe b/html/RTIR/Tools/Elements/ToolFormIframe
index 842f591..e49b43f 100644
--- a/html/RTIR/Tools/Elements/ToolFormIframe
+++ b/html/RTIR/Tools/Elements/ToolFormIframe
@@ -45,11 +45,13 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+<tr>
+<td valign="middle" class="label"><%loc('Research Tool')%>:</td>
+<td valign="middle">
 <form action="Lookup.html" method="get">
 % foreach my $arg ( grep exists $ARGS{$_}, @PassArguments ) {
   <input type="hidden" name="<% $arg %>" value="<% $ARGS{ $arg } %>" />
 % }
-    <span class="label"><%loc('Research Tool')%>:</span>
     <span class="input">
       <input type="text" size="30" name="q" value="<% $q %>" /> at
       <select name="ResearchTool">
@@ -60,6 +62,8 @@
     </span>
     <input type="submit" value="<%loc('Go')%>" />
 </form>
+</td>
+</tr>
 <%args>
 $q => ''
 $ResearchTool => ''
diff --git a/html/RTIR/Tools/Elements/ToolFormTraceroute b/html/RTIR/Tools/Elements/ToolFormTraceroute
index 1ef82fc..8525897 100644
--- a/html/RTIR/Tools/Elements/ToolFormTraceroute
+++ b/html/RTIR/Tools/Elements/ToolFormTraceroute
@@ -45,14 +45,18 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+<tr>
+<td valign="top" class="label"><%loc('Traceroute to')%>:</td>
+<td valign="top">
 <form action="Traceroute.html" method="get" target="_blank">
 % foreach my $arg ( grep exists $ARGS{$_}, @PassArguments ) {
   <input type="hidden" name="<% $arg %>" value="<% $ARGS{ $arg } %>" />
 % }
-    <span class="label">Traceroute to:</span>
     <span class="input"><input type="text" size="30" name="q" value="<% $q %>" /></span>
     <input type="submit" value="<%loc('Go')%>" />
 </form>
+</td>
+</tr>
 <%args>
 $q => ''
 @PassArguments => ()
diff --git a/html/RTIR/Tools/Elements/ToolFormWhois b/html/RTIR/Tools/Elements/ToolFormWhois
index 5bba3fe..edc3c41 100644
--- a/html/RTIR/Tools/Elements/ToolFormWhois
+++ b/html/RTIR/Tools/Elements/ToolFormWhois
@@ -45,17 +45,21 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+<tr>
+<td valign="top" class="label"><%loc('WHOIS')%>:</td>
+<td valign="top">
 <form name="ToolFormWhois" action="Lookup.html" method="get">
 % foreach my $arg ( grep exists $ARGS{$_}, @PassArguments ) {
   <input type="hidden" name="<% $arg %>" value="<% $ARGS{ $arg } %>" />
 % }
-  <span class="label">WHOIS:</span>
   <span class="input">
     <input type="text" size="30" name="q" value="<% $q %>" /> at 
     <& SelectWhoisServer, Name => 'WhoisServer', Default => $WhoisServer &>
   </span>
   <input type="submit" value="<%loc('Go')%>" />
 </form>
+</td>
+</tr>
 <%args>
 $q => ''
 $WhoisServer => undef
diff --git a/html/RTIR/Tools/Elements/Tools b/html/RTIR/Tools/Elements/Tools
index dccd2ec..a873ee2 100644
--- a/html/RTIR/Tools/Elements/Tools
+++ b/html/RTIR/Tools/Elements/Tools
@@ -45,17 +45,22 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<%perl>
+<%INIT>
 my $tools = RT->Config->Get('RTIRResearchTools') || ();
-for my $tool (@$tools) {
-    if ($m->comp_exists('ToolForm' . $tool)) {
-        $m->comp('ToolForm' . $tool, %ARGS);
-    }
-}
+</%INIT>
+
+<table class="lookup-tool-forms">
+% for my $tool (@$tools) {
+%     if ($m->comp_exists('ToolForm' . $tool)) {
+%         $m->comp('ToolForm' . $tool, %ARGS);
+%    }
+% }
+</table>
+
+<%perl>
 for my $tool (@$tools) {
     if ($m->comp_exists('ToolResults' . $tool)) {
         $m->comp('ToolResults' . $tool, %ARGS);
     }
 }
-
 </%perl>
diff --git a/static/css/rtir-styles.css b/static/css/rtir-styles.css
index 28dd0a4..a03efeb 100644
--- a/static/css/rtir-styles.css
+++ b/static/css/rtir-styles.css
@@ -145,3 +145,7 @@ body.rtir #editquery, body.rtir #editsearches {
 body.rtir .sf-menu a.sf-with-ul {
     padding-right:2em;
 }
+
+body.rtir table.lookup-tool-forms td {
+    vertical-align: middle;
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.