[Debtags-commits] [svn] r1484 -
central-database/branches/alioth/webfrontend
Enrico Zini
enrico at costa.debian.org
Mon Nov 14 13:31:03 UTC 2005
Author: enrico
Date: Mon Nov 14 13:31:03 2005
New Revision: 1484
Modified:
central-database/branches/alioth/webfrontend/main.css
central-database/branches/alioth/webfrontend/search.cgi
central-database/branches/alioth/webfrontend/searchtemplate.html
Log:
Implemented a 'begin screen' so that we don't beging with a looooong search of all the packages.
Improved templates to display the add/remove.. buttons more nicely
Modified: central-database/branches/alioth/webfrontend/main.css
==============================================================================
--- central-database/branches/alioth/webfrontend/main.css (original)
+++ central-database/branches/alioth/webfrontend/main.css Mon Nov 14 13:31:03 2005
@@ -235,14 +235,23 @@
padding: 0.5em;
}
.sebuttons {
-font-size: small;
+font-size: x-small;
+padding-bottom: 3pt;
+padding-left: 7pt;
}
.sefacet {
}
.setag {
-padding-left: 1em;
+padding-left: 7pt;
font-style: italic;
}
+#sebegin {
+margin: 3em;
+padding: 3em;
+border: 1pt solid black;
+text-align: center;
+vertical-align: center;
+}
#close {
padding-top: 2px;
Modified: central-database/branches/alioth/webfrontend/search.cgi
==============================================================================
--- central-database/branches/alioth/webfrontend/search.cgi (original)
+++ central-database/branches/alioth/webfrontend/search.cgi Mon Nov 14 13:31:03 2005
@@ -48,24 +48,25 @@
# Parse input values
my (@want_tags, @unwant_tags, @ignore_tags, @sel_words);
+my $action = 'begin';
if (my $selwords = param('start'))
{
+ $action = 'search';
# msg "Found: start->%s\n", $selwords;
if ($selwords =~ m/[A-Za-z0-9 ._-]+/)
{
@sel_words = grep { $_ } split(/\s+/, $selwords);
@want_tags = Engine::tagsForSearch($max_tags, @sel_words);
}
-} else {
- if (my $selwords = param('oldstart'))
+} elsif ($selwords = param('oldstart')) {
+ $action = 'search';
+# msg "Found: oldstart->%s\n", $selwords;
+ if ($selwords =~ m/[A-Za-z0-9 ._-]+/)
{
-# msg "Found: oldstart->%s\n", $selwords;
- if ($selwords =~ m/[A-Za-z0-9 ._-]+/)
- {
- @sel_words = grep { $_ } split(/\s+/, $selwords);
- }
+ @sel_words = grep { $_ } split(/\s+/, $selwords);
}
+
if (my $want = param('want'))
{
# msg "Found: want->%s\n", $want;
@@ -286,6 +287,7 @@
## Compile template structures
##
+$template->param('BEGIN' => ($action eq 'begin'));
$template->param(CURWORDS => join(' ', at sel_words));
$template->param(WTAGS => \@ht_wtags);
Modified: central-database/branches/alioth/webfrontend/searchtemplate.html
==============================================================================
--- central-database/branches/alioth/webfrontend/searchtemplate.html (original)
+++ central-database/branches/alioth/webfrontend/searchtemplate.html Mon Nov 14 13:31:03 2005
@@ -13,9 +13,12 @@
<body>
<form name="search" method="get">
+ <tmpl_if name="BEGIN">
+ <tmpl_else>
<div id="search">
New search: <input type="text" name="start" value='<tmpl_var name="CURWORDS">'>
</div>
+ </tmpl_if>
<h1><a href="search.cgi">Debtags-Enhanced Search</a></h1>
@@ -30,159 +33,165 @@
<a href="http://debtags.alioth.debian.org/">Debtags Homepage</a> at <a href="http://alioth.debian.org/">Alioth</a>.</p>
</div>
- <div id="wtags">
- <p>Wanted tags:
- <tmpl_if name="WTAGS">
- </p>
- <ul>
- <tmpl_loop name="WTAGS">
- <li>
- <div class="sebuttons">
- <a href='<tmpl_var name="UNWURL">'>[Don't want]</a>
- <a href='<tmpl_var name="IGURL">'>[Ignore]</a>
- <a href='<tmpl_var name="REMURL">'>[Remove]</a>
- </div>
- <div class="sefacet">
- <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
- </div>
- <div class="setag">
- <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
- </div>
- </li>
- </tmpl_loop>
- </ul>
- <tmpl_else>
- <b>none</b></p>
- </tmpl_if>
- </div>
+ <tmpl_if name="BEGIN">
+ <div id="sebegin">
+ Start a new search: <input type="text" name="start" value='<tmpl_var name="CURWORDS">'>
+ </div>
+ <tmpl_else>
+ <div id="wtags">
+ <p>Wanted tags:
+ <tmpl_if name="WTAGS">
+ </p>
+ <ul>
+ <tmpl_loop name="WTAGS">
+ <li>
+ <div class="sefacet">
+ <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
+ </div>
+ <div class="setag">
+ <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
+ </div>
+ <div class="sebuttons">
+ <a href='<tmpl_var name="UNWURL">'>[Don't want]</a>
+ <a href='<tmpl_var name="IGURL">'>[Ignore]</a>
+ <a href='<tmpl_var name="REMURL">'>[Remove]</a>
+ </div>
+ </li>
+ </tmpl_loop>
+ </ul>
+ <tmpl_else>
+ <b>none</b></p>
+ </tmpl_if>
+ </div>
- <div id="utags">
- <p>Unwanted tags:
- <tmpl_if name="UTAGS">
- </p>
- <ul>
- <tmpl_loop name="UTAGS">
- <li>
- <div class="sebuttons">
- <a href='<tmpl_var name="WAURL">'>[Want]</a>
- <a href='<tmpl_var name="IGURL">'>[Ignore]</a>
- <a href='<tmpl_var name="REMURL">'>[Remove]</a>
- </div>
- <div class="sefacet">
- <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
- </div>
- <div class="setag">
- <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
- </div>
- </li>
- </tmpl_loop>
- </ul>
- <tmpl_else>
- <b>none</b></p>
- </tmpl_if>
- </div>
+ <div id="utags">
+ <p>Unwanted tags:
+ <tmpl_if name="UTAGS">
+ </p>
+ <ul>
+ <tmpl_loop name="UTAGS">
+ <li>
+ <div class="sefacet">
+ <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
+ </div>
+ <div class="setag">
+ <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
+ </div>
+ <div class="sebuttons">
+ <a href='<tmpl_var name="WAURL">'>[Want]</a>
+ <a href='<tmpl_var name="IGURL">'>[Ignore]</a>
+ <a href='<tmpl_var name="REMURL">'>[Remove]</a>
+ </div>
+ </li>
+ </tmpl_loop>
+ </ul>
+ <tmpl_else>
+ <b>none</b></p>
+ </tmpl_if>
+ </div>
- <div id="itags">
- <p>Ignored tags:
- <tmpl_if name="ITAGS">
- </p>
- <ul>
- <tmpl_loop name="ITAGS">
- <li>
- <div class="sebuttons">
- <a href='<tmpl_var name="WAURL">'>[Want]</a>
- <a href='<tmpl_var name="UNWURL">'>[Don't want]</a>
- <a href='<tmpl_var name="REMURL">'>[Remove]</a>
- </div>
- <div class="sefacet">
- <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
- </div>
- <div class="setag">
- <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
- </div>
- </li>
- </tmpl_loop>
- </ul>
- <tmpl_else>
- <b>none</b></p>
- </tmpl_if>
- </div>
+ <div id="itags">
+ <p>Ignored tags:
+ <tmpl_if name="ITAGS">
+ </p>
+ <ul>
+ <tmpl_loop name="ITAGS">
+ <li>
+ <div class="sefacet">
+ <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
+ </div>
+ <div class="setag">
+ <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
+ </div>
+ <div class="sebuttons">
+ <a href='<tmpl_var name="WAURL">'>[Want]</a>
+ <a href='<tmpl_var name="UNWURL">'>[Don't want]</a>
+ <a href='<tmpl_var name="REMURL">'>[Remove]</a>
+ </div>
+ </li>
+ </tmpl_loop>
+ </ul>
+ <tmpl_else>
+ <b>none</b></p>
+ </tmpl_if>
+ </div>
- <div id="ttags">
- <p>Top tags in the result:
- <tmpl_if name="TTAGS">
- </p>
- <ul>
- <tmpl_loop name="TTAGS">
- <li>
- <div class="sebuttons">
- <a href='<tmpl_var name="WAURL">'>[Want]</a>
- <a href='<tmpl_var name="UNWURL">'>[Don't want]</a>
- <a href='<tmpl_var name="IGURL">'>[Ignore]</a>
- </div>
- <div class="sefacet">
- <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
- </div>
- <div class="setag">
- <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
- </div>
- </li>
- </tmpl_loop>
- </ul>
- <tmpl_else>
- <b>none</b></p>
- </tmpl_if>
- </div>
+ <div id="ttags">
+ <p>Top tags in the result:
+ <tmpl_if name="TTAGS">
+ </p>
+ <ul>
+ <tmpl_loop name="TTAGS">
+ <li>
+ <div class="sefacet">
+ <span title="<tmpl_var name='FNAME'>: <tmpl_var name='FLDESC'>"><tmpl_var name="FSDESC"></span>:
+ </div>
+ <div class="setag">
+ <span title="<tmpl_var name='NAME'>: <tmpl_var name='LDESC'>"><tmpl_var name="SDESC"></span> <!-- tmpl_var name="COUNT" -->
+ </div>
+ <div class="sebuttons">
+ <a href='<tmpl_var name="WAURL">'>[Want]</a>
+ <a href='<tmpl_var name="UNWURL">'>[Don't want]</a>
+ <a href='<tmpl_var name="IGURL">'>[Ignore]</a>
+ </div>
+ </li>
+ </tmpl_loop>
+ </ul>
+ <tmpl_else>
+ <b>none</b></p>
+ </tmpl_if>
+ </div>
- <div style="clear: both"></div>
+ <div style="clear: both"></div>
- <div id="packages">
- <div class="intro">
- <p><tmpl_var name="PKGS_INTRO"></p>
- </div>
-
- <tmpl_if name="PKGS">
- <div id="curpkgs">
- <tmpl_loop name="PKGS">
- <a class="pkg" href='<tmpl_var name="URL">'><tmpl_var name="NAME"></a>
- - <tmpl_var name="SDESC"><br />
- </tmpl_loop>
+ <div id="packages">
+ <div class="intro">
+ <p><tmpl_var name="PKGS_INTRO"></p>
</div>
- </tmpl_if>
-
- <tmpl_if name="SUBPKGS">
- <table class="pkglist">
- <tmpl_loop name="SUBPKGS">
- <tmpl_if SECTION>
- <tr>
- <td class="left">
- <div class="pkggroup">
- <tmpl_loop name="SECTION">
- <tmpl_var name="NAME"><br />
- </tmpl_loop>
- </div>
+
+ <tmpl_if name="PKGS">
+ <div id="curpkgs">
+ <tmpl_loop name="PKGS">
+ <a class="pkg" href='<tmpl_var name="URL">'><tmpl_var name="NAME"></a>
+ - <tmpl_var name="SDESC"><br />
+ </tmpl_loop>
+ </div>
+ </tmpl_if>
+
+ <tmpl_if name="SUBPKGS">
+ <table class="pkglist">
+ <tmpl_loop name="SUBPKGS">
+ <tmpl_if SECTION>
+ <tr>
+ <td class="left">
+ <div class="pkggroup">
+ <tmpl_loop name="SECTION">
+ <tmpl_var name="NAME"><br />
+ </tmpl_loop>
+ </div>
+ </td>
+ <td class="right">
+ </tmpl_if>
+ <a class="pkg" href="<tmpl_var name="URL">"><tmpl_var name="NAME"></a>
+ - <tmpl_var name="SDESC"><br />
+ <tmpl_if LAST>
+ </td>
+ </tr>
+ </tmpl_if>
+ </tmpl_loop>
+ <!--tr>
+ <td class='lastleft'>
+ <tmpl_var name="NUMGROUPS"> groups.
</td>
- <td class="right">
- </tmpl_if>
- <a class="pkg" href="<tmpl_var name="URL">"><tmpl_var name="NAME"></a>
- - <tmpl_var name="SDESC"><br />
- <tmpl_if LAST>
+ <td class='lastright'>
+ <tmpl_var name="NUMPACKAGES"> packages.
</td>
- </tr>
- </tmpl_if>
- </tmpl_loop>
- <!--tr>
- <td class='lastleft'>
- <tmpl_var name="NUMGROUPS"> groups.
- </td>
- <td class='lastright'>
- <tmpl_var name="NUMPACKAGES"> packages.
- </td>
- </tr-->
- </table>
- </tmpl_if>
- </div>
+ </tr-->
+ </table>
+ </tmpl_if>
+ </div>
+ </tmpl_if>
</form>
More information about the Debtags-commits
mailing list