diff options
author | yorhel <yorhel@1fe2e327-d9db-4752-bcf7-ef0cb4a1748b> | 2008-10-20 14:13:33 +0000 |
---|---|---|
committer | yorhel <yorhel@1fe2e327-d9db-4752-bcf7-ef0cb4a1748b> | 2008-10-20 14:13:33 +0000 |
commit | 5ef4a1426e0f8e90ca2b1c31d2576d4430118fd8 (patch) | |
tree | 884659c648ea17bce2d22be3c9a282b16b4135c6 | |
parent | 639c8da3d0a7e29ea37f861f5c8f6461af57e27b (diff) |
Changed display of producer/release/vn titles and added more original title mouseovers
git-svn-id: svn://vndb.org/vndb@116 1fe2e327-d9db-4752-bcf7-ef0cb4a1748b
-rw-r--r-- | data/tpl/hist | 2 | ||||
-rw-r--r-- | data/tpl/home | 12 | ||||
-rw-r--r-- | data/tpl/ppage | 4 | ||||
-rw-r--r-- | data/tpl/rlist | 4 | ||||
-rw-r--r-- | data/tpl/rpage | 8 | ||||
-rw-r--r-- | data/tpl/ttag | 2 | ||||
-rw-r--r-- | data/tpl/tthread | 2 | ||||
-rw-r--r-- | data/tpl/vnbrowse | 2 | ||||
-rw-r--r-- | data/tpl/vnpage | 9 | ||||
-rw-r--r-- | data/tpl/vnpage_stats | 2 | ||||
-rw-r--r-- | data/tpl/wlist | 2 | ||||
-rw-r--r-- | lib/ChangeLog | 1 | ||||
-rw-r--r-- | lib/VNDB/Discussions.pm | 2 | ||||
-rw-r--r-- | lib/VNDB/Util/DB.pm | 23 | ||||
-rw-r--r-- | static/files/style.css | 3 |
15 files changed, 41 insertions, 37 deletions
diff --git a/data/tpl/hist b/data/tpl/hist index 1b9412cd..fd8863b4 100644 --- a/data/tpl/hist +++ b/data/tpl/hist @@ -84,7 +84,7 @@ [[ if($d{type} ne 'u' || $d{act}) { ]]- <td class="tc3">[[= userstr $_ ]]</td>[[ } ]]- [[ if(!$d{type} || $d{type} eq 'u' || $d{act}) { ]]- - <td class="tc4"><a href="/[[= $t.$_->{iid} ]].[[= $_->{rev} ]]" title="[[: $_->{ititle} ]]">[[: shorten $_->{ititle}, 30 ]]</a></td>[[ } ]]- + <td class="tc4"><a href="/[[= $t.$_->{iid} ]].[[= $_->{rev} ]]" title="[[: $_->{ioriginal}||$_->{ititle} ]]">[[: shorten $_->{ititle}, 30 ]]</a></td>[[ } ]]- [[ if($d{type} && !$d{act}) { ]]- <td class="tc5">[[= summary($_->{comments}, $d{type} eq 'u' ? 40 : 60)||'[empty]' ]]</td>[[ } ]]- [[ if($d{act} eq 'r') { ]]- diff --git a/data/tpl/home b/data/tpl/home index 338044e1..3b36246d 100644 --- a/data/tpl/home +++ b/data/tpl/home @@ -26,41 +26,41 @@ <ul class="home"> <li><b>Recent changes</b></li> [[ for (@{$d{recentedits}}) { my $t = (qw|v r p|)[$_->{type}]; ]]- - <li>[[= $t ]]:<a href="/[[= $t.$_->{iid}.'.'.$_->{rev} ]]" title="[[: $_->{ititle} ]]">[[: shorten $_->{ititle}, 30 ]]</a></li> + <li>[[= $t ]]:<a href="/[[= $t.$_->{iid}.'.'.$_->{rev} ]]" title="[[: $_->{ioriginal}||$_->{ititle} ]]">[[: shorten $_->{ititle}, 30 ]]</a></li> [[ } ]]- </ul> <ul class="home"> <li><b>Recent posts</b></li> [[ for (@{$d{recentposts}}) { ]]- - <li><a href="/t[[= $_->{id}.'.'.$_->{count} ]]" title="[[: $_->{title} ]]">[[: shorten $_->{title}, 25 ]]</a> <i>[[= age $_->{ldate}, 1 ]]</i></li> + <li><a href="/t[[= $_->{id}.'.'.$_->{count} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 25 ]]</a> <i>[[= age $_->{ldate}, 1 ]]</i></li> [[ } ]]- </ul> <ul class="home"> <li><b>Upcoming releases</b></li> [[ for (@{$d{upcomingrel}}) { ]]- - <li>[[= datestr $_->{released}, 1 ]]- <a href="/r[[= $_->{id} ]]" title="[[: $_->{title} ]]">[[: shorten $_->{title}, 25 ]]</a></i></li> + <li>[[= datestr $_->{released}, 1 ]]- <a href="/r[[= $_->{id} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 25 ]]</a></i></li> [[ } ]]- </ul> <ul class="home break"> <li><b>Recently added visual novels</b></li> [[ for (@{$d{recentvns}}) { ]]- - <li><a href="/v[[= $_->{iid} ]]" title="[[: $_->{ititle} ]]">[[: shorten $_->{ititle}, 30 ]]</a></li> + <li><a href="/v[[= $_->{iid} ]]" title="[[: $_->{ioriginal}||$_->{ititle} ]]">[[: shorten $_->{ititle}, 30 ]]</a></li> [[ } ]]- </ul> <ul class="home"> <li><b>Random visual novels</b></li> [[ for (@{$d{randomvns}}) { ]]- - <li><a href="/v[[= $_->{id} ]]" title="[[: $_->{title} ]]">[[: shorten $_->{title}, 30 ]]</a></li> + <li><a href="/v[[= $_->{id} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 30 ]]</a></li> [[ } ]]- </ul> <ul class="home"> <li><b>Just released</b></li> [[ for (@{$d{justrel}}) { ]]- - <li>[[= datestr $_->{released}, 1 ]]- <a href="/r[[= $_->{id} ]]" title="[[: $_->{title} ]]">[[: shorten $_->{title}, 25 ]]</a></i></li> + <li>[[= datestr $_->{released}, 1 ]]- <a href="/r[[= $_->{id} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 25 ]]</a></i></li> [[ } ]]- </ul> diff --git a/data/tpl/ppage b/data/tpl/ppage index f45366fa..e0a1fa08 100644 --- a/data/tpl/ppage +++ b/data/tpl/ppage @@ -1,5 +1,6 @@ [[= ttabs('p', $d{prod}) ]] <h2>[[: $p{PageTitle} ]]</h2> +[[ if($d{prod}{original}) { ]]<h3 class="alttitle">[[: $d{prod}{original} ]]</h3>[[ } ]] [[ if($d{prod}{hidden}) { ]]- <span class="warning"> @@ -23,9 +24,6 @@ [[ } ]] <dl> - <dt>Name</dt><dd>[[ if($d{prod}{original}) { ]] - [[: $d{prod}{original} ]]- ([[: $d{prod}{name} ]]) - [[ } else { ]][[: $d{prod}{name} ]][[ } ]]</dd> <dt>Type</dt><dd>[[: $VNDB::PROT->{$d{prod}{type}} ]]</dd> <dt>Primary lang.</dt><dd>[[: $VNDB::LANG->{$d{prod}{lang}} ]]</dd> [[ if($d{prod}{website}) { ]]- diff --git a/data/tpl/rlist b/data/tpl/rlist index 70f0b77f..f76eb65d 100644 --- a/data/tpl/rlist +++ b/data/tpl/rlist @@ -35,7 +35,7 @@ </tr></thead> [[ for (@{$d{list}}) { $j=0; my $c = ' style="background-color: #'.($i++%2?'fff':'f5f5f5').'"'; ]]- <tr[[=$c]]> - <td colspan="3" class="tc1"><a href="/v[[= $_->{vid} ]]" title="[[: $_->{title} ]]">[[= shorten $_->{title}, 50 ]]</a></td> + <td colspan="3" class="tc1"><a href="/v[[= $_->{vid} ]]" title="[[: $_->{original}||$_->{title} ]]">[[= shorten $_->{title}, 50 ]]</a></td> <td class="tc2[[= @{$_->{rels}} ? ' relhid" id="rh'.$_->{vid}.'"' : ' relnone"' ]]><b[[= @{$_->{rels}} ? ' id="rhd'.$_->{vid}.'"' : '' ]]>▸</b> [[= grep $_->{rstat}==2, @{$_->{rels}} ]]/[[= grep $_->{vstat}==2, @{$_->{rels}} ]]/[[= @{$_->{rels}} ]] </td> @@ -48,7 +48,7 @@ <acronym class="icons lang -[[= $_->{language} ]]" title="[[: $$VNDB::LANG{$_->{language}} ]]"> </acronym><acronym title="[[= $VNDB::RTYP->[$_->{type}] ]]- release" class="icons -[[= lc substr($VNDB::RTYP->[$_->{type}],0,3) ]]"> </acronym> </td> - <td class="tc1_3"><a href="/r[[= $_->{rid} ]]" title="[[: $_->{original} ]]">[[= shorten $_->{title}, 60 ]]</a></td> + <td class="tc1_3"><a href="/r[[= $_->{rid} ]]" title="[[: $_->{original}||$_->{title} ]]">[[= shorten $_->{title}, 60 ]]</a></td> <td class="tc1_4"> <acronym title="[[: $VNDB::RSTAT->[$_->{rstat}] ]]" class="uicons r[[= $_->{rstat} ]]"> </acronym><acronym title="[[: $VNDB::VSTAT->[$_->{vstat}] ]]" class="uicons v[[= $_->{vstat} ]]"> </acronym> diff --git a/data/tpl/rpage b/data/tpl/rpage index 1652ec47..d31ffe24 100644 --- a/data/tpl/rpage +++ b/data/tpl/rpage @@ -1,5 +1,6 @@ [[= ttabs('r', $d{rel}) ]] <h2>[[: $p{PageTitle} ]]</h2> +[[ if($d{rel}{original}) { ]]<h3 class="alttitle">[[: $d{rel}{original} ]]</h3>[[ } ]] [[ if($d{rel}{hidden}) { ]]- <span class="warning"> @@ -37,11 +38,8 @@ [[ } ]] <dl> - <dt>Relation</dt><dd>[[= join('<br />', map { '<a href="/v'.$_->{vid}.'">'._hchar($_->{title}).'</a>' } @{$d{rel}{vn}}) ]]</dd> + <dt>Relation</dt><dd>[[= join('<br />', map { '<a href="/v'.$_->{vid}.'" title="'._hchar($_->{original}||$_->{title}).'">'._hchar($_->{title}).'</a>' } @{$d{rel}{vn}}) ]]</dd> <dt>Type</dt><dd>[[: $VNDB::RTYP->[$d{rel}{type}] ]]</dd> - <dt>Title</dt><dd>[[: $d{rel}{title} ]]</dd> -[[ if($d{rel}{original}) { ]]- - <dt>Original Title</dt><dd>[[: $d{rel}{original} ]]</dd>[[ } ]]- <dt>Language</dt><dd>[[: $VNDB::LANG->{$d{rel}{language}} ]]</dd> <dt>Release date</dt><dd>[[= datestr($d{rel}{released}) ]]</dd> [[ if($d{rel}{gtin}) { ]]- @@ -50,7 +48,7 @@ <dt>Age rating</dt><dd>[[: $VNDB::VRAGES->{$d{rel}{minage}} ]]</dd>[[ } ]]- [[ if($#{$d{rel}{producers}} >= 0) { ]]- <dt>Producer[[: $#{$d{rel}{producers}} > 0 ? 's' : '' ]]</dt><dd>[[= join(', ', map { - sprintf('<a href="/p%d">%s</a>', $_->{id}, _hchar($_->{name})) } @{$d{rel}{producers}}) + sprintf('<a href="/p%d" title="'._hchar($_->{original}||$_->{name}).'">%s</a>', $_->{id}, _hchar($_->{name})) } @{$d{rel}{producers}}) ]]</dd>[[ } ]]- [[ if($#{$d{rel}{platforms}} >= 0) { ]]- <dt>Platform[[: $#{$d{rel}{platforms}} > 0 ? 's' : '' ]]</dt><dd>[[: join(', ', map { diff --git a/data/tpl/ttag b/data/tpl/ttag index 0fe641b7..0d46ddf1 100644 --- a/data/tpl/ttag +++ b/data/tpl/ttag @@ -4,7 +4,7 @@ <a href="/t">Discussion board</a> > <a href="/t/[[= $d{type} ]]">[[: $VNDB::DTAGS->{$d{type}} ]]</a> [[ if($d{obj}) { ]]- - > <b>[[= $d{tag} ]]</b>:<a href="/t/[[= $d{tag} ]]">[[: $d{title} ]]</a>[[ } ]]- + > <b>[[= $d{tag} ]]</b>:<a href="/t/[[= $d{tag} ]]" title="[[: $d{original}||$d{title} ]]">[[: $d{title} ]]</a>[[ } ]]- </p> [[ if(@{$d{t}}) { ]]- diff --git a/data/tpl/tthread b/data/tpl/tthread index f3e2a9a3..0b67345c 100644 --- a/data/tpl/tthread +++ b/data/tpl/tthread @@ -9,7 +9,7 @@ [[ for (sort { $$a[0].$$a[1] cmp $$b[0].$$b[1] } @{$d{t}{tags}}) { ]]- <a href="/t/[[= $$_[0] ]]">[[: $VNDB::DTAGS->{$$_[0]} ]]</a> [[ if($$_[1]) { ]]- - > <b>[[= $$_[0].$$_[1] ]]</b>:<a href="/t/[[= $$_[0].$$_[1] ]]">[[: $$_[2] ]]</a>[[ } ]]- + > <b>[[= $$_[0].$$_[1] ]]</b>:<a href="/t/[[= $$_[0].$$_[1] ]]" title="[[: $$_[3]||$$_[2] ]]">[[: $$_[2] ]]</a>[[ } ]]- <br /> [[ } ]] </dd> diff --git a/data/tpl/vnbrowse b/data/tpl/vnbrowse index f03d74d1..fa4ba1ac 100644 --- a/data/tpl/vnbrowse +++ b/data/tpl/vnbrowse @@ -97,7 +97,7 @@ $_->{c_languages} = join '', map qq|<acronym class="icons lang $_" title="$$VNDB::LANG{$_}"> </acronym>|, reverse sort split /\//, $_->{c_languages}; ]]- <tr> - <td class="tc1"><a href="/v[[= $_->{id} ]]" title="[[: $_->{title} ]]">[[: shorten $_->{title}, 50 ]]</a></td> + <td class="tc1"><a href="/v[[= $_->{id} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 50 ]]</a></td> <td class="tc2">[[= $_->{c_platforms} ]]</td> <td class="tc3">[[= $_->{c_languages} ]]</td> <td class="tc4">[[: $_->{c_released} ]]</td> diff --git a/data/tpl/vnpage b/data/tpl/vnpage index 7ba36051..bca1bf35 100644 --- a/data/tpl/vnpage +++ b/data/tpl/vnpage @@ -1,6 +1,7 @@ [[= ttabs('v', $d{vn}) ]] <h2>[[: $d{vn}{title} ]]</h2> +[[ if($d{vn}{original}) { ]]<h3 class="alttitle">[[: $d{vn}{original} ]]</h3>[[ } ]] [[ if($d{vn}{hidden}) { ]]- @@ -94,7 +95,7 @@ if($d{vn}{length} || $d{vn}{alias} || @links || $prod) { ]] [[ for my $l (@lang) { my %l; $_->{language} eq $l && (%l = ( %l, map { sprintf('<a href="/p%d" title="%s">%s</a>', - $_->{id}, _hchar($_->{name}), _hchar shorten $_->{name}, 30) => 1 + $_->{id}, _hchar($_->{original}||$_->{name}), _hchar shorten $_->{name}, 30) => 1 } @{$_->{producers}} )) for (@{$d{rel}}); if(keys %l) { ]]- <acronym class="icons lang -[[= $l ]]" title="[[: $VNDB::LANG->{$l} ]]"> </acronym>[[= join(' & ', keys %l) ]]<br /> @@ -128,9 +129,9 @@ if($d{vn}{length} || $d{vn}{alias} || @links || $prod) { ]] <dl class="vnrel"> [[ my $lrel = -1; my $i=0; for (sort { $a->{relation} <=> $b->{relation} } @{$d{vn}{relations}}) { if($_->{relation} != $lrel) { $lrel=$_->{relation}; if($i) { ]]</dd>[[ } ]]- - <dt>[[: $VNDB::VREL->[$lrel] ]]</dt><dd><a href="/v[[= $_->{id} ]]">[[: $_->{title} ]]</a> - [[ } else { ]]<br /><a href="/v[[= $_->{id} ]]" title="[[: $_->{title} ]]">[[: shorten $_->{title}, 40 ]]</a>[[ } - ++$i;} ]]</dd> + <dt>[[: $VNDB::VREL->[$lrel] ]]</dt><dd>[[ } else { ]]<br />[[ } ]] + <a href="/v[[= $_->{id} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 40 ]]</a> + [[ ++$i;} ]]</dd> </dl> [[ } ]]- diff --git a/data/tpl/vnpage_stats b/data/tpl/vnpage_stats index 6a450e14..ab159f14 100644 --- a/data/tpl/vnpage_stats +++ b/data/tpl/vnpage_stats @@ -28,7 +28,7 @@ [[ if(!$d{user}) { ]]- <td class="tc1">[[= userstr $_ ]]</td> [[ } else { ]]- - <td class="tc1"><a href="/v[[= $_->{vid} ]]">[[: length($_->{title})>30?substr($_->{title},0,27).'...':$_->{title} ]]</a></td> + <td class="tc1"><a href="/v[[= $_->{vid} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 30 ]]</a></td> [[ } ]]- <td class="tc2">[[= $_->{vote} ]]</td> <td class="tc3">[[= formatdate('%Y-%m-%d %R', $_->{date}, 'dh') ]]</td> diff --git a/data/tpl/wlist b/data/tpl/wlist index f12c85f4..049d28ca 100644 --- a/data/tpl/wlist +++ b/data/tpl/wlist @@ -31,7 +31,7 @@ </tr></thead> [[ for (@{$d{list}}) { ]]- <tr> - <td class="tc1"><a href="/v[[= $_->{vid} ]]" title="[[: $_->{title} ]]">[[: shorten $_->{title}, 40 ]]</a></td> + <td class="tc1"><a href="/v[[= $_->{vid} ]]" title="[[: $_->{original}||$_->{title} ]]">[[: shorten $_->{title}, 40 ]]</a></td> <td class="tc2">[[= $VNDB::WSTAT->[$_->{wstat}] ]]</td> <td class="tc3">[[= formatdate('%Y-%m-%d', $_->{added}) ]]</td> <td class="tc4">[[ if($d{user}{username} eq $p{AuthUsername}) { ]]<input type="checkbox" name="sel" value="[[= $_->{vid} ]]" />[[ } else { ]] [[ } ]]</td> diff --git a/lib/ChangeLog b/lib/ChangeLog index 9e9d3082..fdc0443e 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -12,6 +12,7 @@ TODO: - Fixed bug when using unicode in the AJAX vn/producers/release search box - Added original title field to VN entries - Fixed incorrect quoting in producer select form + - Improved display of original titles 1.22 - 2008-08-29 (r106) - Inverted vote graph diff --git a/lib/VNDB/Discussions.pm b/lib/VNDB/Discussions.pm index f538e5cf..9f80b0b0 100644 --- a/lib/VNDB/Discussions.pm +++ b/lib/VNDB/Discussions.pm @@ -162,6 +162,7 @@ sub TTag { $self->DBGetProducer(id => $iid)->[0]; return $self->ResNotFound if $iid && !$o || !$VNDB::DTAGS->{$type}; my $title = $o ? $o->{username} || $o->{romaji} || $o->{title} || $o->{name} : $VNDB::DTAGS->{$type}; + my $original = $o ? $o->{username} || $o->{original} : $VNDB::DTAGS->{$type}; my($t, $np) = $self->DBGetThreads( type => $type, @@ -179,6 +180,7 @@ sub TTag { type => $type, iid => $iid, title => $title, + original => $original, tag => $tag, t => $t, ppp => $self->{postsperpage}, diff --git a/lib/VNDB/Util/DB.pm b/lib/VNDB/Util/DB.pm index 21fee8fd..dac01a52 100644 --- a/lib/VNDB/Util/DB.pm +++ b/lib/VNDB/Util/DB.pm @@ -193,7 +193,7 @@ sub DBGetHist { # %options->{ type, id, cid, caused, next, page, results, ip, ed my $select = 'c.id, c.type, c.added, c.requester, c.comments, c.rev, c.causedby'; $select .= ', u.username' if $o{what} =~ /user/; $select .= ', COALESCE(vr.vid, rr.rid, pr.pid) AS iid' if $o{what} =~ /iid/; - $select .= ', COALESCE(vr2.title, rr2.title, pr2.name) AS ititle' if $o{what} =~ /ititle/; + $select .= ', COALESCE(vr2.title, rr2.title, pr2.name) AS ititle, COALESCE(vr2.original, rr2.original, pr2.original) AS ioriginal' if $o{what} =~ /ititle/; my $join = ''; $join .= ' JOIN users u ON u.id = c.requester' if $o{what} =~ /user/; @@ -395,7 +395,7 @@ sub DBGetVotes { # %options->{ uid vid hide order results page } ); my $r = $s->DBAll(q| - SELECT n.vid, vr.title, n.vote, n.date, n.uid, u.username + SELECT n.vid, vr.title, vr.original, n.vote, n.date, n.uid, u.username FROM votes n JOIN vn v ON v.id = n.vid JOIN vn_rev vr ON vr.id = v.latest @@ -537,7 +537,7 @@ sub DBGetWishList { # %options->{ uid vid what order page results } my $select = 'wl.vid, wl.wstat, wl.added'; my @join; if($o{what} =~ /vn/) { - $select .= ', vr.title'; + $select .= ', vr.title, vr.original'; push @join, 'JOIN vn v ON v.id = wl.vid', 'JOIN vn_rev vr ON vr.id = v.latest'; } @@ -630,7 +630,7 @@ sub DBGetRLists { # %options->{ uid order char rstat vstat voted page results } ); my $r = $s->DBAll(qq| - SELECT vr.vid, vr.title, v.c_released, v.c_languages, v.c_platforms, COALESCE(vo.vote, 0) AS vote + SELECT vr.vid, vr.title, vr.original, v.c_released, v.c_languages, v.c_platforms, COALESCE(vo.vote, 0) AS vote FROM vn v JOIN vn_rev vr ON vr.id = v.latest !s JOIN votes vo ON vo.vid = v.id AND vo.uid = ? @@ -835,7 +835,7 @@ sub DBGetVN { # %options->{ id rev char search order results page what cati cate if($o{what} =~ /relations/) { my $rel = $s->DBAll(q| - SELECT rel.vid1, rel.vid2, rel.relation, vr.title + SELECT rel.vid1, rel.vid2, rel.relation, vr.title, vr.original FROM vn_relations rel JOIN vn v ON rel.vid2 = v.id JOIN vn_rev vr ON v.latest = vr.id @@ -844,7 +844,8 @@ sub DBGetVN { # %options->{ id rev char search order results page what cati cate push(@{$r->[$r{$_->{vid1}}]{relations}}, { relation => $_->{relation}, id => $_->{vid2}, - title => $_->{title} + title => $_->{title}, + original => $_->{original} }) for (@$rel); } } @@ -1026,7 +1027,7 @@ sub DBGetRelease { # %options->{ id vid results page rev } if($o{what} =~ /vn/) { push(@{$r->[$r{$_->{rid}}]{vn}}, $_) for (@{$s->DBAll(q| - SELECT rv.rid, vr.vid, vr.title + SELECT rv.rid, vr.vid, vr.title, vr.original FROM releases_vn rv JOIN vn v ON v.id = rv.vid JOIN vn_rev vr ON vr.id = v.latest @@ -1037,7 +1038,7 @@ sub DBGetRelease { # %options->{ id vid results page rev } if($o{what} =~ /producers/) { push(@{$r->[$r{$_->{rid}}]{producers}}, $_) for (@{$s->DBAll(q| - SELECT rp.rid, p.id, pr.name, pr.type + SELECT rp.rid, p.id, pr.name, pr.original, pr.type FROM releases_producers rp JOIN producers p ON rp.pid = p.id JOIN producers_rev pr ON pr.id = p.latest @@ -1213,7 +1214,7 @@ sub DBGetProducer { # %options->{ id search char results page rev } sub DBGetProducerVN { # pid return $_[0]->DBAll(q| - SELECT v.id, MAX(vr.title) AS title, MIN(rr.released) AS date + SELECT v.id, MAX(vr.title) AS title, MAX(vr.original) AS original, MIN(rr.released) AS date FROM releases_producers vp JOIN releases_rev rr ON rr.id = vp.rid JOIN releases r ON r.latest = rr.id @@ -1357,8 +1358,8 @@ sub DBGetThreads { # %options->{ id type iid results page what } )}); } if($o{what} =~ /tagtitles/) { - ($_->{type}=~s/ +//||1) && push(@{$r->[$r{$_->{tid}}]{tags}}, [ $_->{type}, $_->{iid}, $_->{title} ]) for (@{$s->DBAll(q| - SELECT tt.tid, tt.type, tt.iid, COALESCE(u.username, vr.title, pr.name) AS title + ($_->{type}=~s/ +//||1) && push(@{$r->[$r{$_->{tid}}]{tags}}, [ $_->{type}, $_->{iid}, $_->{title}, $_->{original} ]) for (@{$s->DBAll(q| + SELECT tt.tid, tt.type, tt.iid, COALESCE(u.username, vr.title, pr.name) AS title, COALESCE(u.username, vr.original, pr.original) AS original FROM threads_tags tt LEFT JOIN vn v ON tt.type = 'v' AND v.id = tt.iid LEFT JOIN vn_rev vr ON vr.id = v.latest diff --git a/static/files/style.css b/static/files/style.css index 85f72612..6c51bacf 100644 --- a/static/files/style.css +++ b/static/files/style.css @@ -50,6 +50,9 @@ h3 { font-size: 1.1em; margin: 0; } +h3.alttitle { + margin: 0 0 0 20px; +} p, ul, ol { margin: 0; |