diff options
author | Yorhel <git@yorhel.nl> | 2010-12-19 18:18:43 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2010-12-19 18:18:43 +0100 |
commit | 9190c003d0b895c7ce2fca3d5354923dcf4ab6a0 (patch) | |
tree | 359a079f8a5771d251ceb692ec2fe711a39c117b | |
parent | 71e0366b287e99a8b6ad2d9aaf7234a2bb707795 (diff) |
RFC-01: Fixed release list updating dropdown on VN pages
-rw-r--r-- | data/lang.txt | 24 | ||||
-rw-r--r-- | data/script.js | 34 | ||||
-rw-r--r-- | data/style.css | 6 | ||||
-rw-r--r-- | lib/VNDB/Handler/ULists.pm | 7 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNPage.pm | 7 |
5 files changed, 24 insertions, 54 deletions
diff --git a/data/lang.txt b/data/lang.txt index 3f95964c..351386b2 100644 --- a/data/lang.txt +++ b/data/lang.txt @@ -6907,26 +6907,12 @@ cs : odstranit z wishlistu hu : eltávolitás a kivánságlistából nl : Verwijder van wensenlijst -:_vnpage_uopt_relrstat -en : Release status -ru : Статус выпуска -cs : Status vydání -hu : Kiadás állapota -nl : Uitgavestatus - -:_vnpage_uopt_relvstat -en : Play status -ru : Статус прохождения -cs : Herní status -hu : Játszás állapota -nl : Speelstatus - :_vnpage_uopt_reldel -en : Remove from VN list -ru : Убрать из списка новелл -cs : Odstranit z listu VN -hu : Eltávolítás a VN listából -nl : Verwijder van VN lijst +en : Remove from list +ru*: +cs*: +hu*: +nl : Verwijder van lijst :_vnpage_rel en : Releases diff --git a/data/script.js b/data/script.js index b30703d6..7f855e81 100644 --- a/data/script.js +++ b/data/script.js @@ -379,40 +379,32 @@ function ddRefresh() { function rlDropDown(lnk) { var relid = lnk.id.substr(6); - var st = getText(lnk).split(' / '); - if(st[0].indexOf(mt('_js_loading')) >= 0) + var st = getText(lnk); + if(st == mt('_js_loading')) return null; - var rs = tag('ul', tag('li', tag('b', mt('_vnpage_uopt_relrstat')))); - var vs = tag('ul', tag('li', tag('b', mt('_vnpage_uopt_relvstat')))); + var o = tag('ul', null); for(var i=0; i<rlst_rstat.length; i++) { - var val = mt('_rlst_rstat_'+rlst_rstat[i]); // l10n /_rlst_rstat_\d+/ - if(st[0] && st[0].indexOf(val) >= 0) - rs.appendChild(tag('li', tag('i', val))); + var val = mt('_rlst_stat_'+rlst_rstat[i]); // l10n /_rlst_stat_\d+/ + if(st == val) + o.appendChild(tag('li', tag('i', val))); else - rs.appendChild(tag('li', tag('a', {href:'#', rl_rid:relid, rl_act:'r'+rlst_rstat[i], onclick:rlMod}, val))); - } - for(var i=0; i<rlst_vstat.length; i++) { - var val = mt('_rlst_vstat_'+rlst_vstat[i]); // l10n /_rlst_vstat_\d+/ - if(st[1] && st[1].indexOf(val) >= 0) - vs.appendChild(tag('li', tag('i', val))); - else - vs.appendChild(tag('li', tag('a', {href:'#', rl_rid:relid, rl_act:'v'+rlst_vstat[i], onclick:rlMod}, val))); + o.appendChild(tag('li', tag('a', {href:'#', rl_rid:relid, rl_act:rlst_rstat[i], onclick:rlMod}, val))); } + if(st != '--') + o.appendChild(tag('li', tag('a', {href:'#', rl_rid:relid, rl_act:-1, onclick:rlMod}, mt('_vnpage_uopt_reldel')))); - return tag('div', {'class':'vrdd'}, rs, vs, st[0] == '--' ? null : - tag('ul', {'class':'full'}, tag('li', tag('a', {href:'#', rl_rid: relid, rl_act:'del', onclick:rlMod}, mt('_vnpage_uopt_reldel')))) - ); + return tag('div', o); } function rlMod() { var lnk = byId('rlsel_'+this.rl_rid); var code = getText(byId('vnrlist_code')); + var act = this.rl_act; ddHide(); setContent(lnk, tag('b', {'class': 'grayedout'}, mt('_js_loading'))); - ajax('/xml/rlist.xml?formcode='+code+';id='+this.rl_rid+';e='+this.rl_act, function(hr) { - // TODO: get rid of innerHTML here... - lnk.innerHTML = hr.responseXML.getElementsByTagName('rlist')[0].firstChild.nodeValue; + ajax('/xml/rlist.xml?formcode='+code+';id='+this.rl_rid+';e='+act, function(hr) { + setText(lnk, act == -1 ? '--' : mt('_rlst_stat_'+act)); }); return false; } diff --git a/data/style.css b/data/style.css index 433873d7..88cca7e9 100644 --- a/data/style.css +++ b/data/style.css @@ -660,7 +660,7 @@ div#vntags { width: 90px; } .releases td.tc5 { - width: 140px; + width: 70px; } .releases td.tc5 a { color: $maintext$!important; @@ -697,10 +697,6 @@ a.addnew { #dd_box li i { display: block; font-style: normal; padding-left: 10px; padding-right: 5px } #dd_box li a { display: block; padding-left: 10px; color: $link$; border: 0; padding-right: 5px } #dd_box li a:hover { background: url($_boxbg$) repeat } -#dd_box .vrdd { width: 180px; } -#dd_box .vrdd ul { float: left; width: 90px; } -#dd_box .vrdd ul.full { width: 180px; text-align: center; } -#dd_box .vrdd ul.full li a { padding: 0 } diff --git a/lib/VNDB/Handler/ULists.pm b/lib/VNDB/Handler/ULists.pm index 3bcf7b00..daad5c4b 100644 --- a/lib/VNDB/Handler/ULists.pm +++ b/lib/VNDB/Handler/ULists.pm @@ -84,13 +84,10 @@ sub rlist { (my $ref = $self->reqHeader('Referer')||"/r$id") =~ s/^\Q$self->{url}//; $self->resRedirect($ref, 'temp'); } else { - # TODO: FIX + # doesn't really matter what we return, as long as it's XML $self->resHeader('Content-type' => 'text/xml'); - my $st = $self->dbVNListGet(uid => $self->authInfo->{id}, rid => [$rid])->[0]; xml; - tag 'rlist', uid => $self->authInfo->{id}, rid => $rid; - txt $st ? liststat $st : '--'; - end; + tag 'done', ''; } } diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm index 5747acba..b07a7914 100644 --- a/lib/VNDB/Handler/VNPage.pm +++ b/lib/VNDB/Handler/VNPage.pm @@ -385,7 +385,7 @@ sub _releases { } if($self->authInfo->{id}) { - my $l = $self->dbVNListGet(uid => $self->authInfo->{id}, rid => [map $_->{id}, @$r]); + my $l = $self->dbRListGet(uid => $self->authInfo->{id}, rid => [map $_->{id}, @$r]); for my $i (@$l) { [grep $i->{rid} == $_->{id}, @$r]->[0]{ulist} = $i; } @@ -420,9 +420,8 @@ sub _releases { end; td class => 'tc5'; if($self->authInfo->{id}) { - a href => "/r$rel->{id}", id => "rlsel_$rel->{id}", class => 'vnrlsel'; - lit $rel->{ulist} ? liststat $rel->{ulist} : '--'; - end; + a href => "/r$rel->{id}", id => "rlsel_$rel->{id}", class => 'vnrlsel', + $rel->{ulist} ? mt '_rlst_stat_'.$rel->{ulist}{status} : '--'; } else { txt ' '; } |