diff options
author | Yorhel <git@yorhel.nl> | 2011-01-27 12:32:37 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2011-01-27 12:32:37 +0100 |
commit | 2e12ebc8ca793160cb0cd54c1fd0bfd42676c1ae (patch) | |
tree | 3e1bb12bf4104f0aaa2e0b8b4be583a4197fc3d2 /lib | |
parent | 1216d74abfa0a40ab6abcef338f2fb891cd0fba6 (diff) |
TUWF: Added tag name to several end() calls
Haven't found any bugs this way, yet. I doubt there'll be any problems,
but it's a nice new feature that could help quite a bit. :-D
Diffstat (limited to 'lib')
-rw-r--r-- | lib/VNDB/Handler/Discussions.pm | 10 | ||||
-rw-r--r-- | lib/VNDB/Handler/Misc.pm | 24 | ||||
-rw-r--r-- | lib/VNDB/Handler/Producers.pm | 16 | ||||
-rw-r--r-- | lib/VNDB/Handler/Releases.pm | 10 | ||||
-rw-r--r-- | lib/VNDB/Handler/Tags.pm | 36 | ||||
-rw-r--r-- | lib/VNDB/Handler/ULists.pm | 16 | ||||
-rw-r--r-- | lib/VNDB/Handler/Users.pm | 10 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNBrowse.pm | 2 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNEdit.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNPage.pm | 24 | ||||
-rw-r--r-- | lib/VNDB/Util/BrowseHTML.pm | 12 | ||||
-rw-r--r-- | lib/VNDB/Util/CommonHTML.pm | 20 | ||||
-rw-r--r-- | lib/VNDB/Util/FormHTML.pm | 12 | ||||
-rw-r--r-- | lib/VNDB/Util/LayoutHTML.pm | 12 | ||||
-rw-r--r-- | lib/VNDB/Util/Misc.pm | 6 |
15 files changed, 107 insertions, 107 deletions
diff --git a/lib/VNDB/Handler/Discussions.pm b/lib/VNDB/Handler/Discussions.pm index 05053f34..845e8e19 100644 --- a/lib/VNDB/Handler/Discussions.pm +++ b/lib/VNDB/Handler/Discussions.pm @@ -46,7 +46,7 @@ sub thread { end; } end; - end; + end 'div'; $self->htmlBrowseNavigate("/t$tid/", $page, [ $t->{count}, 25 ], 't', 1); div class => 'mainbox thread'; @@ -82,7 +82,7 @@ sub thread { end; } end; - end; + end 'div'; $self->htmlBrowseNavigate("/t$tid/", $page, [ $t->{count}, 25 ], 'b', 1); if($t->{locked}) { @@ -105,7 +105,7 @@ sub thread { input type => 'submit', value => mt('_thread_quickreply_full'), class => 'submit', name => 'fullreply'; end; end; - end; + end 'form'; } elsif(!$self->authCan('board')) { div class => 'mainbox'; h1 mt '_thread_noreply_title'; @@ -319,7 +319,7 @@ sub board { a href => '/t/'.($iid ? $type.$iid : $type ne 'ge' ? 'db' : $type).'/new', mt '_disboard_startnew'; } end; - end; + end 'div'; _threadlist($self, $list, $f, $np, "/t/$type$iid", $type.$iid) if @$list; @@ -400,7 +400,7 @@ sub _threadlist { lit $self->{l10n}->date($o->{ldate}); end; end; - end; + end 'tr'; } ); } diff --git a/lib/VNDB/Handler/Misc.pm b/lib/VNDB/Handler/Misc.pm index b0911f6b..e7797259 100644 --- a/lib/VNDB/Handler/Misc.pm +++ b/lib/VNDB/Handler/Misc.pm @@ -60,7 +60,7 @@ sub homepage { end; } end; - end; + end 'div'; table class => 'mainbox threelayout'; Tr; @@ -82,7 +82,7 @@ sub homepage { end; } end; - end; + end 'td'; # Announcements td; @@ -100,7 +100,7 @@ sub homepage { lit bb2html $post->{msg}, 150; end; } - end; + end 'td'; # Recent posts td; @@ -120,9 +120,9 @@ sub homepage { end; } end; - end; + end 'td'; - end; + end 'tr'; Tr; # Random visual novels @@ -138,7 +138,7 @@ sub homepage { end; } end; - end; + end 'td'; # Upcoming releases td; @@ -158,7 +158,7 @@ sub homepage { end; } end; - end; + end 'td'; # Just released td; @@ -178,10 +178,10 @@ sub homepage { end; } end; - end; + end 'td'; - end; # /tr - end; # /table + end 'tr'; + end 'table'; $self->htmlFooter; } @@ -273,7 +273,7 @@ sub history { a $f->{r} ? (class => 'optselected') : (), href => $u->(r => 1), mt '_hist_filter_increl'; end; } - end; + end 'div'; $self->htmlBrowseHist($list, $f, $np, $u->()); $self->htmlFooter; @@ -407,7 +407,7 @@ sub opensearch { tag 'Url', type => 'application/opensearchdescription+xml', rel => 'self', template => $self->{url}.'/opensearch.xml', undef; tag 'Query', role => 'example', searchTerms => 'Tsukihime', undef; tag 'moz:SearchForm', $self->{url}.'/v/all'; - end; + end 'OpenSearchDescription'; } diff --git a/lib/VNDB/Handler/Producers.pm b/lib/VNDB/Handler/Producers.pm index ad947830..5030c1a3 100644 --- a/lib/VNDB/Handler/Producers.pm +++ b/lib/VNDB/Handler/Producers.pm @@ -94,7 +94,7 @@ sub page { a href => $_->[1], mt "_prodpage_$_->[0]"; txt ' - ' if $_ ne $links[$#links]; } - end; + end 'p'; if(@{$p->{relations}}) { my %rel; @@ -110,7 +110,7 @@ sub page { } br; } - end; + end 'p'; } if($p->{desc}) { @@ -118,7 +118,7 @@ sub page { lit bb2html $p->{desc}; end; } - end; + end 'div'; _releases($self, $p); @@ -187,11 +187,11 @@ sub _releases { txt ' '; } end; - end; + end 'tr'; } } - end; - end; + end 'table'; + end 'div'; } @@ -307,7 +307,7 @@ sub edit { a href => '#', mt '_pedit_rel_addbut'; end; end; - end; + end 'table'; }], ]); $self->htmlFooter; @@ -392,7 +392,7 @@ sub list { } } clearfloat; - end; + end 'div'; $self->htmlBrowseNavigate($pageurl, $f->{p}, $np, 'b'); $self->htmlFooter; } diff --git a/lib/VNDB/Handler/Releases.pm b/lib/VNDB/Handler/Releases.pm index be1d8bd4..f65d3e0c 100644 --- a/lib/VNDB/Handler/Releases.pm +++ b/lib/VNDB/Handler/Releases.pm @@ -250,10 +250,10 @@ sub _infotable { option value => -1, mt '_relinfo_user_del' if $rl; end; end; - end; + end 'tr'; } - end; + end 'table'; } @@ -456,7 +456,7 @@ sub _form { option value => 3, mt '_redit_form_prod_both'; end; end; td class => 'tc_add'; a id => 'producer_add', href => '#', mt '_redit_form_prod_addbut'; end; - end; end; + end; end 'table'; }], ], @@ -509,7 +509,7 @@ sub browse { end; input type => 'hidden', class => 'hidden', name => 'fil', id => 'fil', value => $f->{fil}; end; - end; + end 'form'; my $uri = sprintf '/r?q=%s;fil=%s', uri_escape($f->{q}), $f->{fil}; $self->htmlBrowse( @@ -541,7 +541,7 @@ sub browse { a href => "/r$l->{id}", title => $l->{original}||$l->{title}, shorten $l->{title}, 90; b class => 'grayedout', ' (patch)' if $l->{patch}; end; - end; + end 'tr'; }, ) if @$list; if(($f->{q} || $f->{fil}) && !@$list) { diff --git a/lib/VNDB/Handler/Tags.pm b/lib/VNDB/Handler/Tags.pm index 2c1d120c..6a4cb760 100644 --- a/lib/VNDB/Handler/Tags.pm +++ b/lib/VNDB/Handler/Tags.pm @@ -69,7 +69,7 @@ sub tagpage { p mt '_tagp_pending_msg'; end; } - end; + end 'div'; } div class => 'mainbox'; @@ -87,7 +87,7 @@ sub tagpage { txt " > $t->{name}"; br; } - end; + end 'p'; if($t->{description}) { p class => 'description'; @@ -101,7 +101,7 @@ sub tagpage { lit xml_escape($_).'<br />' for (@{$t->{aliases}}); end; } - end; + end 'div'; _childtags($self, $t) if @{$t->{childs}}; @@ -118,7 +118,7 @@ sub tagpage { p; br; br; txt mt '_tagp_novn'; end; } p; br; txt mt '_tagp_cached'; end; - end; + end 'div'; $self->htmlBrowseVN($list, $f, $np, "/g$t->{id}?m=$f->{m}", 1) if @$list; } @@ -168,12 +168,12 @@ sub _childtags { end; } end; - end; + end 'li'; } - end; + end 'ul'; clearfloat; br; - end; + end 'div'; } @@ -325,7 +325,7 @@ sub taglist { if(!@$t) { p mt '_tagb_noresults'; } - end; + end 'div'; if(@$t) { $self->htmlBrowse( class => 'taglist', @@ -349,7 +349,7 @@ sub taglist { b class => 'grayedout', ' '.mt '_tagb_note_del' if $l->{state} == 1; } end; - end; + end 'tr'; } ); } @@ -424,10 +424,10 @@ sub taglinks { a href => "/v$o->{id}", $o->{title}; end; } - end; + end 'ul'; } p mt '_taglink_fil_add' unless $f->{v} && $f->{u} && $f->{t}; - end; + end 'div'; $self->htmlBrowse( class => 'taglinks', @@ -546,7 +546,7 @@ sub vntagmod { li mt '_tagv_msg_cache'; end; end; - end; + end 'div'; $self->htmlForm({ action => "/v$vid/tagmod", nosubmit => 1 }, tagmod => [ mt('_tagv_frm_title'), [ hidden => short => 'taglinks', value => '' ], [ static => nolabel => 1, content => sub { @@ -566,7 +566,7 @@ sub vntagmod { td class => 'tc_allspoil', mt '_tagv_col_spoiler'; td class => 'tc_allwho', ''; end; - end; + end 'thead'; tfoot; Tr; td colspan => 6; input type => 'submit', class => 'submit', value => mt('_tagv_save'), style => 'float: right'; @@ -577,7 +577,7 @@ sub vntagmod { lit mt '_tagv_addmsg'; end; end; - end; end; + end; end 'tfoot'; tbody id => 'tagtable'; for my $t (sort { $a->{name} cmp $b->{name} } @$tags) { my $m = (grep $_->{tag} == $t->{id}, @$my)[0] || {}; @@ -603,8 +603,8 @@ sub vntagmod { end; end; } - end; - end; + end 'tbody'; + end 'table'; } ], ]); $self->htmlFooter; @@ -682,8 +682,8 @@ sub tagindex { end; end; - end; # /tr - end; # /table + end 'tr'; + end 'table'; $self->htmlFooter; } diff --git a/lib/VNDB/Handler/ULists.pm b/lib/VNDB/Handler/ULists.pm index 2657481e..94007a73 100644 --- a/lib/VNDB/Handler/ULists.pm +++ b/lib/VNDB/Handler/ULists.pm @@ -210,7 +210,7 @@ sub votelist { option value => -1, 'revoke'; end; end; - end; + end 'tr'; }) : (), ); end if $own; @@ -269,7 +269,7 @@ sub wishlist { $_ == -1 ? mt '_wishlist_prio_all' : mt "_wish_$_" for (-1, @{$self->{wishlist_status}}); end; - end; + end 'div'; if($own) { my $code = $self->authGetCode("/u$uid/wish"); @@ -315,7 +315,7 @@ sub wishlist { end; }) : (), ); - end if $own; + end 'form' if $own; $self->htmlFooter; } @@ -404,7 +404,7 @@ sub vnlist { a href => $url->(t => -1), -1 == $f->{t} ? (class => 'optselected') : (), mt '_rlist_all'; a href => $url->(t => $_), $_ == $f->{t} ? (class => 'optselected') : (), mt '_vnlist_status_'.$_ for @{$self->{vnlist_status}}; end; - end; + end 'div'; _vnlist_browse($self, $own, $list, $np, $f, $url, $uid); $self->htmlFooter; @@ -458,7 +458,7 @@ sub _vnlist_browse { lit $txt; end; td class => 'tc8', $i->{vote} || '-'; - end; + end 'tr'; for (@{$i->{rels}}) { Tr class => "collapse relhid collapse_vid$i->{vid}".($n%2 ? '':' odd'); @@ -476,7 +476,7 @@ sub _vnlist_browse { end; td class => 'tc6', $_->{status} ? mt '_rlist_status_'.$_->{status} : ''; td class => 'tc7_8', colspan => 2, ''; - end; + end 'tr'; } }, @@ -505,11 +505,11 @@ sub _vnlist_browse { input type => 'submit', value => mt '_rlist_update'; end; td class => 'tc7_8', colspan => 2, mt '_rlist_releasenote'; - end; + end 'tr'; }) : (), ); - end if $own; + end 'form' if $own; } 1; diff --git a/lib/VNDB/Handler/Users.pm b/lib/VNDB/Handler/Users.pm index fcef3d44..44ffa60b 100644 --- a/lib/VNDB/Handler/Users.pm +++ b/lib/VNDB/Handler/Users.pm @@ -113,8 +113,8 @@ sub userpage { } end; end; - end; - end; + end 'table'; + end 'div'; if(!$u->{hide_list} && $votes) { div class => 'mainbox'; @@ -534,7 +534,7 @@ sub list { td class => 'tc5'; lit !$l->{c_tags} ? 0 : qq|<a href="/g/links?u=$l->{id}">$l->{c_tags}</a>|; end; - end; + end 'tr'; }, ); $self->htmlFooter; @@ -633,7 +633,7 @@ sub notifies { : 'item_edit'), sprintf('<i>%s</i>', xml_escape $l->{c_title}), sprintf('<i>%s</i>', xml_escape $l->{username}); end; - end; + end 'tr'; }, footer => sub { Tr; @@ -663,7 +663,7 @@ sub notifies { input type => 'submit', name => 'set', value => mt '_usern_set_submit'; end; end; - end; + end 'form'; $self->htmlFooter; } diff --git a/lib/VNDB/Handler/VNBrowse.pm b/lib/VNDB/Handler/VNBrowse.pm index 53c07db2..0b56e1cb 100644 --- a/lib/VNDB/Handler/VNBrowse.pm +++ b/lib/VNDB/Handler/VNBrowse.pm @@ -64,7 +64,7 @@ sub list { end; input type => 'hidden', class => 'hidden', name => 'fil', id => 'fil', value => $f->{fil}; end; - end; # /form + end 'form'; $self->htmlBrowseVN($list, $f, $np, "/v/$char?q=$quri;fil=$f->{fil}", $f->{fil} =~ /tag_inc-/); $self->htmlFooter(prefs => ['filter_vn']); diff --git a/lib/VNDB/Handler/VNEdit.pm b/lib/VNDB/Handler/VNEdit.pm index 8265aa35..733b7ba7 100644 --- a/lib/VNDB/Handler/VNEdit.pm +++ b/lib/VNDB/Handler/VNEdit.pm @@ -195,7 +195,7 @@ sub _form { $frm->{img_nsfw} ? (checked => 'checked') : (); label class => 'checkbox', for => 'img_nsfw', mt '_vnedit_image_nsfw_check'; p mt '_vnedit_image_nsfw_msg'; - end; + end 'div'; }], ], @@ -230,7 +230,7 @@ sub _form { a href => '#', mt '_vnedit_rel_addbut'; end; end; - end; + end 'table'; }], ], diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm index e0c597d9..ee121c9b 100644 --- a/lib/VNDB/Handler/VNPage.pm +++ b/lib/VNDB/Handler/VNPage.pm @@ -88,7 +88,7 @@ sub page { end; } } - end; + end 'div'; # /vnimg # general info table; @@ -147,8 +147,8 @@ sub page { end; end; - end; - end; + end 'table'; + end 'div'; clearfloat; # tags @@ -172,7 +172,7 @@ sub page { } end; } - end; + end 'div'; # /mainbox _releases($self, $v, $r); _stats($self, $v); @@ -273,7 +273,7 @@ sub _producers { br; } end; - end; + end 'tr'; } } @@ -302,7 +302,7 @@ sub _relations { } end; end; - end; + end 'tr'; } @@ -337,7 +337,7 @@ sub _anime { } } end; - end; + end 'tr'; } @@ -381,7 +381,7 @@ sub _useroptions { end; } end; - end; + end 'tr'; } @@ -448,11 +448,11 @@ sub _releases { txt ' '; } end; - end; + end 'tr'; } } - end; - end; + end 'table'; + end 'div'; } @@ -491,7 +491,7 @@ sub _screenshots { } end; } - end; + end 'div'; } diff --git a/lib/VNDB/Util/BrowseHTML.pm b/lib/VNDB/Util/BrowseHTML.pm index 4cce692c..6d6cdeda 100644 --- a/lib/VNDB/Util/BrowseHTML.pm +++ b/lib/VNDB/Util/BrowseHTML.pm @@ -62,7 +62,7 @@ sub htmlBrowse { } } end; - end; + end 'thead'; # footer if($opt{footer}) { @@ -75,8 +75,8 @@ sub htmlBrowse { $opt{row}->($self, $_+1, $opt{items}[$_]) for 0..$#{$opt{items}}; - end; - end; + end 'table'; + end 'div'; # bottom navigation $self->htmlBrowseNavigate($opt{pageurl}, $opt{options}{p}, $opt{nextpage}, 'b'); @@ -117,7 +117,7 @@ sub htmlBrowseNavigate { $l > $nc+1 and $ell->(0); $l > $_ and $tab->(0, $p+$_, $p+$_) for (reverse 2..($nc>$l-2?$l-2:$nc-1)); $l > 1 and $tab->(0, $p+1, mt('_browse_next').' ›'); - end; + end 'ul'; } @@ -154,7 +154,7 @@ sub htmlBrowseHist { a href => $revurl, title => $i->{ioriginal}, shorten $i->{ititle}, 80; b class => 'grayedout'; lit bb2html $i->{comments}, 150; end; end; - end; + end 'tr'; }, ); } @@ -205,7 +205,7 @@ sub htmlBrowseVN { txt sprintf '%.2f', $l->{c_rating}||0; b class => 'grayedout', sprintf ' (%d)', $l->{c_votecount}; end; - end; + end 'tr'; }, ); } diff --git a/lib/VNDB/Util/CommonHTML.pm b/lib/VNDB/Util/CommonHTML.pm index 4617804d..1872c083 100644 --- a/lib/VNDB/Util/CommonHTML.pm +++ b/lib/VNDB/Util/CommonHTML.pm @@ -95,7 +95,7 @@ sub htmlMainTabs { li !$sel ? (class => 'tabselected') : (); a href => "/$id", $id; end; - end; + end 'ul'; } @@ -114,7 +114,7 @@ sub htmlDenied { p mt '_denied_noaccess_msg'; } end; - end; + end 'div'; $self->htmlFooter; } @@ -140,7 +140,7 @@ sub htmlHiddenMessage { lit bb2html $editsum; end; end; - end; + end 'div'; return $self->htmlFooter() || 1 if !$self->authCan('del'); return 0; } @@ -205,9 +205,9 @@ sub htmlRevision { [ ilock => serialize => sub { mt $_[0] ? '_revision_yes' : '_revision_no' } ], @fields ); - end; + end 'table'; } - end; + end 'div'; } sub revheader { # type, obj @@ -297,7 +297,7 @@ sub htmlEditMessage { p mt '_editmsg_revert_msg', $num; end; } - end; + end 'div'; } @@ -347,7 +347,7 @@ sub htmlVoteStats { end; end; } - end; + end 'table'; my $recent = $self->dbVoteGet( $type.'id' => $obj->{id}, @@ -381,7 +381,7 @@ sub htmlVoteStats { td $self->{l10n}->date($recent->[$_]{date}); end; } - end; + end 'table'; } clearfloat; @@ -392,7 +392,7 @@ sub htmlVoteStats { p mt '_votestats_rank_rat', $obj->{r_ranking}, sprintf '%.2f', $obj->{c_rating}; end; } - end; + end 'div'; } @@ -409,7 +409,7 @@ sub htmlSearchBox { end; input type => 'text', name => 'q', id => 'q', class => 'text', value => $v; input type => 'submit', class => 'submit', value => mt '_searchbox_submit'; - end; + end 'fieldset'; } diff --git a/lib/VNDB/Util/FormHTML.pm b/lib/VNDB/Util/FormHTML.pm index 2bb2913d..68b6a101 100644 --- a/lib/VNDB/Util/FormHTML.pm +++ b/lib/VNDB/Util/FormHTML.pm @@ -41,7 +41,7 @@ sub htmlFormError { li mt "_formerr_tpl_$rule", $field if $type eq 'template'; } end; - end; + end 'div'; end if $mainbox; } @@ -155,7 +155,7 @@ sub htmlFormPart { textarea name => $o{short}, id => $o{short}, rows => $o{rows}||5, cols => $o{cols}||60, $frm->{$o{short}}||''; } end; - end; + end 'tr'; } @@ -190,7 +190,7 @@ sub htmlForm { li class => 'left'; a href => '#all', id => 'jt_sel_all', mt '_form_tab_all'; end; - end; + end 'ul'; } # form subs @@ -205,7 +205,7 @@ sub htmlForm { $self->htmlFormPart($options->{frm}, $_) for @$parts; end; end; - end; + end 'div'; } # db mod / edit summary / submit button @@ -236,10 +236,10 @@ sub htmlForm { } input type => 'submit', value => mt('_form_submit'), class => 'submit'; end; - end; + end 'div'; } - end; + end 'form'; } diff --git a/lib/VNDB/Util/LayoutHTML.pm b/lib/VNDB/Util/LayoutHTML.pm index fc6ba6b2..f8ce275a 100644 --- a/lib/VNDB/Util/LayoutHTML.pm +++ b/lib/VNDB/Util/LayoutHTML.pm @@ -79,7 +79,7 @@ sub _menu { input type => 'submit', class => 'submit', value => 'Search'; end; end; - end; + end 'div'; # /menubox div class => 'menubox'; if($self->authInfo->{id}) { @@ -121,7 +121,7 @@ sub _menu { end; end; } - end; + end 'div'; # /menubox div class => 'menubox'; h2 mt '_menu_dbstats'; @@ -135,7 +135,7 @@ sub _menu { clearfloat; end; end; - end; + end 'div'; # /menulist } @@ -160,7 +160,7 @@ sub htmlFooter { # %options => { prefs => [pref1,..] } txt ' | '; a href => $self->{source_url}, mt '_footer_source'; end; - end; # /div maincontent + end 'div'; # /maincontent # insert users' preference data when required by JS if($o{prefs}) { @@ -173,8 +173,8 @@ sub htmlFooter { # %options => { prefs => [pref1,..] } end; } script type => 'text/javascript', src => $self->{url_static}.'/f/js/'.$self->{l10n}->language_tag().'.js?'.$self->{version}, ''; - end; # /body - end; # /html + end 'body'; + end 'html'; # write the SQL queries as a HTML comment when debugging is enabled if($self->debug) { diff --git a/lib/VNDB/Util/Misc.pm b/lib/VNDB/Util/Misc.pm index 8917a4f8..15ab79b9 100644 --- a/lib/VNDB/Util/Misc.pm +++ b/lib/VNDB/Util/Misc.pm @@ -122,7 +122,7 @@ sub ieCheck { .q|p { color: #ddd; margin: 10px; font: 9pt "Tahoma"; }| .q|h1 { color: #258; font-size: 14pt; font-family: "Futura", "Century New Gothic", "Arial", Serif; font-weight: normal; margin: 10px 0 0 0; } | .q|a { color: #fff }|; - end; + end 'head'; body; div; h1 'Oops, we were too lazy to support your browser!'; @@ -139,8 +139,8 @@ sub ieCheck { .qq|<a href="/?i-still-want-access=1">open the site anyway</a>.|; end; end; - end; - end; + end 'body'; + end 'html'; return 0; } |