$title

From 42aa8d92ead61bc53773af56d8fd2c52a6047588 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Wed, 26 Dec 2012 20:50:02 +0100 Subject: [PATCH] Gallery2: Plain theme --- gal2/Makefile | 3 +- gal2/UCW/Gallery/Web.pm | 6 +-- gal2/UCW/Gallery/Web/NrtBlue.pm | 9 ++-- gal2/UCW/Gallery/Web/Plain.pm | 71 ++++++++++++++++++++++++++++++++ gal2/plain/back.png | Bin 0 -> 1447 bytes gal2/plain/next.png | Bin 0 -> 1358 bytes gal2/plain/prev.png | Bin 0 -> 1415 bytes gal2/plain/style.css | 13 ++++++ 8 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 gal2/UCW/Gallery/Web/Plain.pm create mode 100644 gal2/plain/back.png create mode 100644 gal2/plain/next.png create mode 100644 gal2/plain/prev.png create mode 100644 gal2/plain/style.css diff --git a/gal2/Makefile b/gal2/Makefile index e19fbcf..69b7e12 100644 --- a/gal2/Makefile +++ b/gal2/Makefile @@ -1,5 +1,6 @@ $(eval $(dir-setup)) -$(call lib-copy, UCW/Gallery.pm UCW/Gallery/Web.pm UCW/Gallery/Web/NrtBlue.pm) +$(call lib-copy, UCW/Gallery.pm UCW/Gallery/Web.pm UCW/Gallery/Web/NrtBlue.pm UCW/Gallery/Web/Plain.pm) $(call copy, $(addprefix nrt-blue/,back.png bot.png left.png next.png prev.png right.png top.png style.css)) +$(call copy, $(addprefix plain/,back.png next.png prev.png style.css)) diff --git a/gal2/UCW/Gallery/Web.pm b/gal2/UCW/Gallery/Web.pm index 63a7568..34a7691 100644 --- a/gal2/UCW/Gallery/Web.pm +++ b/gal2/UCW/Gallery/Web.pm @@ -37,9 +37,7 @@ Content-Type: text/html -$hextras -$theme_hextras -$title +$hextras$theme_hextras$title $textras EOF @@ -48,7 +46,7 @@ EOF sub html_bot($) { my ($self) = @_; - print $self->get('WebBotExtras'), "\n\n"; + print $self->get('WebBotExtras'), "\n"; } sub show_img($) { diff --git a/gal2/UCW/Gallery/Web/NrtBlue.pm b/gal2/UCW/Gallery/Web/NrtBlue.pm index de05937..0d327f1 100644 --- a/gal2/UCW/Gallery/Web/NrtBlue.pm +++ b/gal2/UCW/Gallery/Web/NrtBlue.pm @@ -1,5 +1,5 @@ # NRT Theme for MJ's Photo Gallery -# (c) 2003--2004 Martin Mares ; GPL'ed +# (c) 2003--2012 Martin Mares ; GPL'ed # Theme images taken from the cthumb package (c) Carlos Puchol package UCW::Gallery::Web::NrtBlue; @@ -25,13 +25,13 @@ my $bot_h = 18; sub theme_dir($) { my ($self) = @_; - return $self->get('ThemeUrlPrefix') . "/" . $theme_name; + return $self->get('ThemeUrlPrefix') . $theme_name; } sub theme_head_extras($) { my ($self) = @_; my $stylesheet = $self->theme_dir . "/style.css"; - return ""; + return "\n"; } sub show_links($$$$) { @@ -70,8 +70,7 @@ sub show_thumb($) { print "

\n"; print "

\n"; - print "\n"; - print "\n\n"; + print "\n\n"; } sub attach($$) { diff --git a/gal2/UCW/Gallery/Web/Plain.pm b/gal2/UCW/Gallery/Web/Plain.pm new file mode 100644 index 0000000..885095b --- /dev/null +++ b/gal2/UCW/Gallery/Web/Plain.pm @@ -0,0 +1,71 @@ +# Plain Theme for MJ's Photo Gallery +# (c) 2012 Martin Mares ; GPL'ed + +package UCW::Gallery::Web::Plain; + +use strict; +use warnings; + +use UCW::Gallery; +use UCW::Gallery::Web; + +our @ISA = qw(UCW::Gallery::Web); + +my $theme_name = "plain"; +my $navw = 48; +my $navh = 48; +my $box_w = 130; +my $box_h = 110; +my $thumb_w = 114; +my $thumb_h = 94; + +sub theme_dir($) { + my ($self) = @_; + return $self->get('ThemeUrlPrefix') . $theme_name; +} + +sub theme_head_extras($) { + my ($self) = @_; + my $stylesheet = $self->theme_dir . "/style.css"; + return "\n"; +} + +sub show_links($$$$) { + my ($self, $prev, $up, $next) = @_; + my $theme = $self->theme_dir; + print "

"; + print ""; + print "" if $prev ne ""; + print "\n"; + printf ""; + printf "" if $next ne ""; + print "\n"; + printf "" if $up ne ""; +} + +sub show_thumb($) { + my ($self, $meta, $photo_id, $click_url) = @_; + my $theme = $self->theme_dir; + my $m = $meta->{photo}->{$photo_id}; + my $annot = UCW::CGI::html_escape($m->{title}); + my $tf = $self->{thumb_fmt}; + my $tm = $meta->{thumb}->{$tf}->{$photo_id} or die "No thumbnails for format $tf found!\n"; + my $tw = $tm->{w}; + my $th = $tm->{h}; + my $thumb = $self->get('ThumbUrlPrefix') . "$tf/$photo_id.jpg"; + print "

\n"; + my $ol = int(($box_w - $tw)/2); + my $ot = int(($box_h - $th)/2); + my $tit = ($annot ne "") ? " title=\"$annot\"" : ""; + print "

\n"; + print "

\n\n"; +} + +sub attach($$) { + my ($class, $gal) = @_; + my $self = $class->SUPER::attach($gal); + $self->{thumb_fmt} = $gal->require_thumbnails($thumb_w, $thumb_h); + return $self; +} + +1; diff --git a/gal2/plain/back.png b/gal2/plain/back.png new file mode 100644 index 0000000000000000000000000000000000000000..501909ca247a3d07b3adc102fb24cbb9c827e65d GIT binary patch literal 1447 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 QSpWb407*qoM6N<$f&wjf5&!@I literal 0 HcmV?d00001 diff --git a/gal2/plain/prev.png b/gal2/plain/prev.png new file mode 100644 index 0000000000000000000000000000000000000000..68b2514cd7eda8049f5e7a9b8eddc72f69a69fcc GIT binary patch literal 1415 zcmV;21$g?2P)2P5k>$21r$j{ zK~!ko?U`MORAm^)f9K4c-JO{=U3bkiHz}bnGrb6cBrOdj3hSZ^yATSL0&j#aya=L; z?jq_&iXw;*vIx?OsGFiPTQe|q{U|AQvvu7)Gjrz5o{#sO_oIv1^>b!-X4eQ|p3B2L zGymWFe7w(d#_FNpa08po4Q_3KHb5Jo4bTQ?1GE8dIDmzV@_e*+BPY&nVfW`7>0der z$FZ?(t115-uRO?!b6fcCmuGq6>18+_HkpitWwoxwYIT@fxG2x=y-#t=;=;ve$Bw$Z zu=yLJNRkMNl#Rdgt#{V5;mO;tc=pWWd-!|ECyo_qqA)Ee%H){)>TJXV+`KT)so%>K z-3TcSTA8{c>WK%)cRLIoc2P>BRL#Fx%g$E(q|NK;Vt#KIX{t$6jZ&&9@c{XJmfpTD zq|_vdMoEL#=K9sZbmE83_>7JOd+of$IrmH9lCcz}VQhADJ+kjrIp9J{4juxBg2 z;t4+9b)w;qPAC48T_^D?;=k!a&4_<*=V3~2OdKnsP$GmvO@zN0@rMtMB4R}pro^!% zO?68}Y|mDF(Txbgl!_;)c!DTQQBw2f+s%rXRQ&|c6O30=(o{8_{|y0J5g&#rUMa>M zi|{>x5Q;Z;u4`Jn=LuXl!Yjo@VTw%k>{IButt*-qUoO_fd*zrQOj*97Z(8w3e!C>T zI2KVV#*9}}lBBitX$Y`rad$(9b3;|irIc^ko^c7>H zVMB=RJ04(OPZwGnj5aN&O%tPp#o04HW1|sk9__E|xcJs??pQXLeczu$rW&mbT7zXl z7)l2A4YPj3Qu2A{8sA(l%R>(@=D_}8ys|(ljhSHt8qY$O#o5ypif+W}wM*)LWXWxF zxbv?0?Emqfi;S6St|JDDvqb+_8}3gC!E7 zYSXCFv+F{ao7M&)6ytuv7oYvf>#rTC+utvo4=8jybavII(a8glsU`?gPMs{V{l#x7 z6{Bn6j}|F(JLK|NoQ~!(~?u4)c1t=v$EErnwz-bYzfHrkd`+A(OEYvBL9W!k{*d){Ej~Ix!K^D3Ww`)&Q!0GNWlU+iKsPgwV#2 zrW)T*ux*g3A&w;?mZ%0h?d1@u)CA)xS;s