summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2009-10-19 09:32:12 +0200
committerYorhel <git@yorhel.nl>2009-10-19 09:32:12 +0200
commit538000a678b4110394f1aaf413059bcdd43c5005 (patch)
tree2849731596100ba1a7505b6047a31408b8c2535a
parentfab6821be0cf1e7ad0f9c853475ec1d01482234a (diff)
Use 'no spoilers' as default spoiler level for tags
-rw-r--r--ChangeLog1
-rw-r--r--data/script.js2
-rw-r--r--lib/VNDB/Handler/Tags.pm2
-rw-r--r--lib/VNDB/Handler/VNBrowse.pm2
-rw-r--r--lib/VNDB/Handler/VNPage.pm6
5 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f371d68b..9eba7ab8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ git - ?
- Fixed obscure sorting bug on user VN list
- Fixed calculation of tags_vn_bayesian.spoiler
- Fixed bug with unhiding a producer entry
+ - Set 'no spoilers' as default spoiler level for tags
2.7 - 2009-09-24
- Improved styling of the threeboxes layout
diff --git a/data/script.js b/data/script.js
index cc984230..67ae8953 100644
--- a/data/script.js
+++ b/data/script.js
@@ -1582,7 +1582,7 @@ if(byId('sp_0')) {
byId('sp_1').onclick = function() { setCookie('tagspoil', 1) };
byId('sp_2').onclick = function() { setCookie('tagspoil', 2) };
var spoil = getCookie('tagspoil');
- byId('sp_'+(spoil == null ? 1 : spoil)).checked = true;
+ byId('sp_'+(spoil == null ? 0 : spoil)).checked = true;
}
// NSFW VN image toggle (/v+)
diff --git a/lib/VNDB/Handler/Tags.pm b/lib/VNDB/Handler/Tags.pm
index 6a13446b..f75efdc6 100644
--- a/lib/VNDB/Handler/Tags.pm
+++ b/lib/VNDB/Handler/Tags.pm
@@ -36,7 +36,7 @@ sub tagpage {
);
return 404 if $f->{_err};
my $tagspoil = $self->reqCookie('tagspoil');
- $f->{m} = $tagspoil =~ /^[0-2]$/ ? $tagspoil : 1 if $f->{m} == -1;
+ $f->{m} = $tagspoil =~ /^[0-2]$/ ? $tagspoil : 0 if $f->{m} == -1;
my($list, $np) = $t->{meta} || $t->{state} != 2 ? ([],0) : $self->dbTagVNs(
tag => $tag,
diff --git a/lib/VNDB/Handler/VNBrowse.pm b/lib/VNDB/Handler/VNBrowse.pm
index 118a5ee2..bca21151 100644
--- a/lib/VNDB/Handler/VNBrowse.pm
+++ b/lib/VNDB/Handler/VNBrowse.pm
@@ -25,7 +25,7 @@ sub list {
{ name => 'pl', required => 0, multi => 1, enum => $self->{platforms}, default => '' },
{ name => 'ti', required => 0, default => '', maxlength => 200 },
{ name => 'te', required => 0, default => '', maxlength => 200 },
- { name => 'sp', required => 0, default => $self->reqCookie('tagspoil') =~ /^([0-2])$/ ? $1 : 1, enum => [0..2] },
+ { name => 'sp', required => 0, default => $self->reqCookie('tagspoil') =~ /^([0-2])$/ ? $1 : 0, enum => [0..2] },
);
return 404 if $f->{_err};
$f->{q} ||= $f->{sq};
diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm
index 248d1d43..0205e77d 100644
--- a/lib/VNDB/Handler/VNPage.pm
+++ b/lib/VNDB/Handler/VNPage.pm
@@ -180,15 +180,15 @@ sub page {
if(@$t) {
div id => 'tagops';
# NOTE: order of these links is hardcoded in JS
- a href => '#', mt '_vnpage_tags_spoil0';
- a href => '#', class => 'tsel', mt '_vnpage_tags_spoil1';
+ a href => '#', class => 'tsel', mt '_vnpage_tags_spoil0';
+ a href => '#', mt '_vnpage_tags_spoil1';
a href => '#', mt '_vnpage_tags_spoil2';
a href => '#', class => 'sec', mt '_vnpage_tags_summary';
a href => '#', mt '_vnpage_tags_all';
end;
div id => 'vntags';
for (@$t) {
- span class => sprintf 'tagspl%.0f %s', $_->{spoiler}, $_->{spoiler} > 1 ? 'hidden' : '';
+ span class => sprintf 'tagspl%.0f %s', $_->{spoiler}, $_->{spoiler} > 0 ? 'hidden' : '';
a href => "/g$_->{id}", style => sprintf('font-size: %dpx', $_->{rating}*3.5+6), $_->{name};
b class => 'grayedout', sprintf ' %.1f', $_->{rating};
end;