summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/controllers/admin_sidebar.php3
-rw-r--r--modules/gallery/views/admin_sidebar.html.php8
-rw-r--r--modules/gallery/views/login.html.php2
-rw-r--r--modules/tag/js/tag.js5
4 files changed, 12 insertions, 6 deletions
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index f029d259..c83b5a37 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -47,7 +47,8 @@ class Admin_Sidebar_Controller extends Admin_Controller {
$v = new View("admin_sidebar_blocks.html");
$v->blocks = $active;
$result["active"] = $v->render();
-
+ $message = t("Updated sidebar blocks");
+ $result["message"] = (string) $message;
print json_encode($result);
}
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index 67752f75..7c97270c 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -21,10 +21,12 @@
if (data.result == "success") {
$("ul#g-available-blocks").html(data.available);
$("ul#g-active-blocks").html(data.active);
- var message = <?= t("Updated blocks")->for_js() ?>;
$("#g-action-status").remove();
- $("#g-block-admin").before("<ul id=\"g-action-status\" class=\"g-message-block\"><li class=\"g-success\">" + message + "</li></ul>");
- $("#g-action-status").fadeTo(1000,1).fadeTo(2000,0);
+ var message = "<ul id=\"g-action-status\" class=\"g-message-block\">";
+ message += "<li class=\"g-success\">" + data.message + "</li>";
+ message += "</ul>";
+ $("#g-block-admin").before(message);
+ $("#g-action-status li").gallery_show_message();
}
});
}
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
index 9be218c0..3b327e31 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu">
+<ul id="g-login-menu" class="g-inline">
<? if ($user->guest): ?>
<li class="first">
<a href="<?= url::site("login/ajax") ?>"
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index ed977480..8cb4e571 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -72,7 +72,10 @@ function editInPlace(element) {
$("#g-rename-tag-form #name")
.addClass("g-error")
.focus();
- $("#g-tag-admin").before("<p id=\"g-action-status\" class=\"g-message-block g-error\">" + data.message + "</p>");
+ var message = "<ul id=\"g-action-status\" class=\"g-message-block\">";
+ message += "<li class=\"g-error\">" + data.message + "</li>";
+ message += "</ul>";
+ $("#g-tag-admin").before(message);
}
}
});