diff options
| -rw-r--r-- | lib/gallery.common.css | 62 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_theme.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/module.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/login.html.php | 4 | ||||
| -rw-r--r-- | modules/organize/css/organize.css | 2 | ||||
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 2 | ||||
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 50 | ||||
| -rw-r--r-- | modules/user/module.info | 5 | ||||
| -rw-r--r-- | themes/admin_wind/css/fix-ie.css | 7 | ||||
| -rw-r--r-- | themes/admin_wind/css/screen.css | 79 | ||||
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 4 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 33 |
12 files changed, 104 insertions, 148 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 93dd56e8..c5adc3ee 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -400,16 +400,11 @@ ul.sf-menu li li li.sfHover ul { left: 12em; } -/* jQuery UI ThemeRoller buttons */ +/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ -/* Rotate icon, themerollower only provides one of these */ - -.ui-icon-rotate-ccw { - background-position: -192px -64px; -} - -.ui-icon-rotate-cw { - background-position: -208px -64px; +.ui-widget-overlay { + background: #000; + opacity: .7; } /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -429,6 +424,40 @@ ul.sf-menu li li li.sfHover ul { -moz-outline-style: none; } +/* jQuery UI ThemeRoller buttons ~~~~~~~~~ */ + +.g-buttonset { + padding-left: 1px; +} + +.g-buttonset li { + float: left; +} + +.g-buttonset .g-button { + margin: 0; +} + +.ui-icon-left .ui-icon { + float: left; + margin-right: .2em; +} + +.ui-icon-right .ui-icon { + float: right; + margin-left: .2em; +} + +/* Rotate icon, ThemeRoller only provides one of these */ + +.ui-icon-rotate-ccw { + background-position: -192px -64px; +} + +.ui-icon-rotate-cw { + background-position: -208px -64px; +} + .g-progress-bar { height: 1em; width: 100%; @@ -541,7 +570,11 @@ div#g-action-status { .g-inline li { float: left; - margin-right: .4em; + margin-left: 1em; +} + +.g-inline li.g-first { + margin-left: 0; } /* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */ @@ -549,3 +582,12 @@ div#g-action-status { .rtl .g-short-form li { float: right; } + +.rtl .g-inline li { + float: right; + margin-right: 1em; +} + +.rtl .g-inline li.g-first { + margin-right: 0; +} diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index 49a458b7..3fcaca67 100644 --- a/modules/gallery/helpers/gallery_theme.php +++ b/modules/gallery/helpers/gallery_theme.php @@ -102,7 +102,7 @@ class gallery_theme_Core { } static function credits() { - return "<li class=\"first\">" . + return "<li class=\"g-first\">" . t(module::get_var("gallery", "credits"), array("url" => "http://gallery.menalto.com", "version" => gallery::VERSION)) . "</li>"; diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php index 27bc3784..da334370 100644 --- a/modules/gallery/helpers/module.php +++ b/modules/gallery/helpers/module.php @@ -98,7 +98,7 @@ class module_Core { $m->active = self::is_active($module_name); $m->code_version = $m->version; $m->version = self::get_version($module_name); - $m->locked = false; + $m->locked = !empty($m->no_module_admin); } // Lock certain modules diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php index ae709c7c..0e0d9039 100644 --- a/modules/gallery/views/login.html.php +++ b/modules/gallery/views/login.html.php @@ -1,13 +1,13 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <ul id="g-login-menu" class="g-inline"> <? if ($user->guest): ?> - <li class="first"> + <li class="g-first"> <a href="<?= url::site("login/ajax") ?>" title="<?= t("Login to Gallery")->for_html_attr() ?>" id="g-login-link" class="g-dialog-link"><?= t("Login") ?></a> </li> <? else: ?> - <li class="first"> + <li class="g-first"> <? if (identity::is_writable()): ?> <?= t('Logged in as %name', array('name' => html::mark_clean( '<a href="' . url::site("form/edit/users/{$user->id}") . diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index afa89229..89c6c027 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -14,7 +14,7 @@ width: 75%; } -#g-organize .yui-gf .first { +#g-organize .yui-gf .g-first { width: 25%; } diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 7dcb01d9..cf8e9004 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -9,7 +9,7 @@ <h1 style="display:none"><?= t("Organize %name", array("name" => html::purify($album->title))) ?></h1> <div id="bd"> <div class="yui-gf"> - <div class="yui-u first"> + <div class="yui-u g-first"> <h3><?= t("Albums") ?></h3> </div> <div id="g-action-status" class="g-message-block yui-u"> diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 3e333817..10d7921a 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -28,34 +28,32 @@ </caption> <tr> <td> - <? foreach ($tags as $i => $tag): ?> - <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?> + <? foreach ($tags as $i => $tag): ?> + <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?> - <? if ($i == 0): /* first letter */ ?> - <strong><?= html::clean($current_letter) ?></strong> - <ul> - <? elseif ($last_letter != $current_letter): /* new letter */ ?> - <? if ($column_tag_count > $tags_per_column): /* new column */ ?> - </td> - <td> - <? $column_tag_count = 0 ?> - <? endif ?> - </ul> - <strong><?= html::clean($current_letter) ?></strong> - <ul> + <? if ($i == 0): /* first letter */ ?> + <strong><?= html::clean($current_letter) ?></strong> + <ul> + <? elseif ($last_letter != $current_letter): /* new letter */ ?> + </ul> + <? if ($column_tag_count > $tags_per_column): /* new column */ ?> + <? $column_tag_count = 0 ?> + </td> + <td> <? endif ?> - - <li> - <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span> - <span class="g-understate">(<?= $tag->count ?>)</span> - <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" - class="g-dialog-link g-delete-link g-button"> - <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a> - </li> - - <? $column_tag_count++ ?> - <? $last_letter = $current_letter ?> - <? endforeach /* $tags */ ?> + <strong><?= html::clean($current_letter) ?></strong> + <ul> + <? endif ?> + <li> + <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span> + <span class="g-understate">(<?= $tag->count ?>)</span> + <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" + class="g-dialog-link g-delete-link g-button"> + <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a> + </li> + <? $column_tag_count++ ?> + <? $last_letter = $current_letter ?> + <? endforeach ?> </ul> </td> </tr> diff --git a/modules/user/module.info b/modules/user/module.info index 8a9af407..36a2179a 100644 --- a/modules/user/module.info +++ b/modules/user/module.info @@ -1,3 +1,6 @@ name = "Users and Groups" -description = "Provides user and group management" +description = "Gallery 3 user and group management" version = 1 + +; Don't show this module on the module administration screen +no_module_admin = 1 diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css index 99fc6241..5475cb79 100644 --- a/themes/admin_wind/css/fix-ie.css +++ b/themes/admin_wind/css/fix-ie.css @@ -9,3 +9,10 @@ .g-unavailable:hover { filter: alpha(opacity=100); } + +tr.g-error td, +tr.g-info td, +tr.g-success td, +tr.g-warning td { + background: none !important; +} diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 13174df9..4ae0c218 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -13,6 +13,7 @@ * 7) Right-to-left language styles * * @todo Consider moving g-panel to gallery.common + * @todo Review g-actions along with g-buttonset-vertical */ /** ******************************************************************* @@ -40,11 +41,7 @@ h1 { font-size: 1.7em; } -#g-search-results h1 { - margin-bottom: 1em; -} - -#g-progress h1 { +#g-dialog h1 { font-size: 1.1em; } @@ -259,16 +256,6 @@ th { text-decoration: none; } -#g-header #g-quick-search-form { - clear: right; - float: right; - margin: 1em 0; -} - -#g-header #g-quick-search-form input[type='text'] { - width: 17em; -} - #g-content .g-block h2 { background-color: transparent; padding-left: 0; @@ -278,13 +265,6 @@ th { padding-left: 1em; } -/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-content #g-search-results { - margin-top: 1em; - padding-top: 1em; -} - .g-block .ui-dialog-titlebar { margin: -1em -1em 0; } @@ -293,6 +273,8 @@ th { background: none; } +/* Photo stream ~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + #g-photo-stream { background-color: #e8e8e8; } @@ -329,6 +311,8 @@ th { width: 90px; } +/* Graphics settings ~~~~~~~~~~~~~~~~~~~~~ */ + #g-admin-graphics .g-available .g-block { clear: none; float: left; @@ -336,6 +320,8 @@ th { width: 30%; } +/* Appearance settings ~~~~~~~~~~~~~~~~~~~ */ + #g-site-theme, #g-admin-theme { float: left; @@ -380,15 +366,6 @@ th { * 5) Navigation and menus *********************************************************************/ -/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-header #g-login-menu { - color: #999; - float: right; - margin: 0; - padding: 5px 0; -} - /* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-site-admin-menu { @@ -447,48 +424,8 @@ th { padding: .2em .4em; } -.ui-widget-overlay { - background: #000; - opacity: .7; -} - -/* jQuery UI ThemeRoller buttons */ - -.g-buttonset { - padding-left: 1px; -} - -.g-buttonset li { - float: left; -} - -.g-buttonset .g-button { - margin: 0; -} - -.ui-icon-left .ui-icon { - float: left; - margin-right: .2em; -} - -.ui-icon-right .ui-icon { - float: right; - margin-left: .2em; -} - /*************** STUFF THAT NEEDS A HOME ****************/ -.g-progress-bar { - height: 1em; - width: 100%; - margin-top: .5em; - display: inline-block; -} - -#g-task-log-dialog h1 { - font-size: 1.1em; -} - .g-task-log { border: 1pt solid; font-size: .9em; diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index bbdde734..d88cabf6 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -43,8 +43,8 @@ <?= $theme->site_status() ?> <div id="g-header"> <?= $theme->admin_header_top() ?> - <ul id="g-login-menu" class="g-inline"> - <li class="first"><?= html::anchor(item::root()->abs_url(), "← ".t("Back to the Gallery")) ?></li> + <ul id="g-login-menu" class="g-inline g-right"> + <li class="g-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> <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>"> diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 6e370a7f..15ce4173 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -40,7 +40,7 @@ h1 { font-size: 1.7em; } -#g-progress h1 { +#g-dialog h1 { font-size: 1.1em; } @@ -412,37 +412,6 @@ td { background-color: #dfe9ff; } -/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ - -.ui-widget-overlay { - background: #000; - opacity: .7; -} - -/* jQuery UI ThemeRoller buttons */ - -.g-buttonset { - padding-left: 1px; -} - -.g-buttonset li { - float: left; -} - -.g-buttonset .g-button { - margin: 0; -} - -.ui-icon-left .ui-icon { - float: left; - margin-right: .2em; -} - -.ui-icon-right .ui-icon { - float: right; - margin-left: .2em; -} - /** ******************************************************************* * 6) Right to left styles *********************************************************************/ |