summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2011-01-01 16:45:58 +0100
committerYorhel <git@yorhel.nl>2011-01-01 16:45:58 +0100
commit63005b274ccde96d8bdb36e7466ea5b0899b4151 (patch)
tree726ead66ce1aa48a927e6c857e4829d915c44461
parent98c82103ff4cd32db6f89a066b10061404f8b13d (diff)
Added saving notes to filter selector and applied filFetchDB()
This finalizes the permanent filters feature.
-rw-r--r--data/lang.txt30
-rw-r--r--data/script.js10
-rw-r--r--lib/VNDB/Handler/Misc.pm6
-rw-r--r--lib/VNDB/Handler/Tags.pm5
-rw-r--r--lib/VNDB/Handler/VNPage.pm2
5 files changed, 37 insertions, 16 deletions
diff --git a/data/lang.txt b/data/lang.txt
index 44b16829..a224f241 100644
--- a/data/lang.txt
+++ b/data/lang.txt
@@ -3950,6 +3950,13 @@ cs : Vymazat
hu : Törlés
nl :
+:_rbrowse_savenote
+en : Your saved filters will be applied automatically to several other parts of the site as well, such as the homepage. To change these filters, come back to this page and use the "Save as default" button again. To remove your saved filters, hit "Reset" and then save.
+ru*:
+cs*:
+hu*:
+nl : Je opgeslagen filters worden ook automatisch toegepast op een aantal andere delen van de site, waaronder de homepagina. Om deze filters te veranderen, ga terug naar deze pagina en gebruik de "Opslaan als standaard" knop weer. Om je opgeslagen filters te verwijderen, klik op "Reset" en sla je instellingen weer op.
+
@@ -4079,11 +4086,11 @@ hu : Nagyobb spoilerek megjelenítése
nl : Laat alle spoilers zien
:_tagp_novn
-en : This tag has not been linked to any visual novels yet, or they were hidden because of the spoiler settings.
-ru : Этот тег пока не содержит ссылок ни на одну новеллу, либо они скрыты из-за настроек отображения спойлеров.
-cs : Tento tag ještě nebyl použit v žádné vizuální novele nebo byly tyto skryty kvůli nastavení spoilerů.
-hu : Ez a címke eddig egy visual novelhez sincs hozzárendelve, vagy el lettek rejtve a spoiler-ek beállítása során.
-nl : Deze tag is nog niet gekoppeld aan een visual novel, of deze worden niet weergegeven in verband met de spoilerinstelling.
+en : This tag has not been linked to any visual novels yet, or they were hidden because of your spoiler settings or default filters.
+ru*: Этот тег пока не содержит ссылок ни на одну новеллу, либо они скрыты из-за настроек отображения спойлеров.
+cs*: Tento tag ještě nebyl použit v žádné vizuální novele nebo byly tyto skryty kvůli nastavení spoilerů.
+hu*: Ez a címke eddig egy visual novelhez sincs hozzárendelve, vagy el lettek rejtve a spoiler-ek beállítása során.
+nl : Deze tag is nog niet gekoppeld aan een visual novel, of deze worden niet weergegeven in verband met je spoiler- of filterinstelling.
:_tagp_cached
en : The list below also includes all visual novels linked to child tags. This list is cached, it can take up to 24 hours after a visual novel has been tagged for it to show up on this page.
@@ -5932,11 +5939,18 @@ hu : Címkék
nl :
:_vnbrowse_booland
-en : boolean and, selecting more gives less results
+en : Boolean and, selecting more gives less results
ru : логическое 'и', чем больше выбрано, тем меньше даёт результатов
-cs : boolean a, výběr více dá méně výsledků
+cs : Boolean a, výběr více dá méně výsledků
hu : Boole féle értékhalmaz(igaz/hamis), s ha többet választasz ki akkor kevesebb találatot ad
-nl : booleaanse 'en', meerdere selecties geven minder resultaten
+nl : Booleaanse 'en', meerdere selecties geven minder resultaten
+
+:_vnbrowse_tagactive
+en : These filters are ignored on tag pages (when set as default).
+ru*:
+cs*:
+hu*:
+nl : Deze filters worden genegeerd op tagpaginas (als ze gebruikt worden als standaardfilters).
:_vnbrowse_tagrem
en : remove
diff --git a/data/script.js b/data/script.js
index abec85f9..a946a4f3 100644
--- a/data/script.js
+++ b/data/script.js
@@ -1794,7 +1794,8 @@ function filLoad() {
f = f.parentNode;
f.submit();
}}),
- tag('input', {type:'button', 'class':'submit', value: mt('_rbrowse_reset'), onclick:function () { byId('fil').value = ''; filDeSerialize()} })
+ tag('input', {type:'button', 'class':'submit', value: mt('_rbrowse_reset'), onclick:function () { byId('fil').value = ''; filDeSerialize()} }),
+ tag('p', {id:'fil_savenote', 'class':'hidden'}, mt('_rbrowse_savenote'))
));
filSelectCat(1);
byId('filselect').onclick = filShow;
@@ -1805,6 +1806,7 @@ function filSaveDefault() {
var but = this;
but.value = mt('_js_loading');
but.enabled = false;
+ setClass(byId('fil_savenote'), 'hidden', false);
var type = byId('filselect').href.match(/#r$/) ? 'release' : 'vn';
ajax('/xml/prefs.xml?formcode='+PREF_CODE+';key=filter_'+type+';value='+byId('fil').value, function (hr) {
but.value = mt('_rbrowse_filsave');
@@ -1813,6 +1815,7 @@ function filSaveDefault() {
}
function filSelectCat(n) {
+ setClass(byId('fil_savenote'), 'hidden', true);
n = this.fil_num ? this.fil_num : n;
for(var i=1; i<fil_cats.length; i++) {
setClass(fil_cats[i], 'optselected', i == n);
@@ -1825,6 +1828,7 @@ function filSelectCat(n) {
function filSelectField(obj) {
var t = obj && obj.parentNode ? obj : this;
+ setClass(byId('fil_savenote'), 'hidden', true);
// update checkbox and label
var o = t;
while(o.nodeName.toLowerCase() != 'tr')
@@ -1915,6 +1919,7 @@ function filShow() {
var hid = !hasClass(div, 'hidden');
setClass(div, 'hidden', hid);
setText(byName(byId('filselect'), 'i')[0], hid ? collapsed_icon : expanded_icon);
+ setClass(byId('fil_savenote'), 'hidden', true);
var o = this;
ddx = ddy = 0;
@@ -2133,7 +2138,8 @@ function filVN() {
filFOptions('hasani', mt('_vnbrowse_anime'), [[1, mt('_vnbrowse_anime_yes')],[0, mt('_vnbrowse_anime_no')]])
],
[ mt('_vnbrowse_tags'),
- [ '', ' ', tag('('+mt('_vnbrowse_booland')+')') ],
+ [ '', ' ', tag(mt('_vnbrowse_booland')) ],
+ [ '', ' ', PREF_CODE != '' ? tag(mt('_vnbrowse_tagactive')) : null ],
filFTagInput('tag_inc', mt('_vnbrowse_taginc')),
filFTagInput('tag_exc', mt('_vnbrowse_tagexc')),
filFOptions('tagspoil', ' ', [[0, mt('_vnbrowse_spoil0')],[1, mt('_vnbrowse_spoil1')],[2, mt('_vnbrowse_spoil2')]],
diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm
index 2d9932b1..671cc017 100644
--- a/lib/VNDB/Handler/Misc.pm
+++ b/lib/VNDB/Handler/Misc.pm
@@ -125,7 +125,7 @@ sub homepage {
h1;
a href => '/v/rand', mt '_home_randomvn';
end;
- my $random = $self->dbVNGet(results => 10, sort => 'rand');
+ my $random = $self->filFetchDB(vn => undef, undef, {results => 10, sort => 'rand'});
ul;
for (@$random) {
li;
@@ -140,7 +140,7 @@ sub homepage {
h1;
a href => strftime('/r?fil=date_after-%Y%m%d;o=a;s=released', gmtime), mt '_home_upcoming';
end;
- my $upcoming = $self->dbReleaseGet(results => 10, unreleased => 1, what => 'platforms');
+ my $upcoming = $self->filFetchDB(release => undef, undef, {results => 10, unreleased => 1, what => 'platforms'});
ul;
for (@$upcoming) {
li;
@@ -160,7 +160,7 @@ sub homepage {
h1;
a href => strftime('/r?fil=date_before-%Y%m%d;o=d;s=released', gmtime), mt '_home_justreleased';
end;
- my $justrel = $self->dbReleaseGet(results => 10, sort => 'released', reverse => 1, unreleased => 0, what => 'platforms');
+ my $justrel = $self->filFetchDB(release => undef, undef, {results => 10, sort => 'released', reverse => 1, unreleased => 0, what => 'platforms'});
ul;
for (@$justrel) {
li;
diff --git a/lib/VNDB/Handler/Tags.pm b/lib/VNDB/Handler/Tags.pm
index 3d656728..ad736027 100644
--- a/lib/VNDB/Handler/Tags.pm
+++ b/lib/VNDB/Handler/Tags.pm
@@ -39,14 +39,15 @@ sub tagpage {
my $tagspoil = $self->reqCookie($self->{cookie_prefix}.'tagspoil');
$f->{m} = $tagspoil =~ /^[0-2]$/ ? $tagspoil : 0 if $f->{m} == -1;
- my($list, $np) = $t->{meta} || $t->{state} != 2 ? ([],0) : $self->dbVNGet(
+ my($list, $np) = $t->{meta} || $t->{state} != 2 ? ([],0) : $self->filFetchDB(vn => undef, undef, {
what => 'rating',
results => 50,
page => $f->{p},
sort => $f->{s}, reverse => $f->{o} eq 'd',
tagspoil => $f->{m},
tag_inc => $tag,
- );
+ tag_exc => undef,
+ });
my $title = mt '_tagp_title', $t->{meta}?0:1, $t->{name};
$self->htmlHeader(title => $title, noindex => $t->{state} != 2);
diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm
index a4f385db..5e024424 100644
--- a/lib/VNDB/Handler/VNPage.pm
+++ b/lib/VNDB/Handler/VNPage.pm
@@ -16,7 +16,7 @@ YAWF::register(
sub rand {
my $self = shift;
- $self->resRedirect('/v'.$self->dbVNGet(results => 1, sort => 'rand')->[0]{id}, 'temp');
+ $self->resRedirect('/v'.$self->filFetchDB(vn => undef, undef, {results => 1, sort => 'rand'})->[0]{id}, 'temp');
}