diff options
| -rw-r--r-- | lib/gallery.common.css | 4 | ||||
| -rw-r--r-- | modules/gallery/controllers/admin_theme_options.php | 3 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_installer.php | 7 | ||||
| -rw-r--r-- | modules/gallery/libraries/Form_Uploadify.php | 1 | ||||
| -rw-r--r-- | modules/gallery/libraries/ORM_MPTT.php | 4 | ||||
| -rw-r--r-- | modules/gallery/module.info | 3 | ||||
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 2 | ||||
| -rw-r--r-- | modules/rss/views/feed.mrss.php | 2 |
8 files changed, 20 insertions, 6 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 8aa21193..e586f29a 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -621,10 +621,12 @@ div#g-action-status { #g-add-photos-status li.g-success { background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%; + width: 429px; } #g-add-photos-status li.g-error { background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%; + width: 429px; /* color: #f00;*/ } @@ -818,4 +820,4 @@ div#g-action-status { .rtl .g-paginator .ui-icon-seek-first { background-position: -64px -160px; -}
\ No newline at end of file +} diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php index 9de54c78..6297e4aa 100644 --- a/modules/gallery/controllers/admin_theme_options.php +++ b/modules/gallery/controllers/admin_theme_options.php @@ -64,7 +64,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller { url::redirect("admin/theme_options"); } else { $view = new Admin_View("admin.html"); - $view->content = $form; + $view->content = new View("admin_theme_options.html"); + $view->content->form = $form; print $view; } } diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php index 57a5ee9f..39859b36 100644 --- a/modules/gallery/helpers/gallery_installer.php +++ b/modules/gallery/helpers/gallery_installer.php @@ -432,6 +432,13 @@ class gallery_installer { module::clear_var("gallery", "blocks_site.sidebar"); module::set_version("gallery", $version = 19); } + + // Set a default for the number of simultaneous uploads + // Version 20 was reverted in 57adefc5baa7a2b0dfcd3e736e80c2fa86d3bfa2, so skip it. + if ($version == 19 || $version == 20) { + module::set_var("gallery", "simultaneous_upload_limit", 5); + module::set_version("gallery", $version = 21); + } } static function uninstall() { diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index b1d9fa74..9d76153d 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -45,6 +45,7 @@ class Form_Uploadify_Core extends Form_Input { $v = new View("form_uploadify.html"); $v->album = $this->data["album"]; $v->script_data = $this->data["script_data"]; + $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit"); return $v; } diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php index 0ec0a848..949ca48c 100644 --- a/modules/gallery/libraries/ORM_MPTT.php +++ b/modules/gallery/libraries/ORM_MPTT.php @@ -48,6 +48,7 @@ class ORM_MPTT_Core extends ORM { */ function add_to_parent($parent) { $this->lock(); + $parent->reload(); // Assume that the prior lock holder may have changed the parent try { // Make a hole in the parent for this new item @@ -97,6 +98,7 @@ class ORM_MPTT_Core extends ORM { } $this->lock(); + $this->reload(); // Assume that the prior lock holder may have changed this entry try { $this->db_builder ->update($this->table_name) @@ -248,6 +250,8 @@ class ORM_MPTT_Core extends ORM { $level_delta = ($target->level + 1) - $this->level; $this->lock(); + $this->reload(); // Assume that the prior lock holder may have changed this entry + $target->reload(); try { if ($level_delta) { // Update the levels for the to-be-moved items diff --git a/modules/gallery/module.info b/modules/gallery/module.info index ba1ee91d..b3366f7d 100644 --- a/modules/gallery/module.info +++ b/modules/gallery/module.info @@ -1,5 +1,4 @@ name = "Gallery 3" description = "Gallery core application" -; Note: skip version 20, use 21 as the next version -version = 19 +version = 21 diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 5e99c8d5..d856c464 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -24,7 +24,7 @@ fileDesc: <?= t("Photos and movies")->for_js() ?>, cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>", buttonText: <?= t("Select photos...")->for_js() ?>, - simUploadLimit: 10, + simUploadLimit: <?= $simultaneous_upload_limit ?>, wmode: "transparent", hideButton: true, /* should be true */ auto: true, diff --git a/modules/rss/views/feed.mrss.php b/modules/rss/views/feed.mrss.php index 5fce8699..a61ee96c 100644 --- a/modules/rss/views/feed.mrss.php +++ b/modules/rss/views/feed.mrss.php @@ -56,7 +56,6 @@ type="<?= $child->mime_type ?>" height="<?= $child->resize_height ?>" width="<?= $child->resize_width ?>" - isDefault="true" /> <? if (access::can("view_full", $child)): ?> <media:content url="<?= $child->file_url(true) ?>" @@ -64,6 +63,7 @@ type="<?= $child->mime_type ?>" height="<?= $child->height ?>" width="<?= $child->width ?>" + isDefault="true" /> <? endif ?> <? else: ?> |