summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/comment/css/comment.css45
-rw-r--r--modules/comment/helpers/comment.php2
-rw-r--r--modules/comment/helpers/comment_theme.php6
-rw-r--r--modules/g2_import/css/g2_import.css30
-rw-r--r--modules/g2_import/helpers/g2_import_theme.php28
-rw-r--r--modules/gallery/css/gallery.css118
-rw-r--r--modules/gallery/css/upgrader.css2
-rw-r--r--modules/gallery/helpers/gallery_event.php2
-rw-r--r--modules/gallery/helpers/gallery_theme.php1
-rw-r--r--modules/organize/helpers/organize_event.php2
-rw-r--r--modules/recaptcha/css/recaptcha.css7
-rw-r--r--modules/search/views/search.html.php2
12 files changed, 240 insertions, 5 deletions
diff --git a/modules/comment/css/comment.css b/modules/comment/css/comment.css
new file mode 100644
index 00000000..f58391b0
--- /dev/null
+++ b/modules/comment/css/comment.css
@@ -0,0 +1,45 @@
+#g-content #g-comment-form {
+ margin-top: 2em;
+}
+
+#g-content #g-comments {
+ margin-top: 2em;
+ position: relative;
+}
+
+#g-content #g-comments ul li {
+ margin: 1em 0;
+}
+
+#g-content #g-comments .g-author {
+ border-bottom: 1px solid #ccc;
+ color: #999;
+ height: 32px;
+ line-height: 32px;
+}
+
+#g-content #g-comments ul li div {
+ padding: 0 8px 8px 43px;
+}
+
+#g-content #g-comments .g-avatar {
+ height: 32px;
+ margin-right: .4em;
+ width: 32px;
+}
+
+#g-admin-comment-button {
+ position: absolute;
+ right: 0;
+ top: 2px;
+}
+
+#g-admin-comments-menu {
+ margin: 1em 0;
+}
+
+#g-admin-comments-menu a {
+ margin: 0;
+ padding: .2em .6em;
+}
+
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 53d58afa..35685d8c 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -73,7 +73,7 @@ class comment_Core {
$group->textarea("text")->label(t("Comment")) ->id("g-text");
$group->hidden("item_id")->value($item->id);
module::event("comment_add_form", $form);
- $group->submit("")->value(t("Add"));
+ $group->submit("")->value(t("Add"))->class("ui-state-default ui-corner-all");
$active = identity::active_user();
if (!$active->guest) {
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index 10c855db..af0e1ca4 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -19,10 +19,16 @@
*/
class comment_theme_Core {
static function head($theme) {
+ $theme->css("comment.css");
$theme->script("comment.js");
return "";
}
+ static function admin_head($theme) {
+ $theme->css("comment.css");
+ return "";
+ }
+
static function photo_bottom($theme) {
$block = new Block;
$block->css_id = "g-comments";
diff --git a/modules/g2_import/css/g2_import.css b/modules/g2_import/css/g2_import.css
new file mode 100644
index 00000000..d53564d7
--- /dev/null
+++ b/modules/g2_import/css/g2_import.css
@@ -0,0 +1,30 @@
+#g-admin-g2-import-notes {
+ padding-bottom: 20px;
+}
+
+#g-admin-g2-import-details {
+ padding-top: 20px;
+}
+
+#g-admin-g2-import-details .g-warning {
+ margin-top: 4px;
+}
+
+#g-admin-g2-import-details .g-info {
+ padding: 2px;
+ border: 1px solid #999;
+ margin-bottom: 10px;
+}
+
+#g-admin-g2-import-notes p,
+#g-admin-g2-import-details .g-info p {
+ padding: 0;
+ margin: 0;
+}
+
+#g-admin-g2-import-notes ul li,
+#g-admin-g2-import .g-info ul li {
+ padding-left: 0;
+ margin-left: 20px;
+ list-style-type: disc;
+}
diff --git a/modules/g2_import/helpers/g2_import_theme.php b/modules/g2_import/helpers/g2_import_theme.php
new file mode 100644
index 00000000..b1aaac00
--- /dev/null
+++ b/modules/g2_import/helpers/g2_import_theme.php
@@ -0,0 +1,28 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+class g2_import_theme_Core {
+ static function head($theme) {
+ $theme->css("g2_import.css");
+ }
+
+ static function admin_head($theme) {
+ $theme->css("g2_import.css");
+ }
+} \ No newline at end of file
diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
new file mode 100644
index 00000000..a4a52155
--- /dev/null
+++ b/modules/gallery/css/gallery.css
@@ -0,0 +1,118 @@
+/**
+ * @todo Make #g-welcome-message p unecessary
+ * @todo Review permissions dialog, find home
+ */
+
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-edit-permissions-form {
+ clear: both;
+}
+
+#g-edit-permissions-form td {
+ background-image: none;
+}
+
+#g-edit-permissions-form fieldset {
+ border: 1px solid #ccc;
+ padding: 0;
+}
+
+#g-permissions .g-denied,
+#g-permissions .g-allowed {
+ text-align: center;
+ vertical-align: middle;
+}
+
+#g-permissions .g-denied {
+ background-color: #fcc;
+}
+
+#g-permissions .g-allowed {
+ background-color: #cfc;
+}
+
+/* Move items ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-move ul {
+ padding-left: 1em;
+}
+
+#g-move .selected {
+ background: #999;
+}
+
+/* Simple uploader ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-add-photos #SWFUpload_0 {
+ position: relative;
+ top: -200px;
+ left: 134px;
+}
+
+#g-add-photos .g-breadcrumbs {
+ border: 0;
+ margin: 0;
+ padding-left:10px;
+}
+
+#g-add-photos-canvas {
+ border: 1px solid #ccc;
+ margin: .5em 0 .5em 0;
+ width: 469px;
+ height: 325px;
+ overflow: auto;
+}
+
+#g-add-photos button {
+ margin-bottom: .5em;
+ float: right;
+}
+#g-uploadqueue-infobar {
+ clear: both;
+}
+
+#g-uploadqueue-infobar #g-cancelupload {
+ display: none;
+ cursor: pointer;
+}
+
+#g-add-photos-canvas {
+}
+
+#g-add-photos-queue .progressbar {
+ height: 4px;
+}
+
+#g-add-photos-queue .title {
+ font-size: 1.25em;
+}
+
+#g-add-photos-queue .status {
+ font-size: .75em;
+}
+
+#g-add-photos-queue .box {
+ margin-bottom: 8px;
+ padding: 4px;
+}
+
+#g-add-photos-queue .pending {
+ background-color: #e8e8e8;
+ border: 1px solid #d7d7d7;
+}
+
+#g-add-photos-queue .error {
+ background-color: #fcc;
+ border: 1px solid #ebb;
+}
+
+#g-add-photos-queue .uploading {
+ background-color: #ff9;
+ border: 1px solid #ee8;
+}
+
+#g-add-photos-queue .complete {
+ background-color: #cfc;
+ border: 1px solid #beb;
+}
diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css
index 7c377817..64e4ca07 100644
--- a/modules/gallery/css/upgrader.css
+++ b/modules/gallery/css/upgrader.css
@@ -1,6 +1,6 @@
body {
background: #eee;
- font-family: Trebuchet MS;
+ font-family: 'Trebuchet MS';
font-size: 1.1em;
}
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 216efa36..2ee20417 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -266,7 +266,7 @@ class gallery_event_Core {
->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
}
- // Don't move photos from the photo page; we don't yet have a good way of redirecting after
+ // @todo Don't move photos from the photo page; we don't yet have a good way of redirecting after
// move
if ($page_type == "album") {
$options_menu
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 5f3eb2a9..49a458b7 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,6 +21,7 @@ class gallery_theme_Core {
static function head($theme) {
$session = Session::instance();
$buf = "";
+ $theme->css("gallery.css");
if ($session->get("debug")) {
$theme->css("debug.css");
}
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index a33b2f2e..6aa6da81 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -25,7 +25,7 @@ class organize_event_Core {
$menu->get("options_menu")
->append(Menu::factory("dialog")
->id("organize")
- ->label(t("Organize Album"))
+ ->label(t("Organize album"))
->css_id("g-organize-link")
->url(url::site("organize/dialog/{$item->id}")));
}
diff --git a/modules/recaptcha/css/recaptcha.css b/modules/recaptcha/css/recaptcha.css
new file mode 100644
index 00000000..27117a55
--- /dev/null
+++ b/modules/recaptcha/css/recaptcha.css
@@ -0,0 +1,7 @@
+#g-content #g-comments ul li #g-recaptcha {
+ padding: 0;
+}
+
+#g-content #g-comments ul li #g-recaptcha div {
+ padding: 0;
+}
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index ac9f3c92..af14520b 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -21,7 +21,7 @@
<h1><?= t("Search Results") ?></h1>
<? if (count($items)): ?>
- <ul id="g-album-grid">
+ <ul id="g-album-grid" class="ui-helper-clearfix">
<? foreach ($items as $item): ?>
<? $item_class = "g-photo"; ?>
<? if ($item->is_album()): ?>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 09:30:59 +0000