From b3226d7cbb4c9dbd2d6244d527cc7c4398489f47 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 19 Jun 2009 13:25:42 -0700 Subject: Improve the task dialog 1) Put a "starting up..." message before there's any feedback from the server 2) show the title of the task in the dialog. --- themes/default/css/screen.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'themes/default/css') diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 03c13cc1..68f12ff1 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -1000,6 +1000,10 @@ form .gError, /*************** STUFF THAT NEEDS A HOME ****************/ +#gProgress h1 { + font-size: 1.1em; +} + .gProgressBar { height: 1em; width: 100%; -- cgit v1.2.3 From c2faf5f8c811cdab334548289a5f35c1f4e7c8bf Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 19 Jun 2009 13:35:53 -0700 Subject: Move 'Permissions' above 'STUFF THAT NEEDS A HOME' since I think that the stuff that needs a home is a catch all and should be at the bottom. --- themes/default/css/screen.css | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'themes/default/css') diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 68f12ff1..e97c95d5 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -999,6 +999,19 @@ form .gError, } +/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +#gPermissions .gDenied, #gPermissions .gAllowed { + text-align: center; + vertical-align: middle; +} +#gPermissions .gDenied { + background-color: #fcc; +} +#gPermissions .gAllowed { + background-color: #cfc; +} + /*************** STUFF THAT NEEDS A HOME ****************/ #gProgress h1 { font-size: 1.1em; @@ -1058,16 +1071,3 @@ form .gError, background-color: #cfc; border: 1px solid #beb; } - -/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#gPermissions .gDenied, #gPermissions .gAllowed { - text-align: center; - vertical-align: middle; -} -#gPermissions .gDenied { - background-color: #fcc; -} -#gPermissions .gAllowed { - background-color: #cfc; -} -- cgit v1.2.3 From feab9cfc34d96637243eeefe22c886054caf4a9d Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 19 Jun 2009 13:47:38 -0700 Subject: Give the admin/g2_import page a facelift. --- modules/g2_import/views/admin_g2_import.html.php | 114 +++++++++++++---------- themes/default/css/screen.css | 29 ++++++ 2 files changed, 95 insertions(+), 48 deletions(-) (limited to 'themes/default/css') diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index d5e29e12..0c742962 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -1,74 +1,92 @@ -
+

-
- Note: The importer is a work in progress and does not currently support permissions, and movie formats other than Flash video and MP4") ?> -
- Note: The importer has known issues with the eAccelerator PHP accelerator. If you're using eAccelerator, please disable it. One way to do that is to put php_value eaccelerator.enable 0 in gallery3/.htaccess") ?>

- -
- - -
-

-
    -
  • - g2_import::version())) ?> -
    • -
-
+
+

- +

  • - + not imported. You will have to set them again manually (for now).") ?>
  • - +
  • - +
  • - + php_value eaccelerator.enable 0 in gallery3/.htaccess") ?>
    • -
  • - +
+
+ + + +
+

+
    +
  • + g2_import::version())) ?>
    • -
  • - + +
  • + Using the same value will speed up your import.", + array("g2_pixels" => $g2_sizes["thumb"]["size"], + "g3_pixels" => $thumb_size, + "url" => url::site("admin/theme_options"))) ?>
    • -
  • - + + + +
  • + Using the same value will speed up your import.", + array("g2_pixels" => $g2_sizes["resize"]["size"], + "g3_pixels" => $resize_size, + "url" => url::site("admin/theme_options"))) ?>
    • +
-
- -
- Using the same value will speed up your import.", - array("g2_pixels" => $g2_sizes["thumb"]["size"], - "g3_pixels" => $thumb_size, - "url" => url::site("admin/theme_options"))) ?> -
- +
+

+ +

+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
- -
- Using the same value will speed up your import.", - array("g2_pixels" => $g2_sizes["resize"]["size"], - "g3_pixels" => $resize_size, - "url" => url::site("admin/theme_options"))) ?> + "> + +
- - maintenance page", - array("url" => url::site("admin/maintenance"))) ?>
- diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index e97c95d5..521f3915 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -1012,6 +1012,7 @@ form .gError, background-color: #cfc; } + /*************** STUFF THAT NEEDS A HOME ****************/ #gProgress h1 { font-size: 1.1em; @@ -1071,3 +1072,31 @@ form .gError, background-color: #cfc; border: 1px solid #beb; } + +#gAdminG2ImportNotes { + padding-bottom: 20px; +} + +#gAdminG2ImportDetails { + padding-top: 20px; +} + +#gAdminG2ImportDetails .gWarning { + margin-top: 4px; +} + +#gAdminG2ImportDetails .gInfo { + padding: 2px; + border: 1px solid #999; +} + +#gAdminG2ImportNotes p { + padding: 0px; + margin: 0px; +} + +#gAdminG2ImportNotes ul li { + padding-left: 0px; + margin-left: 20px; + list-style-type: circle; +} -- cgit v1.2.3 From b72d0db7bee59d04dfc5036b35586210e81718e6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 19 Jun 2009 15:56:55 -0700 Subject: More minor facelift for the admin/g2_import page. --- modules/g2_import/views/admin_g2_import.html.php | 10 ++++++---- themes/default/css/screen.css | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'themes/default/css') diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 0c742962..da2bb5d1 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -83,10 +83,12 @@
- "> - - +

