mame concealable elements on info page. hide them when loaded to info frame.

[mkgallery.git] / mkgallery.pl

diff --git a/mkgallery.pl b/mkgallery.pl
index 1d5b269884ff10c986b2559f2b5aba6f85739a2b..26e1729e3d11bddad9967ce68abe190cc9a905f1 100755 (executable)
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -75,14 +75,6 @@ my $term = new Term::ReadLine "Edit Title";
 
 FsObj->new(getcwd)->iterate;
 
-if ($rssobj) {
-       my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
-       while ($itemstodel-- > 0) {
-               pop(@{$rssobj->{'rss'}->{'items'}})
-       }
-       $rssobj->{'rss'}->save($rssobj->{'file'});
-}
-
 sub help {
 
        print STDERR <<__END__;
@@ -172,6 +164,11 @@ sub getrss {
                $rssobj->{'file'} = $rss;
                $rssobj->{'rss'} = new XML::RSS (version=>2);
                $rssobj->{'rss'}->parsefile($rss);
+               my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
+               while ($itemstodel-- > 0) {
+                       pop(@{$rssobj->{'rss'}->{'items'}})
+               }
+               $rssobj->{'rss'}->save($rssobj->{'file'});
                return $rss;
        } else {
                print STDERR "There is no $rssfile in this or parent ".
@@ -527,13 +524,19 @@ sub makeaux {
                my $imgsrc = sprintf("../.%s/%s",$sizes[0],$name);
                print $F start_html(-title=>$title,
                                -encoding=>"utf-8",
-                               -style=>{-src=>$inc."gallery.css"},),"\n",
+                               -style=>{-src=>$inc."gallery.css"},
+                               -script=>[
+                                       {-src=>$inc."mootools.js"},
+                                       {-src=>$inc."urlparser.js"},
+                                       {-src=>$inc."infopage.js"},
+                               ]),"\n",
                        start_center,"\n",
                        h1($title),"\n",
                        table({-class=>'ipage'},
                                Tr(td(img({-src=>$imgsrc})),
                                        td($self->infotable))),
-                       a({-href=>'../index.html'},'Index'),"\n",
+                       a({-href=>'../index.html',-class=>'conceal'},
+                               'Index'),"\n",
                        end_center,"\n",
                        end_html,"\n";
                close($F);
@@ -565,13 +568,12 @@ sub startindex {
        print $IND start_html(-title => $title,
                        -encoding=>"utf-8",
                        -head=>$rsslink,
-                       -style=>{-src=>[$inc."gallery.css"],
-                               -code=>
-".loading {background: url(".$inc."loading.gif) center no-repeat;}"
-                       },
+                       -style=>{-src=>$inc."gallery.css"},
                        -script=>[
                                {-src=>$inc."mootools.js"},
+                               {-src=>$inc."overlay.js"},
                                {-src=>$inc."urlparser.js"},
+                               {-src=>$inc."multibox.js"},
                                {-src=>$inc."slideshow.js"},
                                {-src=>$inc."gallery.js"},
                                {-code=>"var incPrefix='$inc';"}
@@ -671,23 +673,13 @@ sub img_entry {
 
        my $i=0+$self->{-parent}->{-numofimgs};
        $self->{-parent}->{-numofimgs}++;
-       print $IND start_div({-class=>'ibox',-id=>$name,
-                               -OnClick=>"HideIbox('$name');"}),"\n",
-               start_div({-class=>'iboxtitle'}),
-               span({-style=>'float: left;'},b("Info for $name")),
-               span({-style=>'float: right;'},
-                       a({-href=>"#",-OnClick=>"HideIbox('$name');"},"Close")),
-               br({-clear=>'all'}),"\n",
-               end_div,"\n",
-               $self->infotable,
-               end_div,"\n";
 
        print $IND a({-name=>$i}),"\n",
                start_table({-class=>'slide'}),start_Tr,start_td,"\n",
                div({-class=>'slidetitle',-id=>$name},
-                       a({-href=>".html/$name-info.html",
-                               -title=>'Image Info',
-                               -onClick=>"return showIbox('$name');"},
+                       a({-href=>".html/$name-info.html?conceal",
+                               -title=>'Image Info: '.$name,
+                               -class=>'infoBox'},
                                $title)),"\n",
                div({-class=>'slideimage',-id=>$name},
                        a({-href=>".html/$name-static.html",-title=>$title,