summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/gallery.common.css67
-rw-r--r--lib/gallery.common.js5
-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
-rw-r--r--themes/night_wind/css/screen.css13
-rw-r--r--themes/night_wind/views/page.html.php4
-rw-r--r--themes/wind/css/screen.css15
-rw-r--r--themes/wind/views/page.html.php4
10 files changed, 60 insertions, 66 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 77653d00..c94a8421 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -2,7 +2,7 @@
* Gallery 3 commonly re-used screen styles
*
* Sheet organization:
- *
+ *
* 1) Text
* 2) Forms
* 3) Dimension and scale
@@ -31,9 +31,13 @@
* 2) Forms
**********************************************************************/
+form {
+ margin: 0;
+}
+
fieldset {
border: 1px solid #ccc;
- padding: .8em 1em;
+ padding: .4em 1em .8em 1em;
}
#g-banner fieldset,
@@ -44,7 +48,7 @@ fieldset {
legend {
font-weight: bold;
- margin-left: .8em;
+ margin: 0 0 .4em .8em;
}
#g-banner legend,
@@ -54,24 +58,20 @@ input[type="hidden"] {
display: none;
}
-input.textbox,
-input[type="text"],
-input[type="password"] {
- width: 50%;
-}
-
textarea {
- width: 100%;
height: 12em;
}
+input.textbox,
input[type="text"],
input[type="password"],
textarea {
border: 1px solid #e8e8e8;
border-top-color: #ccc;
border-left-color: #ccc;
+ clear: both;
color: #333;
+ width: 50%;
}
input:focus,
@@ -113,6 +113,20 @@ input[type="reset"] {
float: left;
}
+/* Forms in dialogs ~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog form fieldset {
+ border: none;
+ padding: 0;
+}
+
+#g-dialog input.textbox,
+#g-dialog input[type=text],
+#g-dialog input[type=password],
+#g-dialog textarea {
+ width: 97%;
+}
+
/* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */
.g-short-form label {
@@ -164,6 +178,11 @@ input[type="reset"] {
width: 100%;
}
+form.g-narrow {
+ padding: 0;
+ width: 270px;
+}
+
/** *******************************************************************
* 4) States and interactions
**********************************************************************/
@@ -219,7 +238,7 @@ li.g-error select {
margin-bottom: .2em;
}
-.g-error,
+.g-error,
.g-denied,
tr.g-error td.g-error {
background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%;
@@ -235,7 +254,7 @@ tr.g-error td.g-error {
background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%;
}
-.g-warning,
+.g-warning,
tr.g-warning td.g-warning {
background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%;
}
@@ -450,39 +469,17 @@ div#g-action-status {
text-align: left;
}
-#g-dialog .g-narrow {
- width: 280px;
-}
-
-#g-dialog form fieldset {
- border: none;
- padding: 0;
-}
-
#g-dialog legend {
display: none;
}
-#g-dialog form input[type="text"],
-#g-dialog form input[type="password"] {
- width: 100%;
-}
-
-#g-dialog p {
- margin: 0;
-}
-
-#g-dialog li {
- padding-left: 0;
-}
-
#g-dialog .g-cancel {
margin: .4em 1em;
}
/* Inline layout ~~~~~~~~~~ */
-.g-inline * {
+.g-inline li {
float: left;
margin-right: .4em;
}
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 7c52fef0..da69e476 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -1,10 +1,9 @@
(function ($) {
// Fade in action status message background color
- $.fn.gallery_show_message = function(message) {
+ $.fn.gallery_show_message = function() {
return this.each(function(i){
- $(this).effect("highlight", {"color": "white"}, 3000);
- $(this).animate({opacity: 1.0}, 6000);
+ $(this).hide().fadeIn(3000)
});
};
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);
}
}
});
diff --git a/themes/night_wind/css/screen.css b/themes/night_wind/css/screen.css
index 7711a329..dfc94b6d 100644
--- a/themes/night_wind/css/screen.css
+++ b/themes/night_wind/css/screen.css
@@ -446,15 +446,6 @@ li.g-error select {
/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-banner #g-login-menu li,
-#g-footer #g-credits li {
- display: inline;
-}
-
-#g-banner #g-login-menu li {
- padding-left: 1.2em;
-}
-
#g-footer #g-credits li {
padding-right: 1.2em;
}
@@ -480,6 +471,10 @@ li.g-error select {
float: right;
}
+#g-banner #g-login-menu li {
+ padding-left: 1.2em;
+}
+
/* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#g-site-menu {
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index f5c6b0df..a14a3278 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -124,14 +124,14 @@
<? endif ?>
</div>
</div>
- <div id="g-footer">
+ <div id="g-footer" class="ui-helper-clearfix">
<?= $theme->footer() ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
<?= $footer_text ?>
<? endif ?>
<? if (module::get_var("gallery", "show_credits")): ?>
- <ul id="g-credits">
+ <ul id="g-credits" class="g-inline">
<?= $theme->credits() ?>
</ul>
<? endif ?>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index fcbf63ea..ef2f1510 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -12,6 +12,8 @@
* 6) Browser hacks
* 7) jQuery and jQuery UI
* 8) Right-to-left language styles
+ *
+ * @todo Move #g-admin-g2-import stuff to g2import module
*/
/** *******************************************************************
@@ -329,15 +331,6 @@ td {
/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-banner #g-login-menu li,
-#g-footer #g-credits li {
- display: inline;
-}
-
-#g-banner #g-login-menu li {
- padding-left: 1.2em;
-}
-
#g-footer #g-credits li {
padding-right: 1.2em;
}
@@ -362,6 +355,10 @@ td {
float: right;
}
+#g-banner #g-login-menu li {
+ padding-left: 1.2em;
+}
+
/* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#g-site-menu {
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index f5c6b0df..a14a3278 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -124,14 +124,14 @@
<? endif ?>
</div>
</div>
- <div id="g-footer">
+ <div id="g-footer" class="ui-helper-clearfix">
<?= $theme->footer() ?>
<? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
<?= $footer_text ?>
<? endif ?>
<? if (module::get_var("gallery", "show_credits")): ?>
- <ul id="g-credits">
+ <ul id="g-credits" class="g-inline">
<?= $theme->credits() ?>
</ul>
<? endif ?>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 16:52:45 +0000