+ "> + + +

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 521f3915..b6d5bdb9 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -1088,15 +1088,16 @@ form .gError, #gAdminG2ImportDetails .gInfo { padding: 2px; border: 1px solid #999; + margin-bottom: 10px; } -#gAdminG2ImportNotes p { +#gAdminG2ImportNotes p, #gAdminG2ImportDetails .gInfo p { padding: 0px; margin: 0px; } -#gAdminG2ImportNotes ul li { +#gAdminG2ImportNotes ul li, #gAdminG2Import .gInfo ul li { padding-left: 0px; margin-left: 20px; - list-style-type: circle; + list-style-type: disc; } -- cgit v1.2.3 From 9bdeb726acf4eaaa26e5a90672c8646361fcef9c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 22 Jun 2009 13:25:55 -0700 Subject: Fix indentation --- themes/default/css/screen.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'themes/default/css') diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index b6d5bdb9..b6e2e1b8 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -414,7 +414,7 @@ form .gError, /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */ #gHeader { - background-color: #e8e8e8; + background-color: #e8e8e8; border-bottom: 1px solid #fff; font-size: .8em; margin-bottom: 1em; @@ -435,7 +435,7 @@ form .gError, } #gFooter { - background-color: #e8e8e8; + background-color: #e8e8e8; border-top: 1px solid #ccc; font-size: .8em; margin-top: 20px; -- cgit v1.2.3 From ec61cd5031c01028dee3435d6b25430ab068ec01 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 22 Jun 2009 14:20:28 -0700 Subject: Fix css indentation --- modules/gallery/css/l10n_client.css | 226 ++++++++++++++++++------------------ modules/gallery/css/upgrader.css | 98 ++++++++-------- modules/organize/css/organize.css | 2 +- themes/admin_default/css/screen.css | 10 +- themes/default/css/screen.css | 20 ++-- 5 files changed, 178 insertions(+), 178 deletions(-) (limited to 'themes/default/css') diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css index bab1d0ed..ecec859d 100644 --- a/modules/gallery/css/l10n_client.css +++ b/modules/gallery/css/l10n_client.css @@ -5,8 +5,8 @@ /* $Id: l10n_client.css,v 1.6 2008/09/09 10:48:20 goba Exp $ */ /* width percentages add to 99% rather than 100% to prevent float -overflows from occurring in an unnamed browser that can't decide -how it wants to round. */ + overflows from occurring in an unnamed browser that can't decide + how it wants to round. */ /* l10n_client container */ #l10n-client { @@ -19,8 +19,8 @@ how it wants to round. */ bottom:0px; left:0px; overflow:hidden;} - * html #l10n-client { - position:static;} +* html #l10n-client { + position:static;} #l10n-client-string-select .string-list, #l10n-client-string-editor .source, @@ -34,38 +34,38 @@ how it wants to round. */ color:#fff; background:#37a;} - #l10n-client .labels .label { - display:none;} +#l10n-client .labels .label { + display:none;} - /* Panel toggle button (span) */ - #l10n-client .labels .toggle { - cursor:pointer; - display:block; - position:absolute; right:0em; - padding: 0em .75em; height:2em; line-height:2em; - text-transform:uppercase; - text-align:center; background:#000;} +/* Panel toggle button (span) */ +#l10n-client .labels .toggle { + cursor:pointer; + display:block; + position:absolute; right:0em; + padding: 0em .75em; height:2em; line-height:2em; + text-transform:uppercase; + text-align:center; background:#000;} - /* Panel labels */ - #l10n-client h2 { - border-left:1px solid #fff; - height:1em; line-height:1em; - padding: .5em; margin:0px; - font-size:1em; - text-transform:uppercase;} +/* Panel labels */ +#l10n-client h2 { + border-left:1px solid #fff; + height:1em; line-height:1em; + padding: .5em; margin:0px; + font-size:1em; + text-transform:uppercase;} - #l10n-client .strings h2 { - border:0px;} +#l10n-client .strings h2 { + border:0px;} - /* 25 + 37 + 37 = 99 */ - #l10n-client .strings { - width:25%; float:left;} +/* 25 + 37 + 37 = 99 */ +#l10n-client .strings { + width:25%; float:left;} - #l10n-client .source { - width:37%; float:left;} +#l10n-client .source { + width:37%; float:left;} - #l10n-client .translation { - width:37%; float:left;} +#l10n-client .translation { + width:37%; float:left;} /* Translatable string list */ #l10n-client-string-select { @@ -75,77 +75,77 @@ how it wants to round. */ direction: ltr; } - #l10n-client .string-list { - height:17em; - overflow:auto; - list-style:none; list-style-image:none; - margin:0em; padding:0em;} - - #l10n-client .string-list li { - font-size:.9em; - line-height:1.5em; - cursor:default; - background:transparent; - list-style:none; list-style-image:none; - border-bottom:1px solid #ddd; - padding:.25em .5em; - margin:0em;} - - /* Green for translated */ - #l10n-client .string-list li.translated { - border-bottom-color:#9c3; - background:#cf6; color:#360;} - - #l10n-client .string-list li.translated:hover { - background: #df8;} - - #l10n-client .string-list li.translated:active { - background: #9c3;} - - #l10n-client .string-list li.hidden { - display:none;} - - /* Gray + Blue hover for untranslated */ - #l10n-client .string-list li.untranslated {} - - #l10n-client .string-list li.untranslated:hover { - background: #ace;} - - #l10n-client .string-list li.untranslated:active { - background: #8ac;} - - /* Selected string is indicated by bold text */ - #l10n-client .string-list li.active { - font-weight:bold;} - - #l10n-client #gL10nSearchForm { - background:#eee; - text-align:center; - height:2em; line-height:2em; - margin:0em; padding:.5em .5em; - } - - #l10n-client #gL10nSearchForm .form-item, - #l10n-client #gL10nSearchForm input.form-text, - #l10n-client #gL10nSearchForm #search-filter-go, - #l10n-client #gL10nSearchForm #search-filter-clear { - display:inline; - vertical-align:middle; - } - - #l10n-client #gL10nSearchForm .form-item { - margin:0em; - padding:0em; - } - - #l10n-client #gL10nSearchForm input.form-text { - width:80%; - } - - #l10n-client #gL10nSearchForm #search-filter-clear { - width:10%; - margin:0em; - } +#l10n-client .string-list { + height:17em; + overflow:auto; + list-style:none; list-style-image:none; + margin:0em; padding:0em;} + +#l10n-client .string-list li { + font-size:.9em; + line-height:1.5em; + cursor:default; + background:transparent; + list-style:none; list-style-image:none; + border-bottom:1px solid #ddd; + padding:.25em .5em; + margin:0em;} + +/* Green for translated */ +#l10n-client .string-list li.translated { + border-bottom-color:#9c3; + background:#cf6; color:#360;} + +#l10n-client .string-list li.translated:hover { + background: #df8;} + +#l10n-client .string-list li.translated:active { + background: #9c3;} + +#l10n-client .string-list li.hidden { + display:none;} + +/* Gray + Blue hover for untranslated */ +#l10n-client .string-list li.untranslated {} + +#l10n-client .string-list li.untranslated:hover { + background: #ace;} + +#l10n-client .string-list li.untranslated:active { + background: #8ac;} + +/* Selected string is indicated by bold text */ +#l10n-client .string-list li.active { + font-weight:bold;} + +#l10n-client #gL10nSearchForm { + background:#eee; + text-align:center; + height:2em; line-height:2em; + margin:0em; padding:.5em .5em; +} + +#l10n-client #gL10nSearchForm .form-item, +#l10n-client #gL10nSearchForm input.form-text, +#l10n-client #gL10nSearchForm #search-filter-go, +#l10n-client #gL10nSearchForm #search-filter-clear { + display:inline; + vertical-align:middle; +} + +#l10n-client #gL10nSearchForm .form-item { + margin:0em; + padding:0em; +} + +#l10n-client #gL10nSearchForm input.form-text { + width:80%; +} + +#l10n-client #gL10nSearchForm #search-filter-clear { + width:10%; + margin:0em; +} #l10n-client-string-editor { display:none; @@ -153,22 +153,22 @@ how it wants to round. */ width:74%;} #l10n-client-string-editor .source { - overflow:hidden; - width:50%; float:left;} + overflow:hidden; + width:50%; float:left;} #l10n-client-string-editor .source .source-text { - line-height:1.5em; - background:#eee; - font-family: monospace; - text-align: left; - height:16em; margin:1em; padding:1em; - overflow:auto; - direction: ltr; + line-height:1.5em; + background:#eee; + font-family: monospace; + text-align: left; + height:16em; margin:1em; padding:1em; + overflow:auto; + direction: ltr; } - #l10n-client-string-editor .translation { - overflow:hidden; - width:49%; float:right;} +#l10n-client-string-editor .translation { + overflow:hidden; + width:49%; float:right;} #gL10nClientSaveForm { padding:0em;} diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css index 6bd16064..b877df49 100644 --- a/modules/gallery/css/upgrader.css +++ b/modules/gallery/css/upgrader.css @@ -1,117 +1,117 @@ body { - background: #eee; - font-family: Trebuchet MS; - font-size: 1.1em; + background: #eee; + font-family: Trebuchet MS; + font-size: 1.1em; } h1 { - font-size: 1.4em; + font-size: 1.4em; } div#outer { - width: 650px; - background: white; - border: 1px solid #999; - margin: 0 auto; - padding: -10px; + width: 650px; + background: white; + border: 1px solid #999; + margin: 0 auto; + padding: -10px; } div#inner { - padding: 0 1em 0 1em; - margin: 0px; + padding: 0 1em 0 1em; + margin: 0px; } div#footer { - border-top: 1px solid #ccc; - margin: 1em; + border-top: 1px solid #ccc; + margin: 1em; } td.name { - text-align: left; - padding-left: 30px; + text-align: left; + padding-left: 30px; } td { - text-align: center; - border-bottom: 1px solid #eee; + text-align: center; + border-bottom: 1px solid #eee; } tr.current td { - color: #999; - font-style: italic; + color: #999; + font-style: italic; } tr.current td.gallery { - color: #00d; + color: #00d; } tr.upgradeable td { - font-weight: bold; + font-weight: bold; } tr.upgradeable td.gallery { - color: #00d; + color: #00d; } table { - width: 600px; - margin-bottom: 10px; + width: 600px; + margin-bottom: 10px; } p { - font-size: .9em; + font-size: .9em; } ul { - font-size: .9em; - list-style: none; + font-size: .9em; + list-style: none; } li { - display: inline; + display: inline; } li:before { - content: "\00BB \0020"; + content: "\00BB \0020"; } div.button { - margin: 0 auto; - width: 120px; - text-align: center; - border: 1px solid #999; - background: #eee; + margin: 0 auto; + width: 120px; + text-align: center; + border: 1px solid #999; + background: #eee; } div.button a { - text-decoration: none; + text-decoration: none; } div.button:hover { - background: #ccc; + background: #ccc; } div#confirmation { - position: absolute; - background: blue; - z-index: 1000; - margin: 10px; - text-align: center; + position: absolute; + background: blue; + z-index: 1000; + margin: 10px; + text-align: center; } div#confirmation div { - margin: 2px; - padding: 20px; - border: 2px solid #999; - background: #eee; + margin: 2px; + padding: 20px; + border: 2px solid #999; + background: #eee; } .gray_on_done { - opacity: ; + opacity: ; } pre { - display: inline; - margin: 0px; - padding: 0px; + display: inline; + margin: 0px; + padding: 0px; } diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index 0fdf5aef..1e608beb 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -222,7 +222,7 @@ #gOrganizeEditForm { float: right; width: 79%; -// height: 100px; + // height: 100px; } #gOrganizeFormThumbs { diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index de4d2413..862f1fc1 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -77,14 +77,14 @@ **********************************************************************/ .gView { - min-width: 974px !important; + min-width: 974px !important; } #gHeader { - background-color: #e8e8e8; - border-bottom: 1px solid #ccc; + background-color: #e8e8e8; + border-bottom: 1px solid #ccc; margin-bottom: 20px; - padding: 0 20px; + padding: 0 20px; } #gContent { @@ -171,7 +171,7 @@ } #gSiteStatus { - margin-bottom: 0; + margin-bottom: 0; } #gContent .gItem { diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index b6e2e1b8..a450356c 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -330,7 +330,7 @@ form p.gError, } form .gError { - color: #f00; + color: #f00; } #gSiteStatus .gError, @@ -368,7 +368,7 @@ form p.gError { form .gError, .gPager .gInfo { - background-color: #fff; + background-color: #fff; } #gAdminMaintenance .gError, @@ -700,7 +700,7 @@ form .gError, } #gAddPhotos .gBreadcrumbs { - font-size: .9em; + font-size: .9em; } /* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -833,14 +833,14 @@ form .gError, } .gDraggable { - cursor: move; + cursor: move; } .gDropTarget { - background-color: #cfdeff; - border: 1px dotted #999; - height: 100px; - margin: 1em 0; + background-color: #cfdeff; + border: 1px dotted #999; + height: 100px; + margin: 1em 0; } /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ @@ -864,7 +864,7 @@ form .gError, } #gDialog li { - padding-left: 0; + padding-left: 0; } #gDialog form input[type="text"], @@ -1015,7 +1015,7 @@ form .gError, /*************** STUFF THAT NEEDS A HOME ****************/ #gProgress h1 { - font-size: 1.1em; + font-size: 1.1em; } .gProgressBar { -- cgit v1.2.3 From 292d216f7c133152cb921db1cbc7a0c4843a977a Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 24 Jun 2009 18:02:36 -0700 Subject: Implement printing support on the photo page. I've used an icon that doesn't quite match the theme temporarily. I'm hoping to have a matching icon soon. --- modules/digibug/helpers/digibug_menu.php | 18 +++++++----------- modules/digibug/js/digibug.js | 4 ++++ themes/default/css/screen.css | 4 ++++ 3 files changed, 15 insertions(+), 11 deletions(-) (limited to 'themes/default/css') diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php index 1ff0f6bf..6c466031 100644 --- a/modules/digibug/helpers/digibug_menu.php +++ b/modules/digibug/helpers/digibug_menu.php @@ -27,17 +27,13 @@ class digibug_menu { } static function photo($menu, $theme) { - } - - static function site($menu, $theme) { $item = $theme->item(); - - if ($item && access::can("edit", $item)) { - $options_menu = $menu->get("options_menu") - ->append(Menu::factory("dialog") - ->id("digibug") - ->label(t("Peform Digibug Processing")) - ->url(url::site("digibug/index/$item->id"))); - } + $csrf = access::csrf_token(); + $menu + ->append(Menu::factory("link") + ->id("digibug") + ->label(t("Print with Digibug")) + ->url(url::site("digibug/print_photo/{$item->id}?csrf={$csrf}")) + ->css_id("gDigibugLink")); } } diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js index e9e8933e..837c8f7f 100644 --- a/modules/digibug/js/digibug.js +++ b/modules/digibug/js/digibug.js @@ -3,6 +3,10 @@ $(document).ready(function() { e.preventDefault(); queue_print(e); }); + $("#gDigibugLink").click(function(e) { + e.preventDefault(); + return queue_print(e); + }); }); function popUp(url, options) { diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index a450356c..8967efdf 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -665,6 +665,10 @@ form .gError, background-image: url('../images/ico-view-comments.png'); } +#gViewMenu #gDigibugLink { + background-image: url('../images/ico-print.png'); +} + /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .gBreadcrumbs { -- cgit v1.2.3 From fae6d753e9107f16024e3de69483551a0bed2b59 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Wed, 24 Jun 2009 23:48:28 -0600 Subject: Group RTL styles together in their own section. --- themes/default/css/screen.css | 115 ++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 72 deletions(-) (limited to 'themes/default/css') diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 8967efdf..0f2d504c 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -12,16 +12,13 @@ * 6) Navigation and menus * 7) Browser hacks * 8) jQuery and jQuery UI + * 9) Right-to-left language styles */ /** ******************************************************************* * 1) Basic HTML elements **********************************************************************/ -.rtl { - direction: rtl; -} - body, html { background-color: #ccc; font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; @@ -92,11 +89,11 @@ a:hover, margin: .3em 1em; } -#gForgotPasswordLink, .rtl #gDialog .gCancel { +#gForgotPasswordLink { float: right; } -#gDialog .gCancel, .rtl #gForgotPasswordLink { +#gDialog .gCancel { float: left; } @@ -115,11 +112,6 @@ th { text-align: left; } -.rtl caption, -.rtl th { - text-align: right; -} - th { font-weight: bold; } @@ -205,10 +197,6 @@ form ul ul li { float: left; } -.rtl form ul ul li { - float: right; -} - input, select, textarea { @@ -224,11 +212,6 @@ input[type="reset"] { float: left; } -.rtl input[type="submit"], -.rtl input[type="reset"] { - float: right; -} - /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */ .gValidationRule { @@ -385,10 +368,6 @@ form .gError, padding: .4em 0; } -.rtl .gShortForm li { - float: right; -} - .gShortForm label { display: none; } @@ -453,21 +432,12 @@ form .gError, margin: -4px 10px 0 0; } -.rtl #gHeader #gLogo { - float: right; -} - #gHeader #gQuickSearchForm { clear: right; float: right; margin: 1em 0; } -.rtl #gHeader #gQuickSearchForm { - clear: left; - float: left; -} - #gHeader #gQuickSearchForm input[type='text'] { width: 17em; } @@ -508,11 +478,6 @@ form .gError, width: 213px; } - -.rtl #gContent #gAlbumGrid .gItem { - float: right; -} - #gContent #gAlbumGrid .gItem h2 { margin: 5px 0; } @@ -618,10 +583,6 @@ form .gError, float: right; } -.rtl #gHeader #gLoginMenu { - float: left; -} - /* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #gSiteMenu { @@ -630,10 +591,6 @@ form .gError, padding: 0 20px 0 0; } -.rtl #gSiteMenu { - float: right; -} - #gSiteMenu ul { margin-bottom: 0; } @@ -685,10 +642,6 @@ form .gError, padding: 10px 6px 10px 16px !important; } -.rtl .gBreadcrumbs li { - float: right; -} - .gBreadcrumbs li.root { background: transparent; } @@ -789,10 +742,6 @@ form .gError, width: 30%; } -.rtl .gPager li { - float: right; -} - .gPager .gInfo { text-align: center; width: 40%; @@ -861,12 +810,6 @@ form .gError, text-align: left; } -.rtl #gDialog { - font-family: inherit; - font-size: inherit; - text-align: right; -} - #gDialog li { padding-left: 0; } @@ -908,10 +851,6 @@ form .gError, float: left; } -.rtl .gButtonSet li { - float: right; -} - .gButtonSet .gButtonLink { margin: 0; } @@ -921,19 +860,11 @@ form .gError, margin-right: .2em; } -.rtl .ui-icon-left .ui-icon { - float: right; -} - .ui-icon-right .ui-icon { float: right; margin-left: .2em; } -.rtl .ui-icon-right .ui-icon { - float: left; -} - .ui-icon-rotate-ccw { background-position: -192px -64px; } @@ -1105,3 +1036,43 @@ form .gError, margin-left: 20px; list-style-type: disc; } + +/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */ + +.rtl { + direction: rtl; +} + +.rtl caption, +.rtl th { + text-align: right; +} + +.rtl #gHeader #gQuickSearchForm, +.rtl #gForgotPasswordLink, +.rtl #gHeader #gLoginMenu, +.rtl .ui-icon-right .ui-icon { + clear: left; + float: left; +} + +.rtl #gDialog .gCancel, +.rtl form ul ul li, +.rtl input[type="submit"], +.rtl input[type="reset"], +.rtl .gShortForm li, +.rtl #gHeader #gLogo, +.rtl #gContent #gAlbumGrid .gItem, +.rtl #gSiteMenu, +.rtl .gBreadcrumbs li, +.rtl .gPager li, +.rtl .gButtonSet li, +.rtl .ui-icon-left .ui-icon { + float: right; +} + +.rtl #gDialog { + font-family: inherit; + font-size: inherit; + text-align: right; +} -- cgit v1.2.3 From ec67300f9628582bf735468c73aec3c01a6eb57f Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Thu, 25 Jun 2009 00:06:59 -0600 Subject: Cleanup pass. Fixed formatting, grouped a few selectors. Removed empty selectors. --- themes/default/css/screen.css | 82 +++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 54 deletions(-) (limited to 'themes/default/css') diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 0f2d504c..c7918fc0 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -28,17 +28,11 @@ p { margin-bottom: 1em; } -strong { - font-weight: bold; -} - em { font-style: oblique; } -/* Headings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -h1, h2, h3, h4, h5 { +h1, h2, h3, h4, h5, strong, th { font-weight: bold; } @@ -50,6 +44,10 @@ h1 { margin-bottom: 1em; } +#gProgress h1 { + font-size: 1.1em; +} + h2 { font-size: 1.4em; } @@ -68,7 +66,8 @@ a, .gMenu a, #gDialog a, .gButtonLink, -.gButtonLink:hover { +.gButtonLink:hover, +.gButtonLink:active { color: #5382BF !important; text-decoration: none; -moz-outline-style: none; @@ -91,6 +90,7 @@ a:hover, #gForgotPasswordLink { float: right; + font-size: .9em; } #gDialog .gCancel { @@ -112,10 +112,6 @@ th { text-align: left; } -th { - font-weight: bold; -} - th, td { border: none; @@ -144,7 +140,9 @@ legend { #gHeader legend, #gSidebar legend, -#gContent #gSearchForm legend { +#gContent #gSearchForm legend, +input[type="hidden"], +.gShortForm label { display: none; } @@ -166,10 +164,6 @@ textarea { color: #333; } -input[type="hidden"] { - display: none; -} - textarea { width: 100%; height: 12em; @@ -368,10 +362,6 @@ form .gError, padding: .4em 0; } -.gShortForm label { - display: none; -} - .gShortForm input[type="text"] { color: #666; padding: .3em .6em; @@ -451,14 +441,6 @@ form .gError, padding-left: 1em; } -/* Album/Photo information ~~~~~~~~~~~~~~~ */ - -#gContent #gInfo { -} - -#gContent #gInfo .gDescription { -} - /* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */ #gContent #gAlbumGrid { @@ -805,8 +787,6 @@ form .gError, } #gDialog { - font-family: inherit; - font-size: inherit; text-align: left; } @@ -884,6 +864,7 @@ form .gError, } /* Server Add */ + .gCheckboxTree input { display: inline; } @@ -922,7 +903,7 @@ form .gError, font-size: 1em; padding: 0; margin: 0; - border-top-width: 0px; + border-top-width: 0; } #gServerAdd p { @@ -933,10 +914,10 @@ form .gError, padding: 10px 6px 10px 16px; } - /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#gPermissions .gDenied, #gPermissions .gAllowed { +#gPermissions .gDenied, +#gPermissions .gAllowed { text-align: center; vertical-align: middle; } @@ -947,22 +928,18 @@ form .gError, background-color: #cfc; } - /*************** STUFF THAT NEEDS A HOME ****************/ -#gProgress h1 { - font-size: 1.1em; -} .gProgressBar { height: 1em; width: 100%; - margin-top: 0.5em; + margin-top: .5em; display: inline-block; } #gAddPhotos p { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } #gAddPhotosCanvas { @@ -1026,13 +1003,15 @@ form .gError, margin-bottom: 10px; } -#gAdminG2ImportNotes p, #gAdminG2ImportDetails .gInfo p { - padding: 0px; - margin: 0px; +#gAdminG2ImportNotes p, +#gAdminG2ImportDetails .gInfo p { + padding: 0; + margin: 0; } -#gAdminG2ImportNotes ul li, #gAdminG2Import .gInfo ul li { - padding-left: 0px; +#gAdminG2ImportNotes ul li, +#gAdminG2Import .gInfo ul li { + padding-left: 0; margin-left: 20px; list-style-type: disc; } @@ -1044,7 +1023,8 @@ form .gError, } .rtl caption, -.rtl th { +.rtl th, +.rtl #gDialog { text-align: right; } @@ -1069,10 +1049,4 @@ form .gError, .rtl .gButtonSet li, .rtl .ui-icon-left .ui-icon { float: right; -} - -.rtl #gDialog { - font-family: inherit; - font-size: inherit; - text-align: right; -} +} \ No newline at end of file -- cgit v1.2.3 From d9e4ad79bbebb3f439df4403c668271c86c19935 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 25 Jun 2009 08:14:34 -0700 Subject: 1) Move the digibug css in the default and admin_default themes 2) Remove most of the marketing cruft on the admin pages 3) Change the name of the admin settings to just Digibug 4) Remove the "switch on mouseover" approach --- modules/digibug/css/digibug.css | 91 -------------------------- modules/digibug/css/logo.png | Bin 17296 -> 0 bytes modules/digibug/helpers/digibug_menu.php | 2 +- modules/digibug/helpers/digibug_theme.php | 10 +-- modules/digibug/views/admin_digibug.html.php | 33 ++-------- themes/admin_default/css/screen.css | 93 +++++++++++++++++++++++++++ themes/admin_default/images/digibug_logo.png | Bin 0 -> 17296 bytes themes/default/css/screen.css | 25 ++++--- 8 files changed, 115 insertions(+), 139 deletions(-) delete mode 100644 modules/digibug/css/digibug.css delete mode 100644 modules/digibug/css/logo.png create mode 100644 themes/admin_default/images/digibug_logo.png (limited to 'themes/default/css') diff --git a/modules/digibug/css/digibug.css b/modules/digibug/css/digibug.css deleted file mode 100644 index a09e4551..00000000 --- a/modules/digibug/css/digibug.css +++ /dev/null @@ -1,91 +0,0 @@ -.gAdminDigibugIntro { - background-image: url(logo.png); - background-repeat: no-repeat; - padding-bottom: 20px; - width: 820px; -} - -.gAdminDigibugIntro p { - font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif; - font-size: 1.3em; - font-weight: bold; - padding-left: 110px; - padding-top: 15px; -} - -.gDigibugTab { - width: 820px; - height: 420px; -} - -.gDigibugTab .gDigibugTitle { - font-family: Georgia; - font-size: 20px; - font-weight: bold; - padding-bottom: 10px; -} - -.gDigibugTab .gDigibugText { - font-size: 12px; - font-weight: bold; - line-height: 17px; - padding-bottom: 15px; -} - -.gDigibugListItems ul { - list-style-type: disc; - padding-left: 20px; - font-size: 12px; - font-weight: bold; - line-height: 15px; -} - -.gDigibugListItems ul li{ - padding-top: 10px; -} - -.gDigibugRounded { - background-color:#5C9CCC; - color: white; - width: 308px; - height: 45px; - text-align: center; - line-height: 15px; - margin-top: 10px; - font-weight: bold; - font-size: 12px; - margin-left: 60px; - margin-right: -50px; - margin-left: 20px; - margin-right: 0px; -} - -.gDigibugRounded a { - color: white !important; - font-weight: bold; - text-decoration: underline; -} - -.gDigibugSignIn { - width: 115px; - float: left; -} - -.gDigibugSignIn a { - color: black; - font-size: 16px; - font-weight: bold; - text-decoration: underline; -} - -.gDigibugAdvancedForm { - float: left; - padding-left: 30px; - width: 180px; -} - -.gDigibugPrintButton { - float: left; -} - - diff --git a/modules/digibug/css/logo.png b/modules/digibug/css/logo.png deleted file mode 100644 index 5eac2c7d..00000000 Binary files a/modules/digibug/css/logo.png and /dev/null differ diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php index 6c466031..d9baf59c 100644 --- a/modules/digibug/helpers/digibug_menu.php +++ b/modules/digibug/helpers/digibug_menu.php @@ -22,7 +22,7 @@ class digibug_menu { $menu->get("settings_menu") ->append(Menu::factory("link") ->id("digibug_menu") - ->label(t("Digibug Administration")) + ->label(t("Digibug")) ->url(url::site("admin/digibug"))); } diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php index e52fcc7f..bd269256 100644 --- a/modules/digibug/helpers/digibug_theme.php +++ b/modules/digibug/helpers/digibug_theme.php @@ -19,15 +19,7 @@ */ class digibug_theme_Core { static function head($theme) { - $head[] = ""; - $head[] = html::script("modules/digibug/js/digibug.js");; - return implode("\n", $head); - } - - static function admin_head($theme) { - return ""; + return html::script("modules/digibug/js/digibug.js"); } static function thumb_bottom($theme, $child) { diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php index 33ce5f83..205d8b7a 100644 --- a/modules/digibug/views/admin_digibug.html.php +++ b/modules/digibug/views/admin_digibug.html.php @@ -1,16 +1,13 @@
-

