diff --git a/css/screen.css b/css/screen.css index f538961c..04be8cf8 100644 --- a/css/screen.css +++ b/css/screen.css @@ -631,7 +631,7 @@ tr.g-error td.g-error, .g-success, .g-allowed, #g-add-photos-status .g-success { - background: #d9efc2 url('../images/ico-success.png') no-repeat .4em 50%; + background: black url('../images/ico-success.png') no-repeat .4em 50%; } tr.g-success { @@ -756,6 +756,7 @@ form .g-error { top: 0; left: 0; position: absolute; + z-index: 1; } .g-item .g-context-menu { @@ -1356,3 +1357,18 @@ div#g-action-status { padding-left: 1.2em !important; padding-right: 0; } + +.uploadifyQueueItem { + background-color: black; +} +.uploadifyError { + background-color: #FDE5DD !important; + color: black; +} +.uploadifyProgress { + background-color: black; +} +.uploadifyProgressBar { + background-color: black; +} + diff --git a/js/gallery.dialog.js b/js/gallery.dialog.js index 0d63c1f5..06e80c8c 100644 --- a/js/gallery.dialog.js +++ b/js/gallery.dialog.js @@ -4,7 +4,8 @@ _init: function() { var self = this; if (!self.options.immediate) { - this.element.click(function(event) { + this.element.unbind('click'); + this.element.click(function(event) { event.preventDefault(); self._show($(event.currentTarget).attr("href")); return false; diff --git a/js/ui.init.js b/js/ui.init.js index c02ea678..d3eddcb6 100644 --- a/js/ui.init.js +++ b/js/ui.init.js @@ -20,7 +20,7 @@ $(document).ready(function() { $("#g-action-status li").gallery_show_message(); // Initialize dialogs - //$(".g-dialog-link").gallery_dialog(); + $(".g-dialog-link").gallery_dialog(); // Initialize short forms $(".g-short-form").gallery_short_form(); diff --git a/views/album.html.php b/views/album.html.php index 75c0d723..24cee6b3 100644 --- a/views/album.html.php +++ b/views/album.html.php @@ -87,7 +87,7 @@ endif; */?> - - - - + foreach (end($parents)->viewable()->children() as $i => $child) + if(!($child->is_album() || $child->is_movie())) + if($child->url() == $_SERVER['REQUEST_URI']): + $page_size = module::get_var("gallery","page_size"); ?> + + + + + html_attributes() ?> xml:lang="en" lang="en"> + start_combining("script,css") ?> <? if ($page_title): ?>