From 9136090a23f47a42e459fc7e9f2b058df649e587 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 16:33:58 -0600 Subject: Quote Trebuchet MS since it contains a space. --- modules/gallery/css/upgrader.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.3 From a5d2af336a94c4cf4fd1a5732b3f64197a3f2dd2 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 16:51:24 -0600 Subject: Move g2_import styles from the theme to the module. --- modules/g2_import/css/g2_import.css | 30 +++++++++++++++++++++++++++ modules/g2_import/helpers/g2_import_theme.php | 28 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 modules/g2_import/css/g2_import.css create mode 100644 modules/g2_import/helpers/g2_import_theme.php 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 @@ +css("g2_import.css"); + } + + static function admin_head($theme) { + $theme->css("g2_import.css"); + } +} \ No newline at end of file -- cgit v1.2.3 From c5faa3560e53fa8547199f60545ba550c2c60345 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 16:53:54 -0600 Subject: Created gallery.css file, moved simple uploader, move, and permissions CSS there. Removed relocated styles from theme css. --- modules/gallery/css/gallery.css | 118 ++++++++++++++++++++++ modules/gallery/helpers/gallery_theme.php | 1 + themes/wind/css/screen.css | 157 ++---------------------------- 3 files changed, 128 insertions(+), 148 deletions(-) create mode 100644 modules/gallery/css/gallery.css 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/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index a342b4bd..05b8f59a 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/themes/wind/css/screen.css b/themes/wind/css/screen.css index 84b8b090..873f0a47 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -9,11 +9,12 @@ * 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 Move #g-comments to comment module, recapthca to recaptcha? + * @todo Make #g-welcome-message p unecessary + * @todo Review g-buttonset and it's usage */ /** ******************************************************************* @@ -371,7 +372,7 @@ td { margin-bottom: 0 !important; } -/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-context-menu { background-color: #fff; @@ -503,149 +504,9 @@ td { 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; -- cgit v1.2.3 From 02ecf5749c12967b8a742a734711c9c216592195 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 18:34:36 -0600 Subject: Make menu label adhere to our capitalization standard. --- modules/organize/helpers/organize_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}"))); } -- cgit v1.2.3 From a249460d63cd0727c0030f2d30f9054bb4589e11 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 19:01:15 -0600 Subject: Widen Superfish submenus to avoid wrapping with current items. --- themes/wind/css/screen.css | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 873f0a47..fc60aabb 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -457,7 +457,22 @@ td { /* Superfish menu overrides ~~~~~~~~~~~~~~ */ -.sf-menu li li, .sf-menu li li ul li { +.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; +} + +.sf-menu li li, +.sf-menu li li ul li { background-color: #bdd2ff; } -- cgit v1.2.3 From 6ba60c82de2a4923a9f493de1c599d5933d66588 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 20:53:10 -0600 Subject: Don't make g-editable items bold by default, let the theme or module handle font-weight of editable items. --- lib/gallery.common.css | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index d0d41ecf..860b6164 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -201,7 +201,6 @@ input[type="reset"] { .g-active, .g-enabled, .g-available, -.g-editable, .g-selected, .g-highlight { font-weight: bold; -- cgit v1.2.3 From 0875ad6fd99d0e2cb1904f9550f6407d19f9021c Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 20:55:26 -0600 Subject: Rename g-unselected to g-deselected. --- lib/gallery.common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 860b6164..4bbf5a6d 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -211,7 +211,7 @@ input[type="reset"] { .g-unavailable, .g-uneditable, .g-locked, -.g-unselected, +.g-deselected, .g-understate { color: #ccc; font-weight: normal; -- cgit v1.2.3 From db4379a91d3e2048166336c0a58df0acd535f0c8 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 21:03:33 -0600 Subject: Move Superfish menu width overrides to gallery.common, leave color overrides at the theme-level. --- lib/gallery.common.css | 16 ++++++++++++++++ themes/admin_wind/css/screen.css | 7 ++----- themes/wind/css/screen.css | 14 -------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 4bbf5a6d..be41cab6 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -366,6 +366,22 @@ 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; +} + /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-button { diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 25302407..b3861868 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -439,7 +439,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 +463,6 @@ tr.g-warning { border: none; } -.ui-draggable { - cursor: move; -} - #g-admin-dashboard .ui-state-highlight, #g-sidebar .ui-state-highlight { height: 2em; diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index fc60aabb..2f7dfaf0 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -457,20 +457,6 @@ td { /* 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; -} - .sf-menu li li, .sf-menu li li ul li { background-color: #bdd2ff; -- cgit v1.2.3 From b3059ab6d6824928445b2a44893fb85f06eb3360 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 22:18:38 -0600 Subject: Move g-editable styles from admin_wind to gallery.common, they'll be useful in themes as well as admin themes. --- lib/gallery.common.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index be41cab6..39124d6e 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -217,6 +217,15 @@ input[type="reset"] { font-weight: normal; } +.g-editable { + padding: .2em .3em; +} + +.g-editable:hover { + background-color: #ffc; + cursor: text; +} + .g-error, .g-info, .g-success, -- cgit v1.2.3 From eb93e343e21a9f7dc30bc20802790b580000d206 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:02:58 -0600 Subject: Make "move item in photo view" comment a todo. --- modules/gallery/helpers/gallery_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index 39a6f337..67302e26 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -258,7 +258,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 -- cgit v1.2.3 From 49b94fbb3ddd26fe04e65d238f6462409c68357c Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:05:43 -0600 Subject: Apply g-inline to the user menu and footer. --- themes/admin_wind/views/admin.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ site_status() ?>
admin_header_top() ?> -
    +
    • abs_url(), "← ".t("Back to the Gallery")) ?>
    @@ -70,7 +70,7 @@
-