From 1c74dfdf44f080bc4a30be6303bf2845c2f5f7b0 Mon Sep 17 00:00:00 2001 From: Yorhel Date: Tue, 22 Feb 2011 11:16:59 +0100 Subject: chardb: +image quality, -other blood type, typo fix, +gender icons --- data/global.pl | 2 +- data/lang.txt | 9 +-------- data/style.css | 18 +++++++++--------- lib/Multi/Image.pm | 2 +- lib/VNDB/Handler/Chars.pm | 9 ++++----- static/f/icons.png | Bin 10825 -> 11329 bytes util/sql/func.sql | 4 ++-- util/updates/update_2.19.sql | 8 ++++---- 8 files changed, 22 insertions(+), 30 deletions(-) diff --git a/data/global.pl b/data/global.pl index 9cc7ac8a..3f1ba3b6 100644 --- a/data/global.pl +++ b/data/global.pl @@ -106,7 +106,7 @@ our %S = (%S, wishlist_status => [ 0..3 ], rlist_status => [ 0..4 ], # 2 = hardcoded 'OK' vnlist_status => [ 0..4 ], - blood_types => [qw| unknown a b ab o other |], + blood_types => [qw| unknown a b ab o |], genders => [qw| unknown m f b |], atom_feeds => { # num_entries, title, id announcements => [ 10, 'VNDB Site Announcements', '/t/an' ], diff --git a/data/lang.txt b/data/lang.txt index 68b1896c..34213637 100644 --- a/data/lang.txt +++ b/data/lang.txt @@ -1198,13 +1198,6 @@ cs*: hu*: nl : O -:_bloodt_other -en : Other/fictional -ru*: -cs*: -hu*: -nl : Anders/fictief - # Genders @@ -5083,7 +5076,7 @@ hu*: nl : Verjaardag :_chare_form_bday_fmt -en : MM-DD (e.g. "01-26" for the 26th of Januari) +en : MM-DD (e.g. "01-26" for the 26th of January) ru*: cs*: hu*: diff --git a/data/style.css b/data/style.css index e5562cc0..27d0aeec 100644 --- a/data/style.css +++ b/data/style.css @@ -1157,6 +1157,7 @@ div#fil_div { width: 16px; height: 14px; margin: 0 2px 0 0; + margin-top: 0px!important; overflow: hidden; display:-moz-inline-stack; display: inline-block; @@ -1164,15 +1165,10 @@ div#fil_div { border: 0; text-decoration: none; } -.icons { - margin-top: 0px!important; -} -.icons.lang { - width: 13px; - height: 11px; - opacity: 0.5; -} -.icons.feed { width: 12px; height: 12px } +.icons.lang { width: 13px; height: 11px; opacity: 0.5; } +.icons.feed { width: 12px; height: 12px } +.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; } a .icons { cursor: pointer } @@ -1187,6 +1183,10 @@ a .icons { cursor: pointer } .icons.p98 { background-position: 0px -98px; } .icons.feed { background-position: 0px -112px; } +.icons.gen.f, +.icons.gen.b { background-position: -12px -112px; } +.icons.gen.m { background-position: -26px -112px; } + .icons.dvd { background-position: -16px 0px; } .icons.mac { background-position: -16px -14px; } .icons.ps1 { background-position: -16px -28px; } diff --git a/lib/Multi/Image.pm b/lib/Multi/Image.pm index 3f8bb1a9..8cd5bfc1 100644 --- a/lib/Multi/Image.pm +++ b/lib/Multi/Image.pm @@ -72,7 +72,7 @@ sub ch_process { # num, res my($ow, $oh) = ($im->Get('width'), $im->Get('height')); my($nw, $nh) = imgsize($ow, $oh, @{$VNDB::S{ch_size}}); $im->Thumbnail(width => $nw, height => $nh); - $im->Set(quality => 80); + $im->Set(quality => 90); $im->Write($img); $_[KERNEL]->post(pg => do => 'UPDATE chars_rev SET image = image*-1 WHERE image = ?', [ -1*$id ]); diff --git a/lib/VNDB/Handler/Chars.pm b/lib/VNDB/Handler/Chars.pm index e862f3f5..5a6d2e0e 100644 --- a/lib/VNDB/Handler/Chars.pm +++ b/lib/VNDB/Handler/Chars.pm @@ -79,11 +79,10 @@ sub page { table; Tr; td colspan => 2; - b $r->{name}; - b class => 'grayedout', style => 'margin-left: 10px', $r->{original} if $r->{original}; - use utf8; - b style => 'margin-left: 10px; font-size: 14px', {qw|m ♂ f ♀ b ♂♀|}->{$r->{gender}} if $r->{gender} ne 'unknown'; - span style => 'margin-left: 10px', mt "_bloodt_$r->{bloodt}" if $r->{bloodt} ne 'unknown'; + b style => 'margin-right: 10px', $r->{name}; + b class => 'grayedout', style => 'margin-right: 10px', $r->{original} if $r->{original}; + cssicon "gen $r->{gender}", mt "_gender_$r->{gender}" if $r->{gender} ne 'unknown'; + span mt "_bloodt_$r->{bloodt}" if $r->{bloodt} ne 'unknown'; end; end; my $i = 0; diff --git a/static/f/icons.png b/static/f/icons.png index e8d9f1f3..f48f4c7f 100644 Binary files a/static/f/icons.png and b/static/f/icons.png differ diff --git a/util/sql/func.sql b/util/sql/func.sql index c655159a..6ae0312b 100644 --- a/util/sql/func.sql +++ b/util/sql/func.sql @@ -424,7 +424,7 @@ BEGIN INSERT INTO edit_char DEFAULT VALUES; -- load revision ELSE - INSERT INTO edit_char SELECT name, original, alias, image, "desc", s_bust, s_waist, s_hip, b_month, b_day, height, weight, bloodt, gender FROM chars_rev WHERE id = hid; + INSERT INTO edit_char SELECT name, original, alias, image, "desc", gender, s_bust, s_waist, s_hip, b_month, b_day, height, weight, bloodt FROM chars_rev WHERE id = hid; INSERT INTO edit_char_traits SELECT tid, spoil FROM chars_traits WHERE cid = hid; END IF; END; @@ -440,7 +440,7 @@ BEGIN RAISE 'edit_char must have exactly one row!'; END IF; SELECT INTO r * FROM edit_commit(); - INSERT INTO chars_rev SELECT r.cid, r.iid, name, original, alias, image, "desc", s_bust, s_waist, s_hip, b_month, b_day, height, weight, bloodt, gender FROM edit_char; + INSERT INTO chars_rev SELECT r.cid, r.iid, name, original, alias, image, "desc", gender, s_bust, s_waist, s_hip, b_month, b_day, height, weight, bloodt FROM edit_char; INSERT INTO chars_traits SELECT r.cid, tid, spoil FROM edit_char_traits; UPDATE chars SET latest = r.cid WHERE id = r.iid; RETURN r; diff --git a/util/updates/update_2.19.sql b/util/updates/update_2.19.sql index 02878118..c8fb1119 100644 --- a/util/updates/update_2.19.sql +++ b/util/updates/update_2.19.sql @@ -31,7 +31,7 @@ ALTER TABLE tags RENAME c_vns TO c_items; -- character database -> chars CREATE TYPE char_role AS ENUM ('main', 'primary', 'side', 'appears'); -CREATE TYPE blood_type AS ENUM ('unknown', 'a', 'b', 'ab', 'o', 'other'); +CREATE TYPE blood_type AS ENUM ('unknown', 'a', 'b', 'ab', 'o'); CREATE TYPE gender AS ENUM ('unknown', 'm', 'f', 'b'); CREATE TABLE chars ( @@ -49,6 +49,7 @@ CREATE TABLE chars_rev ( alias varchar(500) NOT NULL DEFAULT '', image integer NOT NULL DEFAULT 0, "desc" text NOT NULL DEFAULT '', + gender gender NOT NULL DEFAULT 'unknown', s_bust smallint NOT NULL DEFAULT 0, s_waist smallint NOT NULL DEFAULT 0, s_hip smallint NOT NULL DEFAULT 0, @@ -57,7 +58,6 @@ CREATE TABLE chars_rev ( height smallint NOT NULL DEFAULT 0, weight smallint NOT NULL DEFAULT 0, bloodt blood_type NOT NULL DEFAULT 'unknown', - gender gender NOT NULL DEFAULT 'unknown', main integer REFERENCES chars (id), main_spoil boolean NOT NULL DEFAULT false ); @@ -178,13 +178,13 @@ INSERT INTO traits_parents (trait, parent) VALUES -- phorni! SELECT edit_char_init(null); UPDATE edit_revision SET comments = 'New test entry', requester = 2, ip = '0.0.0.0'; -UPDATE edit_char SET name = 'Phorni', original = 'フォーニ', "desc" = 'Sprite of Music', height = 14; +UPDATE edit_char SET name = 'Phorni', original = 'フォーニ', "desc" = 'Sprite of Music', height = 14, gender = 'f'; SELECT edit_char_commit(); -- saya (incorrect test data) SELECT edit_char_init(null); UPDATE edit_revision SET comments = '2nd test entry', requester = 2, ip = '0.0.0.0'; -UPDATE edit_char SET name = 'Saya', original = '沙耶', "desc" = 'There is more than meets the eye!', alias = 'Cute monster', height = 140, weight = 52, s_bust = 41, s_waist = 38, s_hip = 40, b_month = 3, b_day = 15, bloodt = 'a'; +UPDATE edit_char SET name = 'Saya', original = '沙耶', "desc" = 'There is more than meets the eye!', alias = 'Cute monster', height = 140, weight = 52, s_bust = 41, s_waist = 38, s_hip = 40, b_month = 3, b_day = 15, bloodt = 'a', gender = 'f'; INSERT INTO edit_char_traits VALUES (4, 0), (12, 2), (22, 0), (27, 0), (18, 1); SELECT edit_char_commit(); -- cgit v1.2.3