add css id attribute, minor fixes

diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index dcef1f08c6de4f408bdbe0ea99a21fe55468ed03..fa87e51c85f83875390ba44b493bc129968d25a7 100644 (file)
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -1,5 +1,5 @@
 #gallerycontent { margin-top: 2.8em; overflow: visible; }
-#g-settings {position: absolute; left 13.5em; top: 0;}
+#g-settings {position: absolute; left: 13.5em; top: 0;}
 div#controls input[type=button] { -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; opacity: 1; position:absolute; right:13.5em; top:0em; }
 input[type=button]:disabled { opacity: 0.5 }
 .ui-dialog tr {background-color: #eee;}

diff --git a/apps/gallery/css/supersized.css b/apps/gallery/css/supersized.css
index 617f501120fe003e4279c2b321041ba29347df18..57ee7e23a50c31f99d41d0b95e534dc5c5316ffa 100644 (file)
--- a/apps/gallery/css/supersized.css
+++ b/apps/gallery/css/supersized.css
@@ -9,17 +9,17 @@
        License : MIT License / GPL License
        
 */
-#supersized-loader { display:none; position:absolute; top:50%; left:50%; z-index:0; width:60px; height:60px; margin:-30px 0 0 -30px; text-indent:-999em; background:url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center;}
+#supersized-holder #supersized-loader { display:none; position:absolute; top:50%; left:50%; z-index:0; width:60px; height:60px; margin:-30px 0 0 -30px; text-indent:-999em; background:url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center;}
 
-#supersized {  visibility:hidden; display:block; position:fixed; left:0; top:0; overflow:hidden; z-index:200; height:100%; width:100%; }
-#supersized img { width:auto; height:auto; position:relative; display:none; outline:none; border:none; }
-#supersized.speed img { -ms-interpolation-mode:nearest-neighbor; image-rendering: -moz-crisp-edges; }  /*Speed*/
-#supersized.quality img { -ms-interpolation-mode:bicubic; image-rendering: optimizeQuality; }                  /*Quality*/
+#supersized-holder #supersized {  visibility:hidden; display:block; position:fixed; left:0; top:0; overflow:hidden; z-index:200; height:100%; width:100%; }
+#supersized-holder #supersized img { width:auto; height:auto; position:relative; display:none; outline:none; border:none; }
+#supersized-holder #supersized.speed img { -ms-interpolation-mode:nearest-neighbor; image-rendering: -moz-crisp-edges; }       /*Speed*/
+#supersized-holder #supersized.quality img { -ms-interpolation-mode:bicubic; image-rendering: optimizeQuality; }                       /*Quality*/
 
-#supersized li { display:block; list-style:none; z-index:150; position:fixed; overflow:hidden; top:0; left:0; width:100%; height:100%; background:#111; }
-#supersized a { width:100%; height:100%; display:block; }
-#supersized li.prevslide { z-index:160; }
-#supersized li.activeslide { z-index:170; }
-#supersized li.image-loading { background:#111 url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center; width:100%; height:100%; }
-#supersized li.image-loading img{ visibility:hidden; }
-#supersized li.prevslide img, #supersized li.activeslide img{ display:inline; }
+#supersized-holder #supersized li { display:block; list-style:none; z-index:150; position:fixed; overflow:hidden; top:0; left:0; width:100%; height:100%; background:#111; }
+#supersized-holder #supersized a { width:100%; height:100%; display:block; }
+#supersized-holder #supersized li.prevslide { z-index:160; }
+#supersized-holder #supersized li.activeslide { z-index:170; }
+#supersized-holder #supersized li.image-loading { background:#111 url('%appswebroot%/gallery/img/supersized/progress.gif') no-repeat center center; width:100%; height:100%; }
+#supersized-holder #supersized li.image-loading img{ visibility:hidden; }
+#supersized-holder #supersized li.prevslide img, #supersized-holder #supersized li.activeslide img{ display:inline; }

diff --git a/apps/gallery/css/supersized.shutter.css b/apps/gallery/css/supersized.shutter.css
index 0084d4bb9c0f8b0e3e0a7a18808f419bcc757649..428c254c3b2fbbf2f91fdc3605af9fc55943a77b 100644 (file)
--- a/apps/gallery/css/supersized.shutter.css
+++ b/apps/gallery/css/supersized.shutter.css
@@ -13,62 +13,62 @@
 
 /* Controls Bar
 ----------------------------*/
-#slideshow-controls-wrapper { margin:0 auto; height:42px; width:100%; bottom:0px; left:0; z-index:204; background:url('%appswebroot%/gallery/img/supersized/nav-bg.png') repeat-x; position:fixed; }
-#slideshow-controls { overflow:hidden; height:100%; position:relative; text-align:left; z-index:205; }
-#slidecounter { float:left; color:#999; font:14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 0 -1px 0; margin:0px 10px 0 15px; line-height:42px; }
-#slidecaption { overflow:hidden; float:left; color:#FFF; font:400 14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 1px 1px 2px; margin:0 20px 0 0; line-height:42px; }
+#slideshow-content #slideshow-controls-wrapper { margin:0 auto; height:42px; width:100%; bottom:0px; left:0; z-index:204; background:url('%appswebroot%/gallery/img/supersized/nav-bg.png') repeat-x; position:fixed; }
+#slideshow-content #slideshow-controls { overflow:hidden; height:100%; position:relative; text-align:left; z-index:205; }
+#slideshow-content #slidecounter { float:left; color:#999; font:14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 0 -1px 0; margin:0px 10px 0 15px; line-height:42px; }
+#slideshow-content #slidecaption { overflow:hidden; float:left; color:#FFF; font:400 14px "Helvetica Neue", Helvetica, Arial, sans-serif; text-shadow:#000 1px 1px 2px; margin:0 20px 0 0; line-height:42px; }
 
 /*#navigation { float:right; margin:0px 20px 0 0; }*/
-#play-button{ float:left; margin-top:1px;border-right:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
-#play-button:hover{ background-position:0 1px; cursor:pointer; }
+#slideshow-content #play-button{ float:left; margin-top:1px;border-right:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
+#slideshow-content #play-button:hover{ background-position:0 1px; cursor:pointer; }
 
-#prevslide, #nextslide{ position:fixed; height:43px; width:43px; top:50%; margin-top:-21px; opacity:0.6; z-index:204; }
-#prevslide{ left:10px; background:url('%appswebroot%/gallery/img/supersized/back.png'); }
-#nextslide{ right:10px; background:url('%appswebroot%/gallery/img/supersized/forward.png'); }
-#prevslide:active, #nextslide:active{ margin-top:-19px; }
-#prevslide:hover, #nextslide:hover{ cursor:pointer; }
+#slideshow-content #prevslide, #nextslide{ position:fixed; height:43px; width:43px; top:50%; margin-top:-21px; opacity:0.6; z-index:204; }
+#slideshow-content #prevslide{ left:10px; background:url('%appswebroot%/gallery/img/supersized/back.png'); }
+#slideshow-content #nextslide{ right:10px; background:url('%appswebroot%/gallery/img/supersized/forward.png'); }
+#slideshow-content #prevslide:active, #nextslide:active{ margin-top:-19px; }
+#slideshow-content #prevslide:hover, #nextslide:hover{ cursor:pointer; }
 
-ul#slide-list{ padding:15px 0; float:left; position:absolute; left:50%; }
-ul#slide-list li{ list-style:none; width:12px; height:12px; float:left; margin:0 5px 0 0; }
-ul#slide-list li.current-slide a, ul#slide-list li.current-slide a:hover{ background-position:0 0px; }
-ul#slide-list li a{ display:block; width:12px; height:12px; background:url('%appswebroot%/gallery/img/supersized/nav-dot.png') no-repeat 0 -24px; }
-ul#slide-list li a:hover{ background-position:0 -12px; cursor:pointer; }
+#slideshow-content ul#slide-list{ padding:15px 0; float:left; position:absolute; left:50%; }
+#slideshow-content ul#slide-list li{ list-style:none; width:12px; height:12px; float:left; margin:0 5px 0 0; }
+#slideshow-content ul#slide-list li.current-slide a, ul#slide-list li.current-slide a:hover{ background-position:0 0px; }
+#slideshow-content ul#slide-list li a{ display:block; width:12px; height:12px; background:url('%appswebroot%/gallery/img/supersized/nav-dot.png') no-repeat 0 -24px; }
+#slideshow-content ul#slide-list li a:hover{ background-position:0 -12px; cursor:pointer; }
 
-#tray-button{ float:right; margin-top:1px; border-left:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
-#tray-button:hover{ background-position:0 1px; cursor:pointer; }
+#slideshow-content #tray-button{ float:right; margin-top:1px; border-left:1px solid #333; background:url('%appswebroot%/gallery/img/supersized/bg-hover.png') repeat-x 0 44px; }
+#slideshow-content #tray-button:hover{ background-position:0 1px; cursor:pointer; }
 
 
 /* Progress Bar
 ----------------------------*/                                 
-#progress-back{ z-index:205; position:fixed; bottom:42px; left:0; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-back.png') repeat-x; }
-#progress-bar{ position:relative; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-bar.png') repeat-x; }
+#slideshow-content #progress-back{ z-index:205; position:fixed; bottom:42px; left:0; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-back.png') repeat-x; }
+#slideshow-content #progress-bar{ position:relative; height:8px; width:100%; background:url('%appswebroot%/gallery/img/supersized/progress-bar.png') repeat-x; }
 
 
 /* Thumbnail Navigation
 ----------------------------*/ 
-#nextthumb,#prevthumb { z-index:202; display:none; position:fixed; bottom:61px; height:75px; width:100px; overflow:hidden; background:#ddd; border:1px solid #fff; -webkit-box-shadow:0 0 5px #000; }
-#nextthumb { right:12px; }
-#prevthumb { left:12px; }
-#nextthumb img, #prevthumb img { width:150px; height:auto;  }
-#nextthumb:active, #prevthumb:active { bottom:59px; }
-#nextthumb:hover, #prevthumb:hover { cursor:pointer; }
+#slideshow-content #nextthumb, #slideshow-content #prevthumb { z-index:202; display:none; position:fixed; bottom:61px; height:75px; width:100px; overflow:hidden; background:#ddd; border:1px solid #fff; -webkit-box-shadow:0 0 5px #000; }
+#slideshow-content #nextthumb { right:12px; }
+#slideshow-content #prevthumb { left:12px; }
+#slideshow-content #nextthumb img, #slideshow-content #prevthumb img { width:150px; height:auto;  }
+#slideshow-content #nextthumb:active, #slideshow-content #prevthumb:active { bottom:59px; }
+#slideshow-content #nextthumb:hover, #slideshow-content #prevthumb:hover { cursor:pointer; }
 
 
 /* Thumbnail Tray
 ----------------------------*/                 
-#thumb-tray{ position:fixed; z-index:203; bottom:0; left:0; background:url('%appswebroot%/gallery/img/supersized/bg-black.png'); height:150px; width:100%; overflow:hidden; text-align:center; -moz-box-shadow: 0px 0px 4px #000; -webkit-box-shadow: 0px 0px 4px #000; box-shadow: 0px 0px 4px #000; }
+#slideshow-content #thumb-tray{ position:fixed; z-index:203; bottom:0; left:0; background:url('%appswebroot%/gallery/img/supersized/bg-black.png'); height:150px; width:100%; overflow:hidden; text-align:center; -moz-box-shadow: 0px 0px 4px #000; -webkit-box-shadow: 0px 0px 4px #000; box-shadow: 0px 0px 4px #000; }
 
-#thumb-back, #thumb-forward{ position:absolute; z-index:5; bottom:42px; height:108px; width:40px; }
-#thumb-back{ left:0; background: url('%appswebroot%/gallery/img/supersized/thumb-back.png') no-repeat center center;}
-#thumb-forward{ right:0; background:url('%appswebroot%/gallery/img/supersized/thumb-forward.png') no-repeat center center;}
-#thumb-back:hover, #thumb-forward:hover{ cursor:pointer; background-color:rgba(256,256,256, 0.1); }
-#thumb-back:hover{ border-right:1px solid rgba(256,256,256, 0.2); }
-#thumb-forward:hover{ border-left:1px solid rgba(256,256,256, 0.2); }
+#slideshow-content #thumb-back, #slideshow-content #thumb-forward{ position:absolute; z-index:5; bottom:42px; height:108px; width:40px; }
+#slideshow-content #thumb-back{ left:0; background: url('%appswebroot%/gallery/img/supersized/thumb-back.png') no-repeat center center;}
+#slideshow-content #thumb-forward{ right:0; background:url('%appswebroot%/gallery/img/supersized/thumb-forward.png') no-repeat center center;}
+#slideshow-content #thumb-back:hover, #slideshow-content #thumb-forward:hover{ cursor:pointer; background-color:rgba(256,256,256, 0.1); }
+#slideshow-content #thumb-back:hover{ border-right:1px solid rgba(256,256,256, 0.2); }
+#slideshow-content #thumb-forward:hover{ border-left:1px solid rgba(256,256,256, 0.2); }
 
 
-ul#thumb-list{ display:inline-block; list-style:none; position:relative; left:0px; padding:0 0px; }
-ul#thumb-list li{ background:#111; list-style:none; display:inline; width:150px; height:108px; overflow:hidden; float:left; margin:0; }
-ul#thumb-list li img { width:200px; height:auto; opacity:0.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter:alpha(opacity=60); -webkit-transition: all 100ms ease-in-out; -moz-transition: all 100ms ease-in-out; -o-transition: all 100ms ease-in-out; -ms-transition: all 100ms ease-in-out; transition: all 100ms ease-in-out; }
-ul#thumb-list li.current-thumb img, ul#thumb-list li:hover img{ opacity:1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); }
-ul#thumb-list li:hover{ cursor:pointer; }
+#slideshow-content ul#thumb-list{ display:inline-block; list-style:none; position:relative; left:0px; padding:0 0px; }
+#slideshow-content ul#thumb-list li{ background:#111; list-style:none; display:inline; width:150px; height:108px; overflow:hidden; float:left; margin:0; }
+#slideshow-content ul#thumb-list li img { width:200px; height:auto; opacity:0.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; filter:alpha(opacity=60); -webkit-transition: all 100ms ease-in-out; -moz-transition: all 100ms ease-in-out; -o-transition: all 100ms ease-in-out; -ms-transition: all 100ms ease-in-out; transition: all 100ms ease-in-out; }
+#slideshow-content ul#thumb-list li.current-thumb img, #slideshow-content ul#thumb-list li:hover img{ opacity:1; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); }
+#slideshow-content ul#thumb-list li:hover{ cursor:pointer; }
                                

diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index c7eafc9a1c700b8dee7db57a116d099ebf512adc..a891e2889f6b76cbf1387f8bf672a0312ac3395f 100644 (file)
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -32,12 +32,12 @@ OCP\Util::addStyle('gallery', 'styles');
 OCP\Util::addScript('gallery', 'pictures');
 OCP\Util::addStyle( 'gallery', 'supersized' );
 OCP\Util::addStyle( 'gallery', 'supersized.shutter' );
-OCP\Util::addscript('gallery', 'slideshow');
-OCP\Util::addscript('gallery', 'jquery.easing.min');
-OCP\Util::addscript('gallery', 'supersized.3.2.7.min');
-OCP\Util::addscript('gallery', 'supersized.shutter.min');
+OCP\Util::addScript('gallery', 'slideshow');
+OCP\Util::addScript('gallery', 'jquery.easing.min');
+OCP\Util::addScript('gallery', 'supersized.3.2.7.min');
+OCP\Util::addScript('gallery', 'supersized.shutter.min');
 
-include('gallery/lib/tiles.php');
+include 'gallery/lib/tiles.php';
 
 $root = !empty($_GET['root']) ? $_GET['root'] : '/';
 $images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);

