Permalink
Browse files

Merge branch 'master' of git@github.com:gallery/gallery3 into beta3_s…

…taging
  • Loading branch information...
2 parents 71a2e36 + 6c0732e commit c527e70f26a85403633c9c8c7d32cc3b30cf625e @bharat bharat committed Sep 14, 2009
@@ -27,6 +27,7 @@ static function photo_bottom($theme) {
$block = new Block;
$block->css_id = "gComments";
$block->title = t("Comments");
+ $block->anchor = "comments";
$view = new View("comments.html");
$view->comments = ORM::factory("comment")
@@ -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);
});
}
@@ -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 ?>
@@ -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) {
@@ -43,7 +43,7 @@
<div id="gHeader">
<?= $theme->admin_header_top() ?>
<ul id="gLoginMenu">
- <li class="first"><?= html::anchor(item::root()->url(), "&larr; ".t("Back to the Gallery")) ?></li>
+ <li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
<li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;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() ?>">
@@ -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"): ?>
@@ -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">

0 comments on commit c527e70

Please sign in to comment.