From a2930cfa613ef12e91909a9351d2a01019f53937 Mon Sep 17 00:00:00 2001 From: Kevin Nehls Date: Tue, 14 Jul 2009 20:41:10 -0700 Subject: Fix backslashes in relative URLs of combined css files. --- modules/gallery/libraries/Gallery_View.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php index 8a0be7f2..4715be09 100644 --- a/modules/gallery/libraries/Gallery_View.php +++ b/modules/gallery/libraries/Gallery_View.php @@ -135,6 +135,7 @@ class Gallery_View_Core extends View { $relative = substr(realpath(dirname($css_file) . "/$match[1]"), $docroot_length); if (!empty($relative)) { $search[] = $match[0]; + $relative = str_replace(DIRECTORY_SEPARATOR, "/", $relative); $replace[] = "url('" . url::abs_file($relative) . "')"; } else { Kohana::log("error", "Missing URL reference '{$match[1]}' in CSS file '$css_file'"); -- cgit v1.2.3 From b96ac1eb81b7ccd5bd050ffab0ca9ce1feec8f4f Mon Sep 17 00:00:00 2001 From: Kevin Nehls Date: Wed, 15 Jul 2009 21:28:00 -0700 Subject: move fix for backslashes on windows outside of loop per bharat's suggestion --- modules/gallery/libraries/Gallery_View.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php index 4715be09..133066d7 100644 --- a/modules/gallery/libraries/Gallery_View.php +++ b/modules/gallery/libraries/Gallery_View.php @@ -135,12 +135,12 @@ class Gallery_View_Core extends View { $relative = substr(realpath(dirname($css_file) . "/$match[1]"), $docroot_length); if (!empty($relative)) { $search[] = $match[0]; - $relative = str_replace(DIRECTORY_SEPARATOR, "/", $relative); $replace[] = "url('" . url::abs_file($relative) . "')"; } else { Kohana::log("error", "Missing URL reference '{$match[1]}' in CSS file '$css_file'"); } } + $replace = str_replace(DIRECTORY_SEPARATOR, "/", $replace); $css = str_replace($search, $replace, $css); } $imports = preg_match_all("#@import\s*['|\"]{0,1}(.*?)['|\"]{0,1};#", -- cgit v1.2.3 From 51f6329a89be3382b7319b0add30283e9c9bce6a Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 12 Sep 2009 17:11:10 -0700 Subject: Update version to "3.0 beta 3" --- modules/gallery/helpers/gallery.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php index 813134eb..a892287f 100644 --- a/modules/gallery/helpers/gallery.php +++ b/modules/gallery/helpers/gallery.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class gallery_Core { - const VERSION = "3.0 git (pre-beta3)"; + const VERSION = "3.0 beta 3"; /** * If Gallery is in maintenance mode, then force all non-admins to get routed to a "This site is -- cgit v1.2.3 From bc69dfb410ac0b35e4f2caa2230858eb15322a9a Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 12 Sep 2009 22:30:05 -0700 Subject: Updated README for beta 3 --- README | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README b/README index d445be1f..b3426212 100644 --- a/README +++ b/README @@ -7,10 +7,10 @@ interface. SECURITY (& INTENDED AUDIENCE): -This is the first beta release of Gallery 3.0 and while it's not a -finished product, it's heading into the home stretch. You can install -it on public websites, but remember that until the final release is -out, we make no guarantees that it won't do bad things. +This is the third and final beta release of Gallery 3.0 and while it's +not a finished product, it's heading into the home stretch. You can +install it on public websites, but remember that until the final +release is out, we make no guarantees that it won't do bad things. Note: - We've contracted a professional security audit, received their results @@ -22,8 +22,7 @@ Note: - Most of the key features are in, but some of them (notably the "add from server" and "organize album" features) are probably going to be completely rewritten. - - Starting with beta 1 we're going to offer an upgrade path so you won't - have to reinstall and start all over (yay!) + - You can upgrade from beta 1, but not from alpha releases. The intended audience of this release is folks who are willing to live a little bit on the edge. We'll do our best to take care of your data -- cgit v1.2.3 From caa2002d7777e0ceb884d4c628650804620ca2b6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 13 Sep 2009 01:04:16 -0700 Subject: If there's a show= param and we can't find the given id in the current album, just ignore the parameter. --- modules/gallery/controllers/albums.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php index 183c26d0..08a60132 100644 --- a/modules/gallery/controllers/albums.php +++ b/modules/gallery/controllers/albums.php @@ -40,11 +40,13 @@ class Albums_Controller extends Items_Controller { if ($show) { $index = $album->get_position($show); - $page = ceil($index / $page_size); - if ($page == 1) { - url::redirect($album->abs_url()); - } else { - url::redirect($album->abs_url("page=$page")); + if ($index) { + $page = ceil($index / $page_size); + if ($page == 1) { + url::redirect($album->abs_url()); + } else { + url::redirect($album->abs_url("page=$page")); + } } } -- cgit v1.2.3 From 645cf6347cda049dc09664e60626c7a4f5609f89 Mon Sep 17 00:00:00 2001 From: Kevin Nehls Date: Sun, 13 Sep 2009 09:14:25 -0700 Subject: Fix "Back to the gallery" link in upper-right corner in Admin Dashboard. --- themes/admin_default/views/admin.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index f77881bb..995e95ef 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -43,7 +43,7 @@
admin_header_top() ?>
    -
  • url(), "← ".t("Back to the Gallery")) ?>
    • +
"> -- cgit v1.2.3 From 1499778b4aaf010cbb766d83770284a54044a836 Mon Sep 17 00:00:00 2001 From: Kevin Nehls Date: Sun, 13 Sep 2009 09:26:30 -0700 Subject: Remove raw HTML that's wrapped around the name of the file to create if not logged in as admin --- modules/gallery/views/upgrader.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php index 5f93c2d5..8a01cd29 100644 --- a/modules/gallery/views/upgrader.html.php +++ b/modules/gallery/views/upgrader.html.php @@ -81,7 +81,7 @@

- gallery3/var/tmp directory.", array("name" => "
$upgrade_token")) ?> + %name in your gallery3/var/tmp directory.", array("name" => "$upgrade_token")) ?>

"> -- cgit v1.2.3 From 827c845abbfe0767cb5063fea372477c24713b1e Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 13 Sep 2009 14:14:01 -0700 Subject: Use the absolute url format for the root item. html::anchor() will not prepend the base url to that. --- themes/admin_default/views/admin.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 995e95ef..ef15ed25 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -43,7 +43,7 @@
admin_header_top() ?>
    -
    • +
  • abs_url(), "← ".t("Back to the Gallery")) ?>
+
diff --git a/themes/default/views/block.html.php b/themes/default/views/block.html.php index 37504861..e8cff833 100644 --- a/themes/default/views/block.html.php +++ b/themes/default/views/block.html.php @@ -1,5 +1,7 @@ + +

-- cgit v1.2.3 From 6c0732e16fa904125d9d437f8f3e96d377c448d9 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sun, 13 Sep 2009 16:24:03 -0700 Subject: Set the AlbumTreeContainer instead of the height. This fixes ticket #755 --- modules/organize/js/organize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 7d204708..cfaff01c 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -142,7 +142,7 @@ $("#gDialog").bind("dialogopen", function(event, ui) { $("#gOrganize").height($("#gDialog").innerHeight() - 20); $("#gOrganizeMicroThumbPanel").height($("#gDialog").innerHeight() - 90); - $("#gOrganizeAlbumTree").height($("#gDialog").innerHeight() - 59); + $("#gOrganizeTreeContainer").height($("#gDialog").innerHeight() - 59); }); $("#gDialog").bind("dialogclose", function(event, ui) { -- cgit v1.2.3