Several bugfixes, xml extention to rss feeds, noindex on user forms, client side filter selection, and how the fuck did the "Finished" status get lost!?

git-svn-id: svn://vndb.org/vndb@14 1fe2e327-d9db-4752-bcf7-ef0cb4a1748b

3 files changed, 11 insertions, 11 deletions

diff --git a/data/tpl/hist b/data/tpl/hist
index e02a149f..4160ef52 100644
--- a/data/tpl/hist
+++ b/data/tpl/hist
@@ -12,7 +12,7 @@
   my $furl = $url.'?e='.$d{sele}.';t=';
   my $eurl = $url.'?t='.$d{selt}.';e=';
   my $purl = !$d{type}?$eurl.$d{sele}:$d{type} eq 'v' && $d{seli} ? $url.'?i=1' : $url;
-  my $rurl = $url.'/rss'.(!$d{type}?'?t='.$d{selt}.';e='.$d{sele}:$d{type} eq 'v' && $d{seli} ? '?i=1' : '');
+  my $rurl = $url.'/rss.xml'.(!$d{type}?'?t='.$d{selt}.';e='.$d{sele}:$d{type} eq 'v' && $d{seli} ? '?i=1' : '');
   local $_ = $d{selt};
   my @fil = (
     /a/ ? 'all items' : '<a href="%sa">all items</a>',
diff --git a/data/tpl/main b/data/tpl/main
index 5c009297..8204df80 100644
--- a/data/tpl/main
+++ b/data/tpl/main
@@ -16,14 +16,15 @@
   <script src="[[: $p{st} ]]/files/def.js?[[= $VNDB::VERSION ]]" type="text/javascript"></script>
 [[ if($p{devshit}) { ]]-
   <meta name="robots" content="noindex, nofollow" />
-[[ } elsif($p{userlist} || $p{userpage} || $p{myvotes} || $p{vnlist} || $p{hist} || ($p{vnpage} && $p{vnpage}{page} eq 'stats')
+[[ } elsif($p{userlist} || $p{userpage} || $p{userlogin} || $p{userreg} || $p{userpass} || $p{myvotes}
+      || $p{vnlist} || $p{hist} || ($p{vnpage} && $p{vnpage}{page} eq 'stats')
       || grep { $p{$_} && $p{$_}{change} } qw|vnpage ppage rpage|) { ]]-
   <meta name="robots" content="noindex, follow" />
 [[ }]]-
 
 [[if($p{hist}){ ]]
   <link rel="alternate" type="application/rss+xml" title="Recent changes" href="
-   [[= (!$p{hist}{type}?'/hist':'/'.$p{hist}{type}.$p{hist}{id}.'/hist').'/rss'.(!$p{hist}{type}?'?t='.$p{hist}{selt}.';e='.$p{hist}{sele}:$p{hist}{type} eq 'v' && $p{hist}{seli} ? '?i=1':'') ]]" />
+   [[= (!$p{hist}{type}?'/hist':'/'.$p{hist}{type}.$p{hist}{id}.'/hist').'/rss.xml'.(!$p{hist}{type}?'?t='.$p{hist}{selt}.';e='.$p{hist}{sele}:$p{hist}{type} eq 'v' && $p{hist}{seli} ? '?i=1':'') ]]" />
 [[ } ]]-
 </head>
 
@@ -73,9 +74,8 @@
  <h2>Menu</h2>
  <ul>
   <li><a href="/">Home</a></li>
-  <li><a href="/v">Visual Novels</a></li>
+  <li><a href="/v">Browse</a> | <a href="/v/search">Search</a></li>
   <li><a href="/p">Producers</a></li>
-  <li><a href="/v/search">Search</a></li>
   <li><a href="/u/list">Users</a></li>
   <li><a href="/hist">Recent changes</a></li>
   <li><a href="/d6">FAQ</a></li>
diff --git a/data/tpl/vnbrowse b/data/tpl/vnbrowse
index fef795a3..9adaa113 100644
--- a/data/tpl/vnbrowse
+++ b/data/tpl/vnbrowse
@@ -12,13 +12,13 @@
  </form>
 
  <div id="adsearch" [[= !$p{searchquery} ? '' : ' style="display: none"' ]]>
-  <b>Categories</b> (inclusive, selecting more gives less results)
+  <b>Categories</b> (boolean and, selecting more gives less results)
   <ul id="cat">
   [[ for my $c (qw| e g p t l s |) { ]]-
    -[[= $c ne 'l' && $c ne 'p' ? '<li>' : '<br />' ]][[: $VNDB::CAT->{$c}[0] ]]-
    <ul>
     [[ for (sort keys %{$VNDB::CAT->{$c}[1]}) { my $ca = $c.$_; ]]-
-    <li[[= (grep /$ca/, @{$d{incl}}) ? ' class="inc"' : (grep /$ca/, @{$d{excl}}) ? ' class="exc"' : '' ]]- id="cat_[[= $ca ]]">
+    <li id="cat_[[= $ca ]]">
      [[: $VNDB::CAT->{$c}[1]{$_} ]]- ([[= $d{cat}{$ca} || 0 ]])</li>
     [[ } ]]
    </ul>[[= $c ne 't' && $c ne 'g' ? '</li>' : '' ]]-
@@ -27,20 +27,20 @@
   <br style="clear: both" />
   <br />
  
-  <b>Languages</b> (exclusive, selecting more gives more results)<br />
+  <b>Languages</b> (boolean or, selecting more gives more results)<br />
   <ul class="filter" id="lfilter">
   [[ for (sort keys %{$d{langc}}) { next if !$d{langc}{$_}; my $l=$_; ]]-
-   <li><input type="checkbox" name="lang_[[= $l ]]" id="lang_[[= $l ]]" value="[[: $VNDB::LANG->{$l} ]]" [[= (grep /$l/, @{$d{lang}}) ? ' checked="checked"' : '' ]]- />
+   <li><input type="checkbox" name="lang_[[= $l ]]" id="lang_[[= $l ]]" value="[[: $VNDB::LANG->{$l} ]]" />
     <label for="lang_[[= $l ]]"><acronym class="icons lang -[[= $l ]]" title="[[: $VNDB::LANG->{$l} ]]">&nbsp;</acronym>([[= $d{langc}{$l} ]])</label></li>
   [[ } ]]-
   </ul>
   <br style="clear: both" />
   <br />
  
-  <b>Platforms</b> (exclusive, selecting more gives more results)<br />
+  <b>Platforms</b> (boolean or, selecting more gives more results)<br />
   <ul class="filter" id="pfilter">
   [[ for (sort keys %$VNDB::PLAT) { next if /oth/; my $l=$_; ]]-
-   <li><input type="checkbox" name="plat_[[= $l ]]" id="plat_[[= $l ]]" value="[[: $VNDB::PLAT->{$l} ]]" [[= (grep /$l/, @{$d{plat}}) ? ' checked="checked"' : '' ]]- />
+   <li><input type="checkbox" name="plat_[[= $l ]]" id="plat_[[= $l ]]" value="[[: $VNDB::PLAT->{$l} ]]" />
     <label for="plat_[[= $l ]]"><acronym class="icons -[[= $l ]]" title="[[: $VNDB::PLAT->{$l} ]]">&nbsp;</acronym></label></li>
   [[ } ]]-
   </ul>