diff options
-rw-r--r-- | data/js/misc.js | 6 | ||||
-rw-r--r-- | data/style.css | 8 | ||||
-rw-r--r-- | lib/Multi/RG.pm | 8 | ||||
-rw-r--r-- | lib/VNDB/Func.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Handler/VNPage.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Util/CommonHTML.pm | 8 | ||||
-rw-r--r-- | lib/VNDB/Util/FormHTML.pm | 4 | ||||
-rw-r--r-- | lib/VNDB/Util/LayoutHTML.pm | 7 | ||||
-rw-r--r-- | util/updates/update_2.26.sql | 4 |
9 files changed, 26 insertions, 27 deletions
diff --git a/data/js/misc.js b/data/js/misc.js index 89572e82..a1e86827 100644 --- a/data/js/misc.js +++ b/data/js/misc.js @@ -210,7 +210,7 @@ if(byId('batchedit')) // mouse-over price information / disclaimer (function(){ if(byId('buynow')) { - var l = byClass(byId('buynow'), 'acronym', 'pricenote'); + var l = byClass(byId('buynow'), 'abbr', 'pricenote'); for(var i=0; i<l.length; i++) { l[i].buynow_last = l[i].title; l[i].title = null; @@ -257,12 +257,12 @@ if(byId('not') && byId('vns')) // Language selector (function(){ var d = byId('lang_select'); - var flag = byName(d, 'acronym')[0]; + var flag = byName(d, 'abbr')[0]; ddInit(d, 'bottom', function(lnk) { var lst = tag('ul', null); for(var i=0; i<VARS.l10n_lang.length; i++) { var ln = VARS.l10n_lang[i]; - var icon = tag('acronym', {'class':'icons lang '+ln[0]}, ' '); + var icon = tag('abbr', {'class':'icons lang '+ln[0]}, ' '); lst.appendChild(tag('li', {'class':'lang_selector'}, hasClass(flag, ln[0]) ? tag('i', icon, ln[1]) : tag('a', {href:'/setlang?lang='+ln[0]+';ref='+encodeURIComponent(location.pathname+location.search)}, icon, ln[1]) diff --git a/data/style.css b/data/style.css index 736fb910..095ea98c 100644 --- a/data/style.css +++ b/data/style.css @@ -156,7 +156,7 @@ table.formtable tr.newpart td { padding-top: 20px; font-weight: bold; } #menulist input.submit { width: 90px; margin-left: 20px; } #menulist #search input.text { width: 133px; margin: 0 0 3px 7px; font-style: italic; } #menulist #search input.submit { display: none; } -#dd_box acronym { margin: 2px 5px 2px 0!important; } +#dd_box abbr { margin: 2px 5px 2px 0!important; } #menulist .notifyget { display: inline-block; width: 125px; padding: 4px; background: $warnbg$; border: 1px solid $warnborder$; } @@ -471,7 +471,7 @@ div.scr_uploader { visibility: hidden; overflow: hidden; width: 1px; height: div.producerbrowse { padding-bottom: 10px } .producerbrowse ul { float: left; margin-top: -5px; margin-left: 3%; width: 28%; } .producerbrowse ul li { list-style-type: none; } -.producerbrowse ul li acronym { margin-right: 5px; margin-top: 1px; } +.producerbrowse ul li abbr { margin-right: 5px; margin-top: 1px; } /***** Producer edit *****/ @@ -576,7 +576,7 @@ div.charb td.tc2 b a { color: $grayedout$!important } div.staffbrowse { padding-bottom: 10px } .staffbrowse ul { float: left; margin-top: -5px; margin-left: 3%; width: 28%; } .staffbrowse ul li { list-style-type: none; margin-bottom: 2px; } -.staffbrowse ul li acronym { margin-right: 5px; margin-top: 1px; } +.staffbrowse ul li abbr { margin-right: 5px; margin-top: 1px; } .staffpage table.stripe { width: 400px; margin: 0 auto; } .staffpage .key { width: 70px; } .staffroles td.tc2 { white-space: nowrap; width: 80px } @@ -862,7 +862,7 @@ div#fil_div { .icons.gen { width: 14px; height: 14px } .icons.gen.b { width: 28px } .icons.rtcomplete, .icons.rtpartial, .icons.rttrial { width: 11px; } -acronym.icons, acronym.uicons { cursor: default; } +abbr.icons, abbr.uicons { cursor: default; } a .icons { cursor: pointer } .icons.oth { background: none; } $iconcss$ diff --git a/lib/Multi/RG.pm b/lib/Multi/RG.pm index 177a82be..eade569a 100644 --- a/lib/Multi/RG.pm +++ b/lib/Multi/RG.pm @@ -256,8 +256,6 @@ sub processgraph { # Before saving the SVG output, we'll modify it a little: # - Remove comments - # - Add svg: prefix to all tags - # - Remove xmlns declarations (this is set in the html) # - Remove <title> elements (unused) # - Remove id attributes (unused) # - Remove first <polygon> element (emulates the background color) @@ -274,15 +272,15 @@ sub processgraph { $attr{class} = 'border' if $attr{stroke} && $attr{stroke} eq '#111111'; $attr{class} = 'nodebg' if $attr{fill} && $attr{fill} eq '#222222'; - delete @attr{qw|stroke fill xmlns xmlns:xlink|}; + delete @attr{qw|stroke fill|}; delete $attr{id} if $attr{id} && $attr{id} !~ /^node_[vp]\d+$/; - $w->tag("svg:$el", %attr, $el eq 'path' || $el eq 'polygon' ? undef : ()); + $w->tag($el, %attr, $el eq 'path' || $el eq 'polygon' ? undef : ()); }, End => sub { my($expat, $el) = @_; return if $el eq 'title' || $expat->in_element('title'); return if $el eq 'polygon' && $expat->depth == 2; - $w->end("svg:$el") if $el ne 'path' && $el ne 'polygon'; + $w->end($el) if $el ne 'path' && $el ne 'polygon'; }, Char => sub { my($expat, $str) = @_; diff --git a/lib/VNDB/Func.pm b/lib/VNDB/Func.pm index b4848796..2644ea35 100644 --- a/lib/VNDB/Func.pm +++ b/lib/VNDB/Func.pm @@ -31,8 +31,8 @@ sub clearfloat { # Draws a CSS icon, arguments: class, title sub cssicon { - acronym class => "icons $_[0]", title => $_[1]; - lit ' '; + abbr class => "icons $_[0]", title => $_[1]; + lit ' '; end; } diff --git a/lib/VNDB/Handler/VNPage.pm b/lib/VNDB/Handler/VNPage.pm index cf8a50af..20f12bf3 100644 --- a/lib/VNDB/Handler/VNPage.pm +++ b/lib/VNDB/Handler/VNPage.pm @@ -668,7 +668,7 @@ sub _anime { } txt '] '; end; - acronym title => $_->{title_kanji}||$_->{title_romaji}, shorten $_->{title_romaji}, 50; + abbr title => $_->{title_kanji}||$_->{title_romaji}, shorten $_->{title_romaji}, 50; b ' ('.(defined $_->{type} ? mt("_animetype_$_->{type}").', ' : '').$_->{year}.')'; br; } @@ -748,7 +748,7 @@ sub _affiliate_links { || ($f->{default_version} && $f->{default_version}->($self, $link, $rel)) || $version; txt " at $f->{name}"; - acronym class => 'pricenote', title => + abbr class => 'pricenote', title => $link->{lastfetch} ? sprintf('Last updated: %s.', $en->age($link->{lastfetch})) : '', " for $link->{price}" if $link->{price}; txt ' ยป'; diff --git a/lib/VNDB/Util/CommonHTML.pm b/lib/VNDB/Util/CommonHTML.pm index bcc2ea97..7504ace8 100644 --- a/lib/VNDB/Util/CommonHTML.pm +++ b/lib/VNDB/Util/CommonHTML.pm @@ -204,12 +204,12 @@ sub htmlRevision { table class => 'stripe'; thead; Tr; - td; lit ' '; end; + td; lit ' '; end; td; revheader($self, $type, $old); end; td; revheader($self, $type, $new); end; end; Tr; - td; lit ' '; end; + td; lit ' '; end; td colspan => 2; b mt '_revision_edit_summary', $new->{rev}; br; br; @@ -439,6 +439,7 @@ sub htmlSearchBox { sub htmlRGHeader { my($self, $title, $type, $obj) = @_; + # This used to be a good test for inline SVG support, but I'm not sure it is nowadays. if(($self->reqHeader('Accept')||'') !~ /application\/xhtml\+xml/) { $self->htmlHeader(title => $title); $self->htmlMainTabs($type, $obj, 'rg'); @@ -452,8 +453,7 @@ sub htmlRGHeader { $self->htmlFooter; return 1; } - $self->resHeader('Content-Type' => 'application/xhtml+xml; charset=UTF-8'); - $self->htmlHeader(title => $title, svg => 1); + $self->htmlHeader(title => $title); $self->htmlMainTabs($type, $obj, 'rg'); return 0; } diff --git a/lib/VNDB/Util/FormHTML.pm b/lib/VNDB/Util/FormHTML.pm index 9612f904..afecbe08 100644 --- a/lib/VNDB/Util/FormHTML.pm +++ b/lib/VNDB/Util/FormHTML.pm @@ -97,7 +97,7 @@ sub htmlFormPart { if(/check/) { Tr class => 'newfield'; td class => 'label'; - lit ' '; + lit ' '; end; td class => 'field'; input type => 'checkbox', name => $o{short}, id => $o{short}, tabindex => 10, @@ -120,7 +120,7 @@ sub htmlFormPart { } elsif($o{label}) { txt $o{label}; } else { - lit ' '; + lit ' '; } end; } diff --git a/lib/VNDB/Util/LayoutHTML.pm b/lib/VNDB/Util/LayoutHTML.pm index 76b15690..fcd26346 100644 --- a/lib/VNDB/Util/LayoutHTML.pm +++ b/lib/VNDB/Util/LayoutHTML.pm @@ -17,11 +17,8 @@ sub htmlHeader { # %options->{ title, noindex, search, feeds, svg } $skin = $self->{skin_default} if !$self->{skins}{$skin} || !-d "$VNDB::ROOT/static/s/$skin"; # heading - html lang => $self->{l10n}->language_tag(), $o{svg} ? ( - doctype => 'xhtml-math-svg', - 'xmlns:svg' => 'http://www.w3.org/2000/svg', - 'xmlns:xlink' => 'http://www.w3.org/1999/xlink' - ) : (); + lit '<!DOCTYPE HTML>'; + tag 'html', lang => $self->{l10n}->language_tag(); head; title $o{title}; Link rel => 'shortcut icon', href => '/favicon.ico', type => 'image/x-icon'; diff --git a/util/updates/update_2.26.sql b/util/updates/update_2.26.sql index 04534b98..6900d080 100644 --- a/util/updates/update_2.26.sql +++ b/util/updates/update_2.26.sql @@ -3,3 +3,7 @@ UPDATE users SET perm = (perm & ~8); -- Removed support for sha256-hashed passwords UPDATE users SET passwd = '' WHERE length(passwd) = 41; + +-- Need to regenerate all relation graphs in the switch to HTML5 +UPDATE vn SET rgraph = NULL; +UPDATE producers SET rgraph = NULL; |