diff --git a/apps/gallery/js/slideshow.js b/apps/gallery/js/slideshow.js
index 01d5a4cf2c9a9bc092e95893df73fca9ec4164f2..88e89f39ff004427baa473a654e266c051c4c7c9 100644 (file)
--- a/apps/gallery/js/slideshow.js
+++ b/apps/gallery/js/slideshow.js
@@ -5,7 +5,7 @@ $(document).ready(function(){
                        clearInterval($.supersized.vars.slideshow_interval);
                };
 
-               $(".supersizedHolder").remove();
+               $('#supersized-holder').remove();
                $('#slideshow-content').hide();
                $('#thumb-list').remove();
        }
@@ -22,11 +22,11 @@ $(document).ready(function(){
                        return;
                }
 
-               $("body").append("<div class='supersizedHolder'></div>");
-               $("#supersized-loader").remove();
-               $("#supersized").remove();
-               $(".supersizedHolder").append("<div id='supersized-loader'></div><ul id='supersized'></ul>");
-               $("#supersized").show();
+               $('body').append("<div id='supersized-holder'></div>");
+               $('#supersized-loader').remove();
+               $('#supersized').remove();
+               $('#supersized-holder').append("<div id='supersized-loader'></div><ul id='supersized'></ul>");
+               $('#supersized').show();
                $('#slideshow-content').show();
 
 

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 048fb6c5bbc5ee8c243427ff0f47edbc3ca778ab..b2efd5342ffa6ec0454828e3c7294f235dd23df3 100644 (file)
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -37,7 +37,7 @@ echo $_['tl']->get();
 </div>
 
 <!-- start supersized block -->
-<div id="slideshow-content" class="supersized" style="display:none;">
+<div id="slideshow-content" style="display:none;">
 
        <!--Thumbnail Navigation-->
        <div id="prevthumb"></div>

diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index c16ed69c0658015fb95fc590121f8c115fb715f6..00e891103f1488f39245c5b74b3226ea0c23f679 100644 (file)
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -1,9 +1,9 @@
 <?php
 OCP\Util::addStyle('gallery', 'styles');
-OCP\Util::addscript('gallery', 'albums');
-OCP\Util::addscript('gallery', 'album_cover');
-OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
-OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
+OCP\Util::addScript('gallery', 'albums');
+OCP\Util::addScript('gallery', 'album_cover');
+OCP\Util::addScript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack');
+OCP\Util::addScript('files_imageviewer', 'jquery.fancybox-1.3.4.pack');
 OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
 $l = OC_L10N::get('gallery');
 ?>