diff options
| -rw-r--r-- | modules/gallery/helpers/gallery.php | 21 | ||||
| -rw-r--r-- | modules/gallery/views/admin_maintenance_task.html.php | 2 | ||||
| -rw-r--r-- | modules/organize/helpers/organize_event.php | 9 | ||||
| -rw-r--r-- | themes/admin_default/css/admin_screen.css | 7 | ||||
| -rw-r--r-- | themes/admin_default/css/screen.css | 9 | ||||
| -rw-r--r-- | themes/default/css/screen.css | 9 |
6 files changed, 33 insertions, 24 deletions
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php index 035ed1da..adfc7fd2 100644 --- a/modules/gallery/helpers/gallery.php +++ b/modules/gallery/helpers/gallery.php @@ -268,13 +268,16 @@ class gallery_Core { } else { $disabledState = " "; } + if ($item->is_photo()) { + $options_menu + ->append(Menu::factory("ajax_link") + ->id("make_album_cover") + ->label($cover_title) + ->css_class("ui-icon-star") + ->ajax_handler("function(data) { window.location.reload() }") + ->url(url::site("quick/make_album_cover/$item->id?csrf=$csrf"))); + } $options_menu - ->append(Menu::factory("ajax_link") - ->id("make_album_cover") - ->label($cover_title) - ->css_class("ui-icon-star") - ->ajax_handler("function(data) { window.location.reload() }") - ->url(url::site("quick/make_album_cover/$item->id?csrf=$csrf"))) ->append(Menu::factory("dialog") ->id("delete") ->label($delete_title) @@ -288,17 +291,17 @@ class gallery_Core { ->append(Menu::factory("dialog") ->id("add_item") ->label(t("Add a photo")) - ->css_class("add_item") + ->css_class("ui-icon-plus") ->url(url::site("simple_uploader/app/$item->id"))) ->append(Menu::factory("dialog") ->id("add_album") ->label(t("Add an album")) - ->css_class("add_album") + ->css_class("ui-icon-note") ->url(url::site("form/add/albums/$item->id?type=album"))) ->append(Menu::factory("dialog") ->id("edit_permissions") ->label(t("Edit permissions")) - ->css_class("permissions") + ->css_class("ui-icon-key") ->url(url::site("permissions/browse/$item->id"))); } } diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php index fc0e0af5..ddd5bd17 100644 --- a/modules/gallery/views/admin_maintenance_task.html.php +++ b/modules/gallery/views/admin_maintenance_task.html.php @@ -57,7 +57,7 @@ <div id="gStatus"> <?= t("Starting up...") ?> </div> - <div> + <div class="txtright"> <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button> <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button> </div> diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php index 79077db3..d6043116 100644 --- a/modules/organize/helpers/organize_event.php +++ b/modules/organize/helpers/organize_event.php @@ -24,10 +24,10 @@ class organize_event_Core { if ($item && $item->is_album() && access::can("edit", $item)) { $menu->get("options_menu") ->append(Menu::factory("dialog") - ->id("organize") - ->label(t("Organize Album")) - ->css_id("gOrganizeLink") - ->url(url::site("organize/dialog/{$item->id}"))); + ->id("organize") + ->label(t("Organize Album")) + ->css_id("gOrganizeLink") + ->url(url::site("organize/dialog/{$item->id}"))); } } @@ -38,6 +38,7 @@ class organize_event_Core { ->id("organize") ->label(t("Organize album")) ->css_id("gOrganizeLink") + ->css_class("ui-icon-folder-open") ->url(url::site("organize/dialog/{$item->id}"))); } } diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css index fd1ed02e..a8c16ae5 100644 --- a/themes/admin_default/css/admin_screen.css +++ b/themes/admin_default/css/admin_screen.css @@ -391,13 +391,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { .rtl #gRenameTagForm a, #gRenameTagForm span { float: right; } -#gProgress button { - float: right; - margin-top: 1em; -} -.rtl #gProgress button { - float: left; -} #gTaskLogDialog h1 { font-size: 1.1em; diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index 21b2b31c..eb8f9224 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -71,7 +71,10 @@ a, #gDialog a, .gButtonLink, .gButtonLink:hover, -.gButtonLink:active { +.gButtonLink:active, +a.ui-state-hover, +input.ui-state-hover, +button.ui-state-hover { color: #5382BF !important; text-decoration: none; -moz-outline-style: none; @@ -1055,6 +1058,10 @@ table .gSuccess { text-align: right; } +.rtl .txtright { + text-align: left; +} + .rtl #gHeader #gQuickSearchForm, .rtl #gForgotPasswordLink, .rtl #gHeader #gLoginMenu, diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 7cf4cfbe..96be8996 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -71,8 +71,12 @@ a, #gDialog a, .gButtonLink, .gButtonLink:hover, -.gButtonLink:active { - color: #5382BF !important; +.gButtonLink:active, +a.ui-state-hover, +input.ui-state-hover, +button.ui-state-hover { + color: #5382bf !important; + cursor: pointer !important; text-decoration: none; -moz-outline-style: none; } @@ -371,6 +375,7 @@ form .gError, background-color: #e8e8e8; border-bottom: 1px solid #ccc; font-size: .8em; + min-height: 5em; padding: 1em 20px; position: relative; } |