summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/gallery.common.css173
-rw-r--r--modules/g2_import/views/admin_g2_import.html.php2
-rw-r--r--modules/gallery/helpers/message.php2
-rw-r--r--modules/gallery/views/admin_advanced_settings.html.php2
-rw-r--r--modules/gallery/views/admin_dashboard.html.php4
-rw-r--r--modules/gallery/views/admin_sidebar.html.php4
-rw-r--r--modules/gallery/views/permissions_browse.html.php2
-rw-r--r--modules/gallery/views/simple_uploader.html.php2
-rw-r--r--modules/organize/views/organize_dialog.html.php2
-rw-r--r--themes/admin_wind/css/screen.css134
-rw-r--r--themes/wind/css/screen.css130
-rw-r--r--themes/wind/views/no_sidebar.html.php9
12 files changed, 169 insertions, 297 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index b679fbd2..d100791e 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -7,6 +7,7 @@
* 3) States and interactions
* 4) Positioning and order
* 5) Containers/widgets
+ * 6) Browser hacks
*/
/** *******************************************************************
@@ -61,32 +62,28 @@
.g-info,
.g-success,
.g-warning {
- background-position: .4em 50%;
- background-repeat: no-repeat;
padding: .4em .5em .4em 30px;
}
-.g-error,
-.g-denied {
- background-color: #f6cbca;
+.g-error,
+.g-denied,
+tr.g-error td.g-error {
+ background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%;
color: #f00;
- background-image: url('images/ico-error.png');
}
.g-info {
- background-color: #e8e8e8;
- background-image: url('images/ico-info.png');
+ background: #e8e8e8 url('images/ico-info.png') no-repeat .4em 50%;
}
.g-success,
.g-allowed {
- background-color: #d9efc2;
- background-image: url('images/ico-success.png');
+ background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%;
}
-.g-warning {
- background-color: #fcf9ce;
- background-image: url('images/ico-warning.png');
+.g-warning,
+tr.g-warning td.g-warning {
+ background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%;
}
form .g-error {
@@ -110,7 +107,29 @@ form .g-error {
cursor: move;
}
-.g-target {
+.g-draggable:hover {
+ border: 1px dashed #000;
+}
+
+.ui-sortable .g-target,
+.ui-state-highlight {
+ background-color: #fcf9ce;
+ border: 2px dotted #999;
+ height: 2em;
+ margin: 1em 0;
+}
+
+/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
+
+.g-loading-large,
+.g-dialog-loading-large {
+ background: #e8e8e8 url('images/loading-large.gif') no-repeat center center;
+ font-size: 0;
+}
+
+.g-loading-small {
+ background: #e8e8e8 url('images/loading-small.gif') no-repeat center center;
+ font-size: 0;
}
/** *******************************************************************
@@ -145,41 +164,17 @@ form .g-error {
* 5) Containers/widgets
**********************************************************************/
-#g-dialog {
- text-align: left;
-}
-
-#g-dialog .g-narrow {
- margin: 0 auto;
- width: 270px;
-}
-
-#g-dialog fieldset {
- border: none;
-}
-
-#g-dialog legend {
- display: none;
-}
-
-#g-dialog form input[type="text"],
-#g-dialog form input[type="password"] {
- width: 100%;
-}
+/* Generic block container ~~~~~~~~~~~~~~~ */
-#g-dialog p {
- margin: 0;
+.g-block {
+ clear: both;
+ margin-bottom: 2.5em;
}
-#g-dialog li {
- padding-left: 0;
+.g-block-content {
}
-#g-dialog .g-cancel {
- clear: none;
- float: left;
- margin: .3em 1em;
-}
+/* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
.g-button {
display: inline-block;
@@ -196,22 +191,30 @@ form .g-error {
-moz-outline-style: none;
}
-.g-progressbar {
+.g-progress-bar {
+ height: 1em;
+ width: 100%;
+ margin-top: .5em;
+ display: inline-block;
}
-.g-block {
+/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.g-message-block {
+ border: 1px solid #ccc;
}
-.g-block-content {
+#g-action-status {
+ width: 100% !important;
}
-.g-message-box {
- width: 100%;
+#g-site-status li {
+ border-bottom: 1px solid #ccc;
}
-.g-message {
- border: 1px solid #ccc;
- margin-bottom: .4em;
+.g-module-status {
+ clear: both;
+ margin-bottom: 1em;
}
/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -272,3 +275,69 @@ form .g-error {
.g-list-horizontal {
}
+
+/* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog {
+ text-align: left;
+}
+
+#g-dialog .g-narrow {
+ margin: 0 auto;
+ width: 270px;
+}
+
+#g-dialog fieldset {
+ border: none;
+}
+
+#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 {
+ clear: none;
+ float: left;
+ margin: .3em 1em;
+}
+
+/** *******************************************************************
+ * 6) Browser hacks
+ * @todo Insert .g-clearfix in context of specific selectors
+ * listed then delete them
+ *********************************************************************/
+
+.g-clearfix,
+#g-header:after,
+#g-album-grid:after,
+.g-pager:after,
+#g-view-menu:after,
+#g-site-admin-menu:after,
+#g-header:after,
+#g-admin-comments-menu:after,
+#g-group-admin:after,
+.g-selected:after,
+.g-available .g-block:after,
+#g-module-create-form ul li ul:after,
+#g-developer-tools:after,
+#g-photo-stream:after,
+#g-view-menu:after {
+ clear: both;
+ content: ".";
+ display: block;
+ height: 0;
+ visibility: hidden;
+}
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 51a1e245..fd8ae63c 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -30,7 +30,7 @@
<? if (g2_import::is_initialized()): ?>
<div id="g-admin-g2-import-details">
<h2> <?= t("Import") ?> </h2>
- <ul id="g-action-status">
+ <ul id="g-action-status" class="g-message-block">
<li class="g-success">
<?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
</li>
diff --git a/modules/gallery/helpers/message.php b/modules/gallery/helpers/message.php
index 0d638571..02680655 100644
--- a/modules/gallery/helpers/message.php
+++ b/modules/gallery/helpers/message.php
@@ -81,7 +81,7 @@ class message_Core {
$buf[] = "<li class=\"" . self::severity_class($msg[1]) . "\">$msg[0]</li>";
}
if ($buf) {
- return "<ul id=\"g-action-status\">" . implode("", $buf) . "</ul>";
+ return "<ul id=\"g-action-status\" class=\"g-message-block\">" . implode("", $buf) . "</ul>";
}
}
diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 422bd8f7..70ecd261 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -4,7 +4,7 @@
<p>
<?= t("Here are internal Gallery configuration settings. Most of these settings are accessible elsewhere in the administrative console.") ?>
</p>
- <ul id="g-action-status">
+ <ul id="g-action-status" class="g-message-block">
<li class="g-warning">
<b><?= t("Change these values at your own risk!") ?></b>
</li>
diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index 154aa172..f391547e 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -16,7 +16,7 @@
cursor: "move",
handle: $(".ui-widget-header"),
opacity: 0.6,
- placeholder: "g-drop-target",
+ placeholder: "g-target",
stop: update_blocks
});
@@ -26,7 +26,7 @@
cursor: "move",
handle: $(".ui-widget-header"),
opacity: 0.6,
- placeholder: "g-drop-target",
+ placeholder: "g-target",
stop: update_blocks
});
});
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index 3137a2a6..b4f339ae 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -4,7 +4,7 @@
$(".g-admin-blocks-list ul").sortable({
connectWith: ".g-sortable-blocks",
opacity: .7,
- placeholder: "ui-state-highlight",
+ placeholder: "g-target",
update: function(event,ui) {
if ($(this).attr("id") == "g-active-blocks") {
var active_blocks = "";
@@ -18,7 +18,7 @@
}
});
}
- },
+ }
}).disableSelection();
});
</script>
diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 540f2735..e432f56b 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -26,7 +26,7 @@
</script>
<div id="g-permissions">
<? if (!$htaccess_works): ?>
- <ul id="g-action-status">
+ <ul id="g-action-status" class="g-message-block">
<li class="g-error">
<?= t("Oh no! Your server needs a configuration change in order for you to hide photos! Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.",
array("mod_rewrite_attrs" => html::mark_clean('href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html" target="_blank"'),
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index ddad1fc4..ff73dd6f 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -12,7 +12,7 @@
<div id="g-add-photos">
<? if (ini_get("suhosin.session.encrypt")): ?>
- <ul id="g-action-status">
+ <ul id="g-action-status" class="g-message-block">
<li class="g-error">
<?= t("Error: your server is configured to use the <a href=\"%encrypt_url\"><code>suhosin.session.encrypt</code></a> setting from <a href=\"%suhosin_url\">Suhosin</a>. You must disable this setting to upload photos.",
array("encrypt_url" => "http://www.hardened-php.net/suhosin/configuration.html#suhosin.session.encrypt",
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index dc627d10..7dcb01d9 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -12,7 +12,7 @@
<div class="yui-u first">
<h3><?= t("Albums") ?></h3>
</div>
- <div id="g-action-status" class="yui-u">
+ <div id="g-action-status" class="g-message-block yui-u">
<div class="g-info"><?= t("Drag and drop photos to re-order or move between albums") ?></div>
</div>
</div>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index f23472b8..3573df57 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -5,13 +5,12 @@
*
* Sheet organization:
* 1) Basic HTML elements
- * 3) Reusable content blocks
- * 4) Page layout containers
- * 5) Content blocks in specific layout containers
- * 6) Navigation and menus
- * 7) Browser hacks
- * 8) jQuery and jQuery UI
- * 9) Right-to-left language styles
+ * 2) Reusable content blocks
+ * 3) Page layout containers
+ * 4) Content blocks in specific layout containers
+ * 5) Navigation and menus
+ * 6) jQuery and jQuery UI
+ * 7) Right-to-left language styles
*/
/** *******************************************************************
@@ -219,21 +218,15 @@ li.g-error select {
}
/** *******************************************************************
- * 3) Reusable content blocks
+ * 2) Reusable content blocks
*********************************************************************/
.g-block {
background-color: #fff;
border: 1px solid #ccc;
- clear: both;
- margin-bottom: 2.5em;
padding: 1em;
}
-#g-sidebar .g-block-content {
- padding: 0;
-}
-
.g-block h2 {
background-color: #e8e8e8;
padding: .3em .8em;
@@ -243,6 +236,10 @@ li.g-error select {
margin-top: 1em;
}
+#g-sidebar .g-block-content {
+ padding: 0;
+}
+
.g-selected img,
.g-available .g-block img {
float: left;
@@ -276,53 +273,6 @@ li.g-error select {
opacity: 0.4;
}
-/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-action-status {
- width: 100%;
-}
-
-#g-site-status li,
-#g-action-status li,
-.g-module-status {
- border: 1px solid #ccc;
- margin-bottom: .4em;
-}
-
-#g-site-status li {
- margin-bottom: 0;
- border: none;
- border-bottom: 1px solid #ccc;
-}
-
-.g-module-status {
- clear: both;
- margin-bottom: 1em;
-}
-
-.g-error,
-.g-info,
-.g-success,
-.g-warning {
- padding: .4em .5em .4em 30px;
-}
-
-.g-error, tr.g-error td.g-error {
- background: #f6cbca url('../../../lib/images/ico-error.png') no-repeat .4em 50%;
-}
-
-.g-info {
- background: #e8e8e8 url('../../../lib/images/ico-info.png') no-repeat .4em 50%;
-}
-
-.g-success {
- background: #d9efc2 url('../../../lib/images/ico-success.png') no-repeat .4em 50%;
-}
-
-.g-warning, tr.g-warning td.g-warning {
- background: #fcf9ce url('../../../lib/images/ico-warning.png') no-repeat .4em 50%;
-}
-
.g-pager .g-info,
tr.g-error,
tr.g-info,
@@ -368,7 +318,7 @@ tr.g-warning {
}
/*** ******************************************************************
- * 4) Page layout containers
+ * 3) Page layout containers
*********************************************************************/
/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -413,7 +363,7 @@ tr.g-warning {
}
/** *******************************************************************
- * 5) Content blocks in specific layout containers
+ * 4) Content blocks in specific layout containers
*********************************************************************/
/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -563,14 +513,11 @@ tr.g-warning {
#g-user-admin-list {
margin-bottom: 1em;
}
+
#g-user-admin-list td {
vertical-align: bottom;
}
-#g-user-admin-list .g-draggable:hover {
- border: 1px dashed black;
-}
-
#g-user-admin-list .admin {
color: #55f;
font-weight: bold;
@@ -694,28 +641,7 @@ li.g-default-group h4, li.g-default-group .g-user {
}
/** *******************************************************************
- * 6) Browser hacks
- *********************************************************************/
-
-#g-site-admin-menu:after,
-#g-header:after,
-#g-admin-comments-menu:after,
-#g-group-admin:after,
-.g-selected:after,
-.g-available .g-block:after,
-#g-module-create-form ul li ul:after,
-#g-developer-tools:after,
-#g-photo-stream:after,
-#g-view-menu:after {
- clear: both;
- content: ".";
- display: block;
- height: 0;
- visibility: hidden;
-}
-
-/** *******************************************************************
- * 7) jQuery and jQuery UI
+ * 6) jQuery and jQuery UI
*********************************************************************/
/* Superfish menu overrides ~~~~~~~~~~~~~~ */
@@ -728,30 +654,6 @@ li.g-default-group h4, li.g-default-group .g-user {
background-color: #dfe9ff;
}
-/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
-
-.g-loading-large,
-.g-dialog-loading-large {
- background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
- font-size: 0;
-}
-
-.g-loading-small {
- background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center;
- font-size: 0;
-}
-
-.g-draggable {
- cursor: move;
-}
-
-.g-drop-target {
- background-color: #cfdeff;
- border: 1px dotted #999;
- height: 100px;
- margin: 1em 0;
-}
-
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
#g-panel {
@@ -771,6 +673,12 @@ li.g-default-group h4, li.g-default-group .g-user {
cursor: move;
}
+#g-admin-dashboard .ui-state-highlight,
+#g-sidebar .ui-state-highlight {
+ height: 2em;
+ margin-bottom: 1em;
+}
+
.g-buttonset-vertical a {
width: 8em !important;
}
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index dac6a899..fe1025cc 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -5,13 +5,13 @@
*
* Sheet organization:
* 1) Basic HTML elements
- * 3) Reusable content blocks
- * 4) Page layout containers
- * 5) Content blocks in specific layout containers
- * 6) Navigation and menus
- * 7) Browser hacks
- * 8) jQuery and jQuery UI
- * 9) Right-to-left language styles
+ * 2) Reusable content blocks
+ * 3) Page layout containers
+ * 4) Content blocks in specific layout containers
+ * 5) Navigation and menus
+ * 6) Browser hacks
+ * 7) jQuery and jQuery UI
+ * 8) Right-to-left language styles
*/
/** *******************************************************************
@@ -222,14 +222,9 @@ li.g-error select {
}
/** *******************************************************************
- * 3) Reusable content blocks
+ * 2) Reusable content blocks
*********************************************************************/
-.g-block {
- clear: both;
- margin-bottom: 2.5em;
-}
-
.g-block h2 {
background-color: #e8e8e8;
padding: .3em .8em;
@@ -241,57 +236,6 @@ li.g-error select {
/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-content #g-action-status {
- width: 100%;
-}
-
-#g-site-status li,
-#g-action-status li,
-.g-module-status {
- border: 1px solid #ccc;
- margin-bottom: .4em;
-}
-
-#g-site-status li {
- margin-bottom: 0;
- border: none;
- border-bottom: 1px solid #ccc;
-}
-
-.g-module-status {
- clear: both;
- margin-bottom: 1em;
-}
-
-.g-error,
-.g-info,
-.g-success,
-.g-warning {
- background-position: .4em 50%;
- background-repeat: no-repeat;
- padding: .4em .5em .4em 30px;
-}
-
-.g-error {
- background-color: #f6cbca;
- background-image: url('../../../lib/images/ico-error.png');
-}
-
-.g-info {
- background-color: #e8e8e8;
- background-image: url('../../../lib/images/ico-info.png');
-}
-
-.g-success {
- background-color: #d9efc2;
- background-image: url('../../../lib/images/ico-success.png');
-}
-
-.g-warning {
- background-color: #fcf9ce;
- background-image: url('../../../lib/images/ico-warning.png');
-}
-
form .g-error,
.g-pager .g-info {
background-color: #fff !important;
@@ -316,7 +260,7 @@ form .g-error,
}
/*** ******************************************************************
- * 4) Page layout containers
+ * 3) Page layout containers
*********************************************************************/
/* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -364,7 +308,7 @@ form .g-error,
}
/** *******************************************************************
- * 5) Content blocks in specific layout containers
+ * 4) Content blocks in specific layout containers
*********************************************************************/
/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -455,7 +399,7 @@ form .g-error,
#g-content #g-item {
position: relative;
- width: 99%;
+ width: 100%;
}
#g-content #g-photo {
@@ -707,22 +651,7 @@ form .g-error,
}
/** *******************************************************************
- * 6) Browser hacks
- *********************************************************************/
-
-#g-header:after,
-#g-album-grid:after,
-.g-pager:after,
-#g-view-menu:after {
- clear: both;
- content: ".";
- display: block;
- height: 0;
- visibility: hidden;
-}
-
-/** *******************************************************************
- * 7) jQuery and jQuery UI
+ * 6) jQuery and jQuery UI
*********************************************************************/
/* Superfish menu overrides ~~~~~~~~~~~~~~ */
@@ -735,34 +664,6 @@ form .g-error,
background-color: #dfe9ff;
}
-/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
-
-.g-loading-large {
- background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center;
- font-size: 0;
-}
-
-.g-dialog-loading-large {
- background: url('../../../lib/images/loading-large.gif') no-repeat center center !important;
- font-size: 0;
-}
-
-.g-loading-small {
- background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center;
- font-size: 0;
-}
-
-.g-draggable {
- cursor: move;
-}
-
-.g-drop-target {
- background-color: #cfdeff;
- border: 1px dotted #999;
- height: 100px;
- margin: 1em 0;
-}
-
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
.ui-widget-overlay {
@@ -876,13 +777,6 @@ form .g-error,
/*************** STUFF THAT NEEDS A HOME ****************/
-.g-progress-bar {
- height: 1em;
- width: 100%;
- margin-top: .5em;
- display: inline-block;
-}
-
#g-add-photos #SWFUpload_0 {
position: relative;
top: -200px;
diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php
index d0d3eba6..378bd971 100644
--- a/themes/wind/views/no_sidebar.html.php
+++ b/themes/wind/views/no_sidebar.html.php
@@ -1,5 +1,6 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="g-warning">
- <?= t("No active sidebar blocks. <a href=\"%url\">Add blocks</a>",
- array("url" => html::mark_clean(url::site("admin/sidebar")))) ?>
-</div>
+<ul class="g-message-block">
+ <li class="g-warning"><?= t("No active sidebar blocks.<br/>
+ <a href=\"%url\">Add blocks</a>",
+ array("url" => html::mark_clean(url::site("admin/sidebar")))) ?></li>
+</ul>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 12:56:36 +0000