diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_wind/css/screen.css | 20 | ||||
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 8 | ||||
| -rw-r--r-- | themes/wind/css/fix-ie.css | 10 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 28 | ||||
| -rwxr-xr-x[-rw-r--r--] | themes/wind/thumbnail.png | bin | 26946 -> 26927 bytes | |||
| -rw-r--r-- | themes/wind/views/album.html.php | 2 | ||||
| -rw-r--r-- | themes/wind/views/page.html.php | 17 |
7 files changed, 52 insertions, 33 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 2ea60402..81b1a896 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -399,26 +399,6 @@ th { background-color: #FFF; } -/* Theme options ~~~~~~~~~~~~~~~~~~~~~~~~ */ -#g-theme-options-form { - border: 1px solid #a6c9e2; -} -#g-theme-options-form-tabs { - border: none !important; -} -#g-theme-options-form fieldset { - border: none; -} - -.ui-tabs .ui-tabs-nav li a { - padding: 0 1em; -} - -.ui-tabs .ui-tabs-nav li a.g-error { - background: none no-repeat scroll 0 0 transparent; - color: #FF0000 !important; -} - /* Language options ~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-share-translations-form fieldset { border: 0px; diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index f9ef18c7..c4b51f41 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -11,7 +11,7 @@ <?= t("Admin dashboard") ?> <? endif ?> </title> - <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" /> + <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" /> <?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("themeroller/ui.base.css") ?> @@ -77,9 +77,11 @@ </div> <div id="g-footer" class="g-inline ui-helper-clearfix"> <?= $theme->admin_footer() ?> - <div> + <? if (module::get_var("gallery", "show_credits")): ?> + <ul id="g-credits" class="g-inline"> <?= $theme->admin_credits() ?> - </div> + </ul> + <? endif ?> </div> </div> <?= $theme->admin_page_bottom() ?> diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css index ac100da4..0633ff07 100644 --- a/themes/wind/css/fix-ie.css +++ b/themes/wind/css/fix-ie.css @@ -1,5 +1,5 @@ /** - * Fix display in IE 6, 7 + * Fix display in IE 6, 7, and 8 */ #g-banner { @@ -26,11 +26,17 @@ input.submit { display: inline !important; } -.g-short-form input[type='submit'] { +.g-short-form input.text, +.g-short-form input.submit { + font-size: 1em; line-height: 1em; padding: .38em .3em; } +#g-search-form input#q { + width: 300px; +} + #g-add-tag-form input.textbox { width: 110px !important; } diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 44582a92..2f91deaa 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -319,6 +319,32 @@ td { background-color: #fff; } +/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#g-edit-permissions-form td { + background-image: none; +} + +#g-edit-permissions-form fieldset { + border: 1px solid #ccc; +} + +#g-permissions .g-denied { + background-color: #fcc; +} + +#g-permissions .g-allowed { + background-color: #cfc; +} + +#g-permissions .g-breadcrumbs a { + border: 1px solid #fff; +} + +#g-permissions .g-active a { + border: 1px solid #ddd; + background: #eee; +} + /** ******************************************************************* * 5) Navigation and menus *********************************************************************/ @@ -465,4 +491,4 @@ td { .rtl #g-footer #g-credits li { padding-left: 1.2em !important; padding-right: 0; -}
\ No newline at end of file +} diff --git a/themes/wind/thumbnail.png b/themes/wind/thumbnail.png Binary files differindex c0594db2..2c9ee43d 100644..100755 --- a/themes/wind/thumbnail.png +++ b/themes/wind/thumbnail.png diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php index de196be0..1a56af67 100644 --- a/themes/wind/views/album.html.php +++ b/themes/wind/views/album.html.php @@ -16,7 +16,9 @@ <li id="g-item-id-<?= $child->id ?>" class="g-item <?= $item_class ?>"> <?= $theme->thumb_top($child) ?> <a href="<?= $child->url() ?>"> + <? if ($child->has_thumb()): ?> <?= $child->thumb_img(array("class" => "g-thumbnail")) ?> + <? endif ?> </a> <?= $theme->thumb_bottom($child) ?> <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 9f94b04f..4938ed60 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -23,7 +23,7 @@ <? endif ?> <? endif ?> </title> - <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" /> + <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" /> <?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("superfish/css/superfish.css") ?> <?= $theme->css("themeroller/ui.base.css") ?> @@ -101,19 +101,22 @@ <? $i = 0 ?> <? foreach ($parents as $parent): ?> <li<? if ($i == 0) print " class=\"g-first\"" ?>> - <!-- Adding ?show=<id> causes Gallery3 to display the page - containing that photo. For now, we just do it for - the immediate parent so that when you go back up a - level you're on the right page. --> + <? // Adding ?show=<id> causes Gallery3 to display the page + // containing that photo. For now, we just do it for + // the immediate parent so that when you go back up a + // level you're on the right page. ?> <a href="<?= $parent->url($parent == $theme->item()->parent() ? "show={$theme->item()->id}" : null) ?>"> - <?= html::purify(text::limit_chars($parent->title, 15)) ?> + <!-- limit the title length to something reasonable (defaults to 15) --> + <?= html::purify(text::limit_chars($parent->title, + module::get_var("gallery", "visible_title_length"))) ?> </a> </li> <? $i++ ?> <? endforeach ?> <li class="g-active<? if ($i == 0) print " g-first" ?>"> - <?= html::purify(text::limit_chars($theme->item()->title, 15)) ?> + <?= html::purify(text::limit_chars($theme->item()->title, + module::get_var("gallery", "visible_title_length"))) ?> </li> </ul> <? endif ?> |
