diff options
| -rw-r--r-- | README | 11 | ||||
| -rw-r--r-- | modules/comment/helpers/comment_theme.php | 1 | ||||
| -rw-r--r-- | modules/comment/js/comment.js | 18 | ||||
| -rw-r--r-- | modules/gallery/controllers/albums.php | 12 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/upgrader.html.php | 2 | ||||
| -rw-r--r-- | modules/organize/js/organize.js | 2 | ||||
| -rw-r--r-- | themes/admin_default/views/admin.html.php | 2 | ||||
| -rw-r--r-- | themes/admin_default/views/block.html.php | 3 | ||||
| -rw-r--r-- | themes/default/views/block.html.php | 2 |
10 files changed, 32 insertions, 23 deletions
@@ -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 diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php index 38a00b5c..e9b402f6 100644 --- a/modules/comment/helpers/comment_theme.php +++ b/modules/comment/helpers/comment_theme.php @@ -27,6 +27,7 @@ class comment_theme_Core { $block = new Block; $block->css_id = "gComments"; $block->title = t("Comments"); + $block->anchor = "comments"; $view = new View("comments.html"); $view->comments = ORM::factory("comment") diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js index 9fd63c1a..bff83770 100644 --- a/modules/comment/js/comment.js +++ b/modules/comment/js/comment.js @@ -1,13 +1,15 @@ $("document").ready(function() { $("#gAddCommentButton").click(function(event) { event.preventDefault(); - $.get($(this).attr("href"), - {}, - function(data) { - $("#gCommentDetail").append(data); - ajaxify_comment_form(); - }); - }); + if (!$("#gAddCommentForm").length) { + $.get($(this).attr("href"), + {}, + function(data) { + $("#gCommentDetail").append(data); + ajaxify_comment_form(); + }); + } + }); }); function ajaxify_comment_form() { @@ -22,7 +24,7 @@ function ajaxify_comment_form() { $.get(data.resource, function(data, textStatus) { $("#gComments .gBlockContent ul:first").append("<li>"+data+"</li>"); $("#gComments .gBlockContent ul:first li:last").effect("highlight", {color: "#cfc"}, 8000); - $("#gAddCommentForm").hide(2000); + $("#gAddCommentForm").hide(2000).remove(); $("#gNoCommentsYet").hide(2000); }); } 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")); + } } } 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 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 @@ <? else: // can_upgrade ?> <h1> <?= t("Who are you?") ?> </h1> <p> - <?= t("You're not logged in as an administrator, so we have to verify you to make sure it's ok for you to do an upgrade. To prove you can run an upgrade, create a file called %name in your <b>gallery3/var/tmp</b> directory.", array("name" => "<br/><b>$upgrade_token</b>")) ?> + <?= t("You're not logged in as an administrator, so we have to verify you to make sure it's ok for you to do an upgrade. To prove you can run an upgrade, create a file called <br/><b>%name</b> in your <b>gallery3/var/tmp</b> directory.", array("name" => "$upgrade_token")) ?> </p> <a href="<?= url::site("upgrader?") ?>"><?= t("Ok, I've done that") ?></a> <? endif // can_upgrade ?> 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) { diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index f77881bb..ef15ed25 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -43,7 +43,7 @@ <div id="gHeader"> <?= $theme->admin_header_top() ?> <ul id="gLoginMenu"> - <li class="first"><?= html::anchor(item::root()->url(), "← ".t("Back to the Gallery")) ?></li> + <li class="first"><?= html::anchor(item::root()->abs_url(), "← ".t("Back to the Gallery")) ?></li> <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li> </ul> <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>"> diff --git a/themes/admin_default/views/block.html.php b/themes/admin_default/views/block.html.php index 21512d02..6cbea76e 100644 --- a/themes/admin_default/views/block.html.php +++ b/themes/admin_default/views/block.html.php @@ -1,4 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> +<? if ($anchor): ?> +<a name="<?= $anchor ?>"></a> +<? endif ?> <div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget"> <div class="ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-icon-right"> <? if ($css_id != "gBlockAdder"): ?> 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 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> +<? if ($anchor): ?> <a name="<?= $anchor ?>"></a> +<? endif ?> <div id="<?= $css_id ?>" class="gBlock"> <h2><?= $title ?></h2> <div class="gBlockContent"> |