diff options
-rw-r--r-- | lib/gallery.common.css | 61 | ||||
-rw-r--r-- | modules/comment/css/comment.css | 45 | ||||
-rw-r--r-- | modules/comment/helpers/comment.php | 2 | ||||
-rw-r--r-- | modules/comment/helpers/comment_theme.php | 6 | ||||
-rw-r--r-- | modules/g2_import/css/g2_import.css | 30 | ||||
-rw-r--r-- | modules/g2_import/helpers/g2_import_theme.php | 28 | ||||
-rw-r--r-- | modules/gallery/css/gallery.css | 118 | ||||
-rw-r--r-- | modules/gallery/css/upgrader.css | 2 | ||||
-rw-r--r-- | modules/gallery/helpers/gallery_event.php | 2 | ||||
-rw-r--r-- | modules/gallery/helpers/gallery_theme.php | 1 | ||||
-rw-r--r-- | modules/organize/helpers/organize_event.php | 2 | ||||
-rw-r--r-- | modules/recaptcha/css/recaptcha.css | 7 | ||||
-rw-r--r-- | modules/search/views/search.html.php | 2 | ||||
-rw-r--r-- | themes/admin_wind/css/screen.css | 110 | ||||
-rw-r--r-- | themes/admin_wind/views/admin.html.php | 4 | ||||
-rw-r--r-- | themes/wind/css/screen.css | 218 |
16 files changed, 314 insertions, 324 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index d0d41ecf..93dd56e8 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -9,6 +9,8 @@ * 4) States and interactions * 5) Positioning and order * 6) Containers/widgets + * + * @todo Remove extra white space at the top of the add comment form, above the first field */ /** ******************************************************************* @@ -53,15 +55,10 @@ legend { #g-banner legend, #g-sidebar legend, -#g-content #g-search-form legend, input[type="hidden"] { display: none; } -textarea { - height: 12em; -} - input.textbox, input[type="text"], input[type="password"], @@ -74,6 +71,11 @@ textarea { width: 50%; } +textarea { + height: 12em; + width: 97%; +} + input:focus, input.textbox:focus, input[type=text]:focus, @@ -129,6 +131,7 @@ input[type="reset"] { /* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */ +.g-short-form legend, .g-short-form label { display: none; } @@ -148,6 +151,7 @@ input[type="reset"] { .g-short-form input[type=text] { color: #666; padding: .3em .6em; + width: 100%; } .g-short-form .textbox.g-error { @@ -201,7 +205,6 @@ input[type="reset"] { .g-active, .g-enabled, .g-available, -.g-editable, .g-selected, .g-highlight { font-weight: bold; @@ -212,12 +215,21 @@ input[type="reset"] { .g-unavailable, .g-uneditable, .g-locked, -.g-unselected, +.g-deselected, .g-understate { color: #ccc; font-weight: normal; } +.g-editable { + padding: .2em .3em; +} + +.g-editable:hover { + background-color: #ffc; + cursor: text; +} + .g-error, .g-info, .g-success, @@ -265,10 +277,15 @@ tr.g-error td.g-error { } .g-success, -.g-allowed { +.g-allowed, +tr.g-success td.g-success { background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%; } +tr.g-success td.g-success { + background-color: transparent; +} + .g-warning, tr.g-warning td.g-warning { background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%; @@ -367,6 +384,34 @@ form .g-error { .g-block-content { } +/* Superfish menu overrides ~~~~~~~~~~~~~~ */ + +.sf-menu ul { + width: 12em; +} + +ul.sf-menu li li:hover ul, +ul.sf-menu li li.sfHover ul { + left: 12em; +} + +ul.sf-menu li li li:hover ul, +ul.sf-menu li li li.sfHover ul { + left: 12em; +} + +/* jQuery UI ThemeRoller buttons */ + +/* Rotate icon, themerollower only provides one of these */ + +.ui-icon-rotate-ccw { + background-position: -192px -64px; +} + +.ui-icon-rotate-cw { + background-position: -208px -64px; +} + /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-button { 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()): ?> diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 25302407..13174df9 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -11,6 +11,8 @@ * 5) Navigation and menus * 6) jQuery and jQuery UI * 7) Right-to-left language styles + * + * @todo Consider moving g-panel to gallery.common */ /** ******************************************************************* @@ -165,27 +167,24 @@ th { opacity: 0.4; } -tr.g-error, -tr.g-info, -tr.g-success, -tr.g-warning { - background: none; -} - -.g-info td.g-info { +.g-info td { background-color: transparent; + background-image: none; } -.g-success td.g-success { +.g-success td { background-color: transparent; + background-image: none; } .g-error td { background-color: #f6cbca; + background-image: none; } .g-warning td { background-color: #fcf9ce; + background-image: none; } .g-module-status.g-info, @@ -281,19 +280,6 @@ tr.g-warning { /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ -#g-header #g-login-menu li, -#g-footer #g-credits li { - display: inline; -} - -#g-header #g-login-menu li { - padding-left: 1.2em; -} - -#g-footer #g-credits li { - padding-right: 1.2em; -} - #g-content #g-search-results { margin-top: 1em; padding-top: 1em; @@ -332,10 +318,6 @@ tr.g-warning { width: 90px; } -#g-site-status { - margin-bottom: 0; -} - #g-content .g-item { background-color: #fff; border: 1px solid #e8e8e8; @@ -347,15 +329,6 @@ tr.g-warning { width: 90px; } -#g-admin-comments-menu { - margin: 1em 0; -} - -#g-admin-comments-menu a { - margin: 0; - padding: .2em .6em; -} - #g-admin-graphics .g-available .g-block { clear: none; float: left; @@ -407,10 +380,6 @@ tr.g-warning { * 5) Navigation and menus *********************************************************************/ -#g-site-admin-menu { - font-size: 1.2em; -} - /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-header #g-login-menu { @@ -439,7 +408,8 @@ tr.g-warning { /* Superfish menu overrides ~~~~~~~~~~~~~~ */ -.sf-menu li li, .sf-menu li li ul li { +.sf-menu li li, +.sf-menu li li ul li { background-color: #bdd2ff; } @@ -462,10 +432,6 @@ tr.g-warning { border: none; } -.ui-draggable { - cursor: move; -} - #g-admin-dashboard .ui-state-highlight, #g-sidebar .ui-state-highlight { height: 2em; @@ -510,24 +476,8 @@ tr.g-warning { margin-left: .2em; } -.ui-icon-rotate-ccw { - background-position: -192px -64px; -} - -.ui-icon-rotate-cw { - background-position: -208px -64px; -} - /*************** STUFF THAT NEEDS A HOME ****************/ -#g-move ul { - padding-left: 1em; -} - -#g-move .selected { - background: #999; -} - .g-progress-bar { height: 1em; width: 100%; @@ -535,46 +485,6 @@ tr.g-warning { display: inline-block; } -#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; -} - -.g-editable { - padding: .1em .3em .2em .3em; -} - -.g-editable:hover { - background-color: #ffc; - cursor: text; -} - #g-task-log-dialog h1 { font-size: 1.1em; } diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index b788eb93..bbdde734 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -43,7 +43,7 @@ <?= $theme->site_status() ?> <div id="g-header"> <?= $theme->admin_header_top() ?> - <ul id="g-login-menu"> + <ul id="g-login-menu" class="g-inline"> <li class="first"><?= html::anchor(item::root()->abs_url(), "← ".t("Back to the Gallery")) ?></li> <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li> </ul> @@ -70,7 +70,7 @@ </div> <? endif ?> </div> - <div id="g-footer"> + <div id="g-footer" class="g-inline ui-helper-clearfix"> <?= $theme->admin_footer() ?> <div> <?= $theme->admin_credits() ?> diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 84b8b090..6e370a7f 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -9,11 +9,10 @@ * 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 + * 6) jQuery and jQuery UI + * 7) Right-to-left language styles * - * @todo Move #g-admin-g2-import stuff to g2import module + * @todo Review g-buttonset and it's usage here and admin_wind */ /** ******************************************************************* @@ -41,10 +40,6 @@ h1 { font-size: 1.7em; } -#g-search-results h1 { - margin-bottom: 1em; -} - #g-progress h1 { font-size: 1.1em; } @@ -285,50 +280,6 @@ td { margin: 1em auto; } -#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 ul li #g-recaptcha { - padding: 0; -} - -#g-content #g-comments ul li #g-recaptcha div { - padding: 0; -} - -#g-content #g-comments .g-avatar { - height: 32px; - margin-right: .4em; - width: 32px; -} - -#g-admin-comment-button { - position: absolute; - right: 0; - top: 2px; -} - -#g-content #g-comment-form { - margin-top: 2em; -} - /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-footer #g-credits li { @@ -371,7 +322,7 @@ td { margin-bottom: 0 !important; } -/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-context-menu { background-color: #fff; @@ -446,17 +397,14 @@ td { background-image: url('../images/ico-print.png'); } -#g-welcome-message p { - padding-bottom: 1em; -} - /** ******************************************************************* * 6) jQuery and jQuery UI *********************************************************************/ /* Superfish menu overrides ~~~~~~~~~~~~~~ */ -.sf-menu li li, .sf-menu li li ul li { +.sf-menu li li, +.sf-menu li li ul li { background-color: #bdd2ff; } @@ -495,157 +443,9 @@ td { margin-left: .2em; } -.ui-icon-rotate-ccw { - background-position: -192px -64px; -} - -.ui-icon-rotate-cw { - background-position: -208px -64px; -} - -/* STUFF THAT NEEDS A HOME */ - -#g-move ul { - padding-left: 1em; -} - -#g-move .selected { - background: #999; -} - -/* 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; -} - -/*************** STUFF THAT NEEDS A HOME ****************/ - -#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; -} - -#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; -} - -/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */ +/** ******************************************************************* + * 6) Right to left styles + *********************************************************************/ .rtl { direction: rtl; |