attempt to migrate to moo 1.2

[mkgallery.git] / mkgallery.pl

diff --git a/mkgallery.pl b/mkgallery.pl
index 123c58d9ae7d01e56f6f73cb4484ee46a8a63d70..c7d3f46391a0e2a1b1e3271b90f5b208497a9726 100755 (executable)
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -565,18 +565,15 @@ sub startindex {
        print $IND start_html(-title => $title,
                        -encoding=>"utf-8",
                        -head=>$rsslink,
        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"},
                        -script=>[
                                {-src=>$inc."mootools.js"},

+                               {-src=>$inc."overlay.js"},

                                {-src=>$inc."urlparser.js"},
                                {-src=>$inc."urlparser.js"},

-                               {-src=>$inc."gallery.js"},
+                               {-src=>$inc."multibox.js"},

                                {-src=>$inc."slideshow.js"},
                                {-src=>$inc."slideshow.js"},

-                               {-code=>"\
-var incPrefix='$inc';window.addEvent('domready',init_gallery);\
-                               "}
+                               {-src=>$inc."gallery.js"},
+                               {-code=>"var incPrefix='$inc';"}

                        ]),
                a({-href=>"../index.html"},"UP"),"\n",
                start_center,"\n",
                        ]),
                a({-href=>"../index.html"},"UP"),"\n",
                start_center,"\n",


@@ -689,7 +686,7 @@ sub img_entry {
                div({-class=>'slidetitle',-id=>$name},
                        a({-href=>".html/$name-info.html",
                                -title=>'Image Info',
                div({-class=>'slidetitle',-id=>$name},
                        a({-href=>".html/$name-info.html",
                                -title=>'Image Info',

-                               -onClick=>"return showIbox('$name');"},
+                               -class=>'infobox'},

                                $title)),"\n",
                div({-class=>'slideimage',-id=>$name},
                        a({-href=>".html/$name-static.html",-title=>$title,
                                $title)),"\n",
                div({-class=>'slideimage',-id=>$name},
                        a({-href=>".html/$name-static.html",-title=>$title,