- +

@@ -19,20 +16,8 @@
    • -
    - -
    - -
    - -
    -
    -
      -
      • -
      • -
      • -
    +

    @@ -45,16 +30,8 @@
    -
    - -
    - -
    -
    - -
    - +
    @@ -62,7 +39,7 @@
    -
    +
    diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index 862f1fc1..1653f115 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -9,6 +9,8 @@ * 4) Content blocks in specific layout containers * 5) Browser hacks * 6) jQuery and jQuery UI + * 7) Server Add + * 8) Digibug Print Administration */ /** ******************************************************************* @@ -436,3 +438,94 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { width: 150px; overflow: hidden; } + +/** ******************************************************************* + * 8) Digibug Print Administration + **********************************************************************/ +.gAdminDigibugIntro { + background-image: url(../images/digibug_logo.png); + background-repeat: no-repeat; + padding-bottom: 20px; + width: 820px; +} + +.gAdminDigibugIntro p { + font-family: Trebuchet MS,Arial,Verdana,Helvetica,sans-serif; + font-size: 1.3em; + font-weight: bold; + padding-left: 5px; + padding-top: 15px; + text-indent: 110px; +} + +.gDigibugTab { + width: 820px; + height: 420px; +} + +.gDigibugTab .gDigibugTitle { + font-family: Georgia; + font-size: 20px; + font-weight: bold; + padding-bottom: 10px; +} + +.gDigibugTab .gDigibugText { + font-size: 12px; + font-weight: bold; + line-height: 17px; + padding-bottom: 15px; +} + +.gDigibugListItems ul { + list-style-type: disc; + padding-left: 20px; + font-size: 12px; + font-weight: bold; + line-height: 15px; +} + +.gDigibugListItems ul li{ + padding-top: 10px; +} + +.gDigibugRounded { + background-color:#5C9CCC; + color: white; + width: 308px; + height: 45px; + text-align: center; + line-height: 15px; + margin-top: 10px; + font-weight: bold; + font-size: 12px; + margin-left: 60px; + margin-right: -50px; + margin-left: 20px; + margin-right: 0px; +} + +.gDigibugRounded a { + color: white !important; + font-weight: bold; + text-decoration: underline; +} + +.gDigibugSignIn { + width: 115px; + float: left; +} + +.gDigibugSignIn a { + color: black; + font-size: 16px; + font-weight: bold; + text-decoration: underline; +} + +.gDigibugAdvancedForm { + float: left; + padding-left: 30px; + width: 180px; +} + diff --git a/themes/admin_default/images/digibug_logo.png b/themes/admin_default/images/digibug_logo.png new file mode 100644 index 00000000..5eac2c7d Binary files /dev/null and b/themes/admin_default/images/digibug_logo.png differ diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index c7918fc0..671b259d 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -4,15 +4,16 @@ * @requires YUI reset, font, grids CSS * * Sheet organization: - * 1) Basic HTML elements - * 2) Reusable classes - * 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 + * 1) Basic HTML elements + * 2) Reusable classes + * 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 + * 10) Digibug Print */ /** ******************************************************************* @@ -1049,4 +1050,8 @@ form .gError, .rtl .gButtonSet li, .rtl .ui-icon-left .ui-icon { float: right; -} \ No newline at end of file +} + +/** ******************************************************************* + * 10) Digibug Print + **********************************************************************/ -- cgit v1.2.3 From 627b5e144caefb7ff48224a4bdc8faae2debdbd7 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 25 Jun 2009 08:53:04 -0700 Subject: This change to the default/css/screen.css file was overlooked --- themes/default/css/screen.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'themes/default/css') diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 671b259d..7075494d 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -1055,3 +1055,6 @@ form .gError, /** ******************************************************************* * 10) Digibug Print **********************************************************************/ +.gDigibugPrintButton { + float: left; +} -- cgit v1.2.3 From 6c828a0dd61984da84fa7957f4ea40098dd67ec5 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 27 Jun 2009 16:30:16 -0700 Subject: We no longer need the digibug section now that we've got a menu for thumbnail actions. --- themes/default/css/screen.css | 7 ------- 1 file changed, 7 deletions(-) (limited to 'themes/default/css') diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 7075494d..d3c4de6f 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -1051,10 +1051,3 @@ form .gError, .rtl .ui-icon-left .ui-icon { float: right; } - -/** ******************************************************************* - * 10) Digibug Print - **********************************************************************/ -.gDigibugPrintButton { - float: left; -} -- cgit v1.2.3 From 2b804ebdcea2127ca481ae3fb25a33a3bc5a78c3 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 28 Jun 2009 17:53:20 -0600 Subject: Convert info module's block to use a list instead of a table. Addresses request in ticket #441. --- modules/info/views/info_block.html.php | 75 +++++++++++++++------------------- themes/default/css/screen.css | 4 ++ 2 files changed, 37 insertions(+), 42 deletions(-) (limited to 'themes/default/css') diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index 9f9ec5df..3a96937c 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -1,44 +1,35 @@ - - - - - - - description): ?> - - - - +
      +
    • + + title) ?> +
      • + description): ?> +
    • + + description) ?> +
      • + + id != 1): ?> +
    • + + name) ?> +
      • + + captured): ?> +
    • + + captured)?> +
      • + + owner): ?> +
    • + + owner->url): ?> + owner->full_name) ?> + + owner->name) ?> - id != 1): ?> -
    - - - - - id != 1): ?> - parent(); ?> - - - - - - captured): ?> - - - - - - owner): ?> - - - - - - -
    title) ?>
    description) ?>
    name) ?>
    - id}?show=$item->id") ?>"> - title) ?> - -
    captured) ?>
    owner->name) ?>
    + + + \ No newline at end of file diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index d3c4de6f..e37de70e 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -57,6 +57,10 @@ h2 { font-size: 1.2em; } +#gSidebar .gBlock li { + margin-bottom: .6em; +} + h3 { font-size: 1.2em; } -- cgit v1.2.3