Gallery2: HighSlide config cleanup

diff --git a/gal/Makefile b/gal/Makefile
index c57a4f3ca4f3bc9fbd35c2dfdfee2161405363c2..48813468a76acf9e2bddeacb04e92ce07e48feea 100644 (file)
--- a/gal/Makefile
+++ b/gal/Makefile
@@ -7,7 +7,7 @@ $(call lib-copy, $(addprefix UCW/Gallery/Web/, Plain.pm NrtBlue.pm HighSlide.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))
 
-$(call copy, $(addprefix highslide/, highslide-ie6.css highslide.config.js highslide-with-gallery.js highslide.css))
+$(call copy, $(addprefix highslide/, highslide.css highslide-ie6.css highslide-with-gallery.js custom.css custom.js))
 $(call copy, $(addprefix highslide/graphics/, \
        close.png closeX.png controlbar-black-border.gif controlbar-text-buttons.png controlbar-white-small.gif \
        controlbar-white.gif controlbar2.gif controlbar3.gif controlbar4-hover.gif controlbar4.gif fullexpand.gif \

diff --git a/gal/UCW/Gallery/Web/HighSlide.pm b/gal/UCW/Gallery/Web/HighSlide.pm
index 5cb5f44b9ff4200b89bf0dc6ab9c2f65183adb5c..86ffcacf4a09548cbc06ed5a0a8c158daa4034b2 100644 (file)
--- a/gal/UCW/Gallery/Web/HighSlide.pm
+++ b/gal/UCW/Gallery/Web/HighSlide.pm
@@ -31,11 +31,12 @@ sub theme_head_extras($) {
        return <<AMEN ;
 <link rel=stylesheet href='$tdir/style.css' type='text/css' media=all>
 <script type="text/javascript" src="$hsdir/highslide-with-gallery.js"></script>
-<script type="text/javascript" src="$hsdir/highslide.config.js" charset="utf-8"></script>
+<script type="text/javascript" src="$hsdir/custom.js" charset="utf-8"></script>
 <script type="text/javascript">
 hs.graphicsDir = '$hsdir/graphics/';
 </script>
 <link rel="stylesheet" type="text/css" href="$hsdir/highslide.css">
+<link rel="stylesheet" type="text/css" href="$hsdir/custom.css">
 <!--[if lt IE 7]>
 <link rel="stylesheet" type="text/css" href="$hsdir/highslide-ie6.css">
 <![endif]-->

diff --git a/gal/highslide/custom.css b/gal/highslide/custom.css
new file mode 100644 (file)
index 0000000..5b3413c
--- /dev/null
+++ b/gal/highslide/custom.css
@@ -0,0 +1,44 @@
+/*
+ *     Site-specific stylesheet for Highslide JS gallery theme
+ */
+
+.highslide-wrapper, .highslide-outline {
+       background: #111111;
+}
+.highslide img {
+       border: 1px solid #D0D0D0;
+}
+.highslide:hover img {
+       border-color: #A0A0A0;
+}
+.highslide-active-anchor img {
+       visibility: visible;
+       border-color: #808080 !important;
+}
+.highslide-image {
+       border: 2px solid #111111;
+}
+.highslide-caption {
+       color: #CCCCCC;
+       padding: 2px;
+}
+.highslide-loading {
+       color: black;
+       border: 1px solid black;
+       background-color: white;
+       background-image: url(graphics/loader.white.gif);
+}
+.highslide-controls {
+       position: static !important;
+       margin: 0;
+       width: 120px !important;
+}
+.highslide-gallery ul li {
+       width: 130px;
+       height: 110px;
+       border: 1px solid #505;
+       margin: 2px;
+}
+.highslide-dimming {
+       background: black;
+}

diff --git a/gal/highslide/custom.js b/gal/highslide/custom.js
new file mode 100644 (file)
index 0000000..1a8408d
--- /dev/null
+++ b/gal/highslide/custom.js
@@ -0,0 +1,42 @@
+/*
+ *     Site-specific configuration settings for Highslide JS
+ */
+
+hs.showCredits = true;
+hs.creditsPosition = 'top right';
+hs.outlineType = 'rounded-black';
+hs.fadeInOut = false;
+hs.align = 'center';
+hs.useBox = true;
+hs.width = 1080;
+hs.height = 840;
+// hs.allowMultipleInstances = false;
+hs.captionEval = 'this.thumb.title';
+hs.captionOverlay = { position: "top" };
+hs.expandDuration = 100;
+hs.restoreDuration = 100;
+hs.dimmingDuration = 100;
+hs.dimmingOpacity = 0.8;
+hs.transitionDuration = 100;
+hs.thumbnailId = 'thumb1';
+hs.numberPosition = 'caption';
+hs.transitions = ['expand', 'crossfade'];
+
+hs.addSlideshow({
+       interval: 5000,
+       repeat: false,
+       useControls: true,
+       fixedControls: 'fit',
+       overlayOptions: {
+               className: 'controls-in-heading',
+               opacity: 0.6,
+               position: 'top center',
+               hideOnMouseOut: true
+       },
+       thumbstrip: {
+               mode: 'horizontal',
+               position: 'below',
+               relativeTo: 'expander'
+       }
+
+});

diff --git a/gal/highslide/highslide.config.js b/gal/highslide/highslide.config.js
deleted file mode 100644 (file)
index 1a8408d..0000000
--- a/gal/highslide/highslide.config.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *     Site-specific configuration settings for Highslide JS
- */
-
-hs.showCredits = true;
-hs.creditsPosition = 'top right';
-hs.outlineType = 'rounded-black';
-hs.fadeInOut = false;
-hs.align = 'center';
-hs.useBox = true;
-hs.width = 1080;
-hs.height = 840;
-// hs.allowMultipleInstances = false;
-hs.captionEval = 'this.thumb.title';
-hs.captionOverlay = { position: "top" };
-hs.expandDuration = 100;
-hs.restoreDuration = 100;
-hs.dimmingDuration = 100;
-hs.dimmingOpacity = 0.8;
-hs.transitionDuration = 100;
-hs.thumbnailId = 'thumb1';
-hs.numberPosition = 'caption';
-hs.transitions = ['expand', 'crossfade'];
-
-hs.addSlideshow({
-       interval: 5000,
-       repeat: false,
-       useControls: true,
-       fixedControls: 'fit',
-       overlayOptions: {
-               className: 'controls-in-heading',
-               opacity: 0.6,
-               position: 'top center',
-               hideOnMouseOut: true
-       },
-       thumbstrip: {
-               mode: 'horizontal',
-               position: 'below',
-               relativeTo: 'expander'
-       }
-
-});

diff --git a/gal/highslide/highslide.css b/gal/highslide/highslide.css
index 5494b6a9e3a809ea5b0cb90cf8d60620b650dfd2..452b86211fa583e7f67c883924c236acf6126843 100644 (file)
--- a/gal/highslide/highslide.css
+++ b/gal/highslide/highslide.css
@@ -886,48 +886,3 @@ html>/**/body .highslide-gallery ul img {
 .highslide-thumbstrip-float .highslide-marker {
        display: none;
 }
-
-/*********************/
-/* Customized styles */
-/*********************/
-
-.highslide-wrapper, .highslide-outline {
-       background: #111111;
-}
-.highslide img {
-       border: 1px solid #D0D0D0;
-}
-.highslide:hover img {
-       border-color: #A0A0A0;
-}
-.highslide-active-anchor img {
-       visibility: visible;
-       border-color: #808080 !important;
-}
-.highslide-image {
-       border: 2px solid #111111;
-}
-.highslide-caption {
-       color: #CCCCCC;
-       padding: 2px;
-}
-.highslide-loading {
-       color: black;
-       border: 1px solid black;
-       background-color: white;
-       background-image: url(graphics/loader.white.gif);
-}
-.highslide-controls {
-       position: static !important;
-       margin: 0;
-       width: 120px !important;
-}
-.highslide-gallery ul li {
-       width: 130px;
-       height: 110px;
-       border: 1px solid #505;
-       margin: 2px;
-}
-.highslide-dimming {
-       background: black;
-}