From 1af791ab3995202b87596a3cc8f6cca3a542be58 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 28 Dec 2016 01:40:22 +0100 Subject: start switch to fancybox2 --- lib/App/Dthumb.pm | 30 +++++++----------------------- lib/App/Dthumb/Data.pm.PL | 12 +++--------- 2 files changed, 10 insertions(+), 32 deletions(-) (limited to 'lib/App') diff --git a/lib/App/Dthumb.pm b/lib/App/Dthumb.pm index 1b26b13..3dd76d8 100755 --- a/lib/App/Dthumb.pm +++ b/lib/App/Dthumb.pm @@ -22,7 +22,7 @@ sub new { $conf{spacing} //= 1.1; $conf{title} //= ( split( qr{/}, cwd() ) )[-1]; - $conf{file_index} //= 'index.xhtml'; + $conf{file_index} //= 'index.html'; $conf{dir_images} //= q{.}; $conf{dir_data} = "$conf{dir_images}/.dthumb"; @@ -47,15 +47,6 @@ sub new { height => $conf{size} * $conf{spacing} . 'px', ); - if ( $conf{lightbox} ) { - $ref->{data}->set_vars( - lightbox => $ref->{data}->get('lightbox/html_load.dthumb'), ); - } - elsif ( $conf{shadowbox} ) { - $ref->{data}->set_vars( - lightbox => $ref->{data}->get('shadowbox/html_load.dthumb'), ); - } - $ref->{html} = $ref->{data}->get('html_start.dthumb'); return bless( $ref, $obj ); @@ -101,23 +92,16 @@ sub create_files { my $thumbdir = $self->{config}->{dir_thumbs}; my $datadir = $self->{config}->{dir_data}; - my @files; + my @files = $self->{data}->list_archived; - for my $dir ( $thumbdir, $datadir, "${datadir}/lightbox", - "${datadir}/shadowbox" ) + for my $dir ( $thumbdir, $datadir, "${datadir}/css", + "${datadir}/js" ) { if ( not -d $dir ) { mkdir($dir); } } - if ( $self->{config}->{lightbox} or $self->{config}->{shadowbox} ) { - @files = $self->{data}->list_archived(); - } - else { - @files = ('main.css'); - } - for my $file (@files) { open( my $fh, '>', "${datadir}/${file}" ); print {$fh} $self->{data}->get($file); @@ -154,7 +138,7 @@ sub create_thumbnail_html { $self->{html} .= "
\n"; $self->{html} .= sprintf( - "\t\n" + "\t\n" . "\t\t\"%s\"\n", ($file) x 2, $self->{config}->{dir_thumbs}, @@ -280,7 +264,7 @@ Default: F<.> (current working directory) Set name of the html index file -Default: F +Default: F =item B => I @@ -355,7 +339,7 @@ the original file. =item $dthumb->write_out_html() -Write the cached HTML data to F. +Write the cached HTML data to F. =back diff --git a/lib/App/Dthumb/Data.pm.PL b/lib/App/Dthumb/Data.pm.PL index b2d0a33..32ba162 100644 --- a/lib/App/Dthumb/Data.pm.PL +++ b/lib/App/Dthumb/Data.pm.PL @@ -8,16 +8,13 @@ use MIME::Base64 qw(encode_base64); my ($out_file) = @ARGV; open( my $out_fh, '>', $out_file ); -opendir( my $share_dh, 'share' ); -opendir( my $share_lb_dh, 'share/lightbox' ); -opendir( my $share_sb_dh, 'share/shadowbox' ); print {$out_fh} ; for my $file ( - read_dir( 'share', prefix => 1 ), - read_dir( 'share/lightbox', prefix => 1 ), - read_dir( 'share/shadowbox', prefix => 1 ) + read_dir( 'share', prefix => 1 ), + read_dir( 'share/css', prefix => 1 ), + read_dir( 'share/js', prefix => 1 ) ) { @@ -37,9 +34,6 @@ for my $file ( printf {$out_fh} ( "______[ %s ]______\n%s\n", $file, $content, ); } -closedir($share_dh); -closedir($share_lb_dh); -closedir($share_sb_dh); close($out_fh); __DATA__ -- cgit v1.2.3