From 3e6ba7acc3291f2268cbe9c9bef0a492b557babb Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 4 Oct 2009 00:27:22 -0600 Subject: Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. --- modules/gallery/views/admin_theme_options.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/gallery/views/admin_theme_options.html.php') diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php index 724e6438..ed091d4b 100644 --- a/modules/gallery/views/admin_theme_options.html.php +++ b/modules/gallery/views/admin_theme_options.html.php @@ -1,5 +1,5 @@ -
+

-- cgit v1.2.3 From d581bbbd1eaeb242b7279e5a6d75f015dd5a5e6f Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 4 Oct 2009 15:53:00 -0600 Subject: Renamed more CSS selectors from gName to g-name. --- lib/gallery.common.js | 2 +- modules/comment/views/admin_comments.html.php | 4 ++-- modules/gallery/tests/selenium/Add_Comment.html | 2 +- modules/gallery/tests/xss_data.txt | 2 +- modules/gallery/views/admin_theme_options.html.php | 2 +- modules/gallery/views/welcome_message_loader.html.php | 4 ++-- modules/organize/css/organize.css | 14 +++++++------- modules/organize/js/organize.js | 14 +++++++------- modules/organize/views/organize_dialog.html.php | 12 ++++++------ modules/server_add/controllers/admin_server_add.php | 2 +- modules/server_add/js/server_add.js | 2 +- modules/server_add/views/server_add_tree_dialog.html.php | 2 +- modules/user/helpers/user_block.php | 2 +- modules/user/views/login.html.php | 2 +- themes/admin_wind/views/admin.html.php | 2 +- themes/wind/views/album.html.php | 4 ++-- themes/wind/views/dynamic.html.php | 6 +++--- themes/wind/views/photo.html.php | 4 ++-- 18 files changed, 41 insertions(+), 41 deletions(-) (limited to 'modules/gallery/views/admin_theme_options.html.php') diff --git a/lib/gallery.common.js b/lib/gallery.common.js index f2de74ad..4ac6de70 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -89,7 +89,7 @@ */ $.fn.gallery_get_photo = function() { var photo = $(this).find("img").filter(function() { - return this.id.match(/g-photoId-\d+/); + return this.id.match(/g-photo-id-\d+/); }); return photo; }; diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 0e8dd525..62c64d12 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -90,7 +90,7 @@
- +
@@ -192,7 +192,7 @@
-
+
diff --git a/modules/gallery/tests/selenium/Add_Comment.html b/modules/gallery/tests/selenium/Add_Comment.html index dff653da..054e7597 100644 --- a/modules/gallery/tests/selenium/Add_Comment.html +++ b/modules/gallery/tests/selenium/Add_Comment.html @@ -18,7 +18,7 @@ clickAndWait - g-photoId-2 + g-photo-id-2 diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index c8ba3770..eaa8c99c 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -344,4 +344,4 @@ themes/wind/views/photo.html.php 8 DIRTY_JS $theme themes/wind/views/photo.html.php 21 DIRTY_JS $previous_item->url() themes/wind/views/photo.html.php 31 DIRTY_JS $next_item->url() themes/wind/views/photo.html.php 43 DIRTY_JS $item->file_url() -themes/wind/views/photo.html.php 45 DIRTY $item->resize_img(array("id"=>"g-photoId-{$item->id}","class"=>"g-resize")) +themes/wind/views/photo.html.php 45 DIRTY $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize")) diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php index ed091d4b..e09be728 100644 --- a/modules/gallery/views/admin_theme_options.html.php +++ b/modules/gallery/views/admin_theme_options.html.php @@ -1,5 +1,5 @@ -
+

diff --git a/modules/gallery/views/welcome_message_loader.html.php b/modules/gallery/views/welcome_message_loader.html.php index 818e2072..d1ff2f3f 100644 --- a/modules/gallery/views/welcome_message_loader.html.php +++ b/modules/gallery/views/welcome_message_loader.html.php @@ -1,7 +1,7 @@ -for_html_attr() ?>" href=""/> diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css index fbf3c383..afa89229 100644 --- a/modules/organize/css/organize.css +++ b/modules/organize/css/organize.css @@ -24,7 +24,7 @@ white-space: nowrap; } -#g-organizeDetail { +#g-organize-detail { height: 100%; } @@ -36,20 +36,20 @@ /******************************************************************* * Album Tree styles */ -#g-organizeTreeContainer { +#g-organize-tree-container { height: 100%; overflow: auto; margin: 0 !important; padding: 0 !important; } -#g-organize-albumTree .selected { +#g-organize-album-tree .selected { background-color: #cfdeff; border-bottom: 1px solid #999; margin-right: 0px; } -#g-organize-albumTree ul li { +#g-organize-album-tree ul li { padding-left: 1.2em; } @@ -131,18 +131,18 @@ /**************************************************************** * Controls styles */ -#g-organizeControls { +#g-organize-controls { padding-left: 8px; background-color: #13A; color: #ccc; width: 100% !important; } -#g-organizeControls select { +#g-organize-controls select { display: inline; } -#g-organizeClose { +#g-organize-close { float: right; margin-right: 12px; } diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js index 960d75e2..d1e9420b 100644 --- a/modules/organize/js/organize.js +++ b/modules/organize/js/organize.js @@ -110,7 +110,7 @@ _refresh: function(data) { if (data.tree) { - $("#g-organize-albumTree").html(data.tree); + $("#g-organize-album-tree").html(data.tree); } if (data.grid) { $("#g-organize-microthumb-grid").html(data.grid); @@ -142,14 +142,14 @@ $("#g-dialog").bind("dialogopen", function(event, ui) { $("#g-organize").height($("#g-dialog").innerHeight() - 20); $("#g-organize-microthumb-panel").height($("#g-dialog").innerHeight() - 90); - $("#g-organizeTreeContainer").height($("#g-dialog").innerHeight() - 59); + $("#g-organize-tree-container").height($("#g-dialog").innerHeight() - 59); }); $("#g-dialog").bind("dialogclose", function(event, ui) { window.location.reload(); }); - $("#g-dialog #g-organizeClose").click(function(event) { + $("#g-dialog #g-organize-close").click(function(event) { $("#g-dialog").dialog("close"); }); @@ -170,7 +170,7 @@ .mousemove($.organize.mouse_move_handler); $(".g-organize-album").droppable($.organize.branch_droppable); $(".g-organize-album-text").click($.organize.show_album); - $("#g-organize-albumTree .ui-icon-plus,#g-organize-albumTree .ui-icon-minus").click($.organize.toggle_branch); + $("#g-organize-album-tree .ui-icon-plus,#g-organize-album-tree .ui-icon-minus").click($.organize.toggle_branch); }, toggle_branch: function(event) { @@ -207,13 +207,13 @@ if ($(event.currentTarget).hasClass("selected")) { return; } - var parent = $(event.currentTarget).parents(".g-organizeBranch"); + var parent = $(event.currentTarget).parents(".g-organize-branch"); if ($(parent).hasClass("g-view-only")) { return; } $("#g-organize-microthumb-panel").selectable("destroy"); var id = $(event.currentTarget).attr("ref"); - $("#g-organize-albumTree .selected").removeClass("selected"); + $("#g-organize-album-tree .selected").removeClass("selected"); $(".g-organize-album-text[ref=" + id + "]").addClass("selected"); var url = $("#g-organize-microthumb-panel").attr("ref").replace("__ITEM_ID__", id).replace("__OFFSET__", 0); $.get(url, {}, @@ -231,7 +231,7 @@ */ resort: function(column, dir) { var url = sort_order_url - .replace("__ALBUM_ID__", $("#g-organize-albumTree .selected").attr("ref")) + .replace("__ALBUM_ID__", $("#g-organize-album-tree .selected").attr("ref")) .replace("__COL__", column) .replace("__DIR__", dir); $.get(url, {}, diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 858c794c..dc627d10 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -16,21 +16,21 @@
-
-
-
    +
    +
    +
    -
    +
    ">
    -
    - +
    diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php index 098f6f71..837a2c00 100644 --- a/modules/server_add/controllers/admin_server_add.php +++ b/modules/server_add/controllers/admin_server_add.php @@ -83,7 +83,7 @@ class Admin_Server_Add_Controller extends Admin_Controller { private function _get_admin_form() { $form = new Forge("admin/server_add/add_path", "", "post", - array("id" => "g-server-add-adminForm")); + array("id" => "g-server-add-admin-form")); $add_path = $form->group("add_path"); $add_path->input("path")->label(t("Path"))->rules("required") ->error_messages("not_readable", t("This directory is not readable by the webserver")) diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js index a2a831c9..02dda4c0 100644 --- a/modules/server_add/js/server_add.js +++ b/modules/server_add/js/server_add.js @@ -20,7 +20,7 @@ $("#g-server-add-continue-button", this.element).hide(); self.run_add(); }); - $("#g-server-addCloseButton", this.element).click(function(event) { + $("#g-server-add-close-button", this.element).click(function(event) { $("#g-dialog").dialog("close"); window.location.reload(); }); diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php index 31648a70..cd3b09cc 100644 --- a/modules/server_add/views/server_add_tree_dialog.html.php +++ b/modules/server_add/views/server_add_tree_dialog.html.php @@ -40,7 +40,7 @@ - diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php index f1f8e5eb..f920b4c5 100644 --- a/modules/user/helpers/user_block.php +++ b/modules/user/helpers/user_block.php @@ -32,7 +32,7 @@ class user_block_Core { } if (count($locales) > 1) { $block = new Block(); - $block->css_id = "g-userLanguageBlock"; + $block->css_id = "g-user-language-block"; $block->title = t("Language Preference"); $block->content = new View("user_languages_block.html"); $block->content->installed_locales = diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php index 65eaab8c..049ba043 100644 --- a/modules/user/views/login.html.php +++ b/modules/user/views/login.html.php @@ -16,7 +16,7 @@
  • " - id="g-logoutLink"> + id="g-logout-link">
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 5b2d41ad..fc86e1c9 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -45,7 +45,7 @@ admin_header_top() ?>
  • thumb_img(array("class" => "g-thumbnail")) ?> thumb_bottom($child) ?> - context_menu($child, "#g-itemId-{$child->id} .g-thumbnail") ?> + context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>

    title) ?>

      thumb_info($child) ?> diff --git a/themes/wind/views/dynamic.html.php b/themes/wind/views/dynamic.html.php index 9d50f8a8..aa347402 100644 --- a/themes/wind/views/dynamic.html.php +++ b/themes/wind/views/dynamic.html.php @@ -1,6 +1,6 @@ -
      -
      +
      -- cgit v1.2.3 From 5f56cbf997c12ab1aaf14403873fd9dfc33690ef Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 18 Oct 2009 20:22:10 -0600 Subject: Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's. --- lib/gallery.common.css | 5 + modules/akismet/views/admin_akismet.html.php | 15 +- modules/comment/views/admin_comments.html.php | 305 ++++++++--------- modules/digibug/views/admin_digibug.html.php | 10 +- modules/g2_import/views/admin_g2_import.html.php | 142 ++++---- modules/gallery/controllers/admin_languages.php | 3 +- modules/gallery/views/admin_graphics.html.php | 30 +- modules/gallery/views/admin_languages.html.php | 187 ++++++----- modules/gallery/views/admin_maintenance.html.php | 368 +++++++++++---------- modules/gallery/views/admin_modules.html.php | 52 +-- modules/gallery/views/admin_sidebar.html.php | 43 +-- modules/gallery/views/admin_theme_options.html.php | 4 +- modules/gallery/views/admin_themes.html.php | 139 ++++---- modules/recaptcha/views/admin_recaptcha.html.php | 44 +-- modules/server_add/views/admin_server_add.html.php | 21 +- modules/tag/js/tag.js | 4 +- modules/tag/views/admin_tags.html.php | 83 ++--- modules/user/views/admin_users.html.php | 159 ++++----- modules/watermark/views/admin_watermarks.html.php | 58 ++-- themes/admin_wind/css/screen.css | 67 +--- 20 files changed, 871 insertions(+), 868 deletions(-) (limited to 'modules/gallery/views/admin_theme_options.html.php') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index c574279c..a700c359 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -31,9 +31,11 @@ **********************************************************************/ .g-narrow { + width: 25%; } .g-wide { + width: 100%; } /** ******************************************************************* @@ -107,9 +109,12 @@ form .g-error { } .g-installed { + background-color: #eeeeee; } .g-default { + background-color: #c5dbec; + font-weight: bold; } .g-draggable, diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php index 22c60c97..d273be5b 100644 --- a/modules/akismet/views/admin_akismet.html.php +++ b/modules/akismet/views/admin_akismet.html.php @@ -1,17 +1,18 @@ -
      +

      Wordpress.com API Key, which is also free. Your comments will be automatically relayed to Akismet.com where they'll be scanned for spam. Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.", array("api_key_url" => "http://wordpress.com/api-keys", "akismet_url" => "http://akismet.com")) ?>

      +
      + +
      + +
      + - -
      - +
      - - -
      diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 8f719f05..82e071a8 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -34,165 +34,168 @@ } -
      +

      - -
      - -
      +
      + +
      + +
      - -

      - - - - - - - - - -

      + +

      + + + + + + + + + +

      - -
      - - 0): ?> -

      - -

      - -

      - spam): ?> - spam) ?> -

      -

      - "> - - - - + +

      + + 0): ?> +

      + +

      -

      -
      - +

      + spam): ?> + spam) ?> +

      +

      + "> + + + + + +

      +
      + - -
      -

      - -

      -
      - + +
      +

      + +

      +
      + - - - - - - - $comment): ?> - "> - - + + + +
      - - - - - -
      - - " - class="g-avatar" - alt="author_name()) ?>" - width="40" - height="40" /> - -

      author_name()) ?>

      -       		-
      - item() ?> -
      - - has_thumb()): ?> - <?= html::purify($item->title)->for_html_attr() ?>thumb_width, $item->thumb_height, 75) ?> - /> - - - - + + + + + + + $comment): ?> + "> + + - - - -
      + + + + + +
      + + " + class="g-avatar" + alt="author_name()) ?>" + width="40" + height="40" /> + +

      author_name()) ?>

      +       		+
      + item() ?> +
      + + has_thumb()): ?> + <?= html::purify($item->title)->for_html_attr() ?>thumb_width, $item->thumb_height, 75) ?> + /> + + + + +
      - -

      created) ?>

      - text)) ?> -       		-
        - state != "unpublished"): ?> -
      • - - - - -
        • - - state != "published"): ?> -
      • - - - - -
        • - - state != "spam"): ?> -
      • - - - - -
        • - - -
      • - - - - -
        • -
      -
      +

      created) ?>

      + text)) ?> +
      		+
        + state != "unpublished"): ?> +
      • + + + + +
        • + + state != "published"): ?> +
      • + + + + +
        • + + state != "spam"): ?> +
      • + + + + +
        • + + +
      • + + + + +
        • +
      +
      -
      - +
      + +
      +
      diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php index f75adc60..5d07eb68 100644 --- a/modules/digibug/views/admin_digibug.html.php +++ b/modules/digibug/views/admin_digibug.html.php @@ -1,18 +1,16 @@ -
      -
      - "> -

      +
      + " alt="Digibug logo" class="g-right"/> +

      +

      -
      -

      register with Digibug and enter your Digibug id in the Advanced Settings page you can make money off of your photos!", array("signup_url" => "http://www.digibug.com/signup.php", diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index fd8ae63c..e1443aa7 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -1,94 +1,96 @@ -

      +

      -
      -

      -

      - -

      -
        -
      • - 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" => html::mark_clean(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" => html::mark_clean(url::site("admin/theme_options")))) ?> -
        • - -
      - -
      +
      +
      +

      - +

      • - + 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" => html::mark_clean(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" => html::mark_clean(url::site("admin/theme_options")))) ?>
        • +
      -
      -

      - "> - - -

      +
      +

      + +

      +
        +
      • + +
        • +
      • + +
        • +
      • + +
        • +
      • + +
        • +
      • + +
        • +
      • + +
        • +
      • + +
        • +
      +
      + +

      + "> + + +

      +
      +
      -
      diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php index 8af1dd85..ccc631c7 100644 --- a/modules/gallery/controllers/admin_languages.php +++ b/modules/gallery/controllers/admin_languages.php @@ -112,7 +112,8 @@ class Admin_Languages_Controller extends Admin_Controller { $server_link = l10n_client::server_api_key_url(); $group->input("api_key") ->label(empty($api_key) - ? t("This is a unique key that will allow you to send translations to the remote server. To get your API key go to %server-link.", + ? t("This is a unique key that will allow you to send translations to the remote + server. To get your API key go to %server-link.", array("server-link" => html::mark_clean(html::anchor($server_link)))) : t("API Key")) ->value($api_key) diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php index 95d0618c..0f4c0dd8 100644 --- a/modules/gallery/views/admin_graphics.html.php +++ b/modules/gallery/views/admin_graphics.html.php @@ -12,26 +12,28 @@ }); -
      +

      -

      - - - - $tk->$active, "is_active" => true)) ?> - - -
      -

      - - - $tk->$id, "is_active" => false)) ?> +
      +

      + + + + $tk->$active, "is_active" => true)) ?> - + +
      +

      + + + $tk->$id, "is_active" => false)) ?> + + +
      diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php index 74f48b76..311672de 100644 --- a/modules/gallery/views/admin_languages.html.php +++ b/modules/gallery/views/admin_languages.html.php @@ -1,103 +1,112 @@ -
      -

      -

      - -

      + - - - for_html_attr() ?>" /> - +
      +

      - -
      - -
      -

      -

      - -

      +
      +

      +

      + +

      -

      +
      +
      "> + + + + + + + + + $display_name): ?> + +
      + + + + + + + "> + + + + + + +
      + +
      + for_html_attr() ?>" /> +
      +
      +
      -
      - for_html_attr() ?>"> - - +
      +

      +

      + +

      -

      Step 1: Make sure the target language is installed and up to date (check above).") ?>

      +
      + for_html_attr() ?>"> + + -

      Step 2: Make sure you have selected the right target language (currently %default_locale).", - array("default_locale" => locales::display_name())) ?>

      +

      -

      Step 3: Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?>

      +

      - - - get("l10n_mode", false)): ?> - - - - - -
      +
        +
        • +
      • locales::display_name())) ?>
        • +
        • +
      + + + get("l10n_mode", false)): ?> + + + + + -

      - +

      + +
      +
      + +
      diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 94582dc8..73a4bef8 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -1,193 +1,195 @@ -
      +

      -
      -

      - - - - - - - - - severity) ?>"> - - - - - - -
      - - - - - -
      - name ?> - - description ?> - - callback?csrf=$csrf") ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> - - -
      -
      - - count()): ?> -
      -

      - - - - - - - - - - - - state == "stalled" ? "g-warning" : "" ?>"> - - - - - - - - - -
      - - - - - - - - - - - " - class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> - - -
      "> - updated) ?> - - name ?> - - done): ?> - state == "cancelled"): ?> - - - - state == "stalled"): ?> - - - $task->percent_complete)) ?> - - - status ?> - - owner()->name) ?> - - id?csrf=$csrf") ?>" - class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> - - - state == "stalled"): ?> - id?csrf=$csrf") ?>"> - - - -
      -
      - +
      +
      +

      + + + + + + + + + severity) ?>"> + + + + + + +
      + + + + + +
      + name ?> + + description ?> + + callback?csrf=$csrf") ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> + + +
      +
      - count()): ?> - + + + count()): ?> +
      +

      + + + + + + + + + + + + state == "success" ? "g-success" : "g-error" ?>"> + + + + + + + + + +
      + + + + + + + + + + + " + class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> + + +
      "> + updated) ?> + + name ?> + + state == "success"): ?> + + state == "error"): ?> + + state == "cancelled"): ?> + + + + status ?> + + owner()->name) ?> + + done): ?> + id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> + + + get_log()): ?> + id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all"> + + + + + id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all> + + + id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all"> + + + + +
      +
      +
      -
      diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php index 75f4f0c5..4c4976f8 100644 --- a/modules/gallery/views/admin_modules.html.php +++ b/modules/gallery/views/admin_modules.html.php @@ -1,32 +1,34 @@ -
      +

      -
      "> - - - - - - - - - - $module_info): ?> - "> - $module_name); ?> - locked) $data["disabled"] = 1; ?> - - - - - - - -
      name) ?> version ?> description) ?>
      - for_html_attr() ?>"/> -
      +
      +
      "> + + + + + + + + + + $module_info): ?> + "> + $module_name); ?> + locked) $data["disabled"] = 1; ?> + + + + + + + +
      name) ?> version ?> description) ?>
      + for_html_attr() ?>" /> +
      +
      diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php index b4f339ae..ea950b54 100644 --- a/modules/gallery/views/admin_sidebar.html.php +++ b/modules/gallery/views/admin_sidebar.html.php @@ -1,7 +1,7 @@ -

      -

      - -

      -
      "> -
      -

      -
      -
        - -
      +
      +

      +

      + +

      + +
      "> +
      +

      +
      +
        + +
      +
      -
      -
      -

      -
      -
        - -
      +
      +

      +
      +
        + +
      +
      diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php index e09be728..a4bf1c4e 100644 --- a/modules/gallery/views/admin_theme_options.html.php +++ b/modules/gallery/views/admin_theme_options.html.php @@ -1,6 +1,8 @@ -
      +

      +
      +
      diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index f7e77a01..dda18265 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -7,83 +7,88 @@ } -

      -

      - -

      +
      +

      +

      + +

      -
      -

      -
      - " - alt="name) ?>" /> -

      name ?>

      -

      - description ?> -

      -
      +
      + +
      +

      +
      + " + alt="name) ?>" /> +

      name ?>

      +

      + description ?> +

      +
      -
      -

      -
      - " - alt="name) ?>" /> -

      name ?>

      -

      - description ?> -

      -
      +

      +
      + + $info): ?> + admin) continue ?> + +
      + " class="g-dialog-link" title=" $info->name))->for_html_attr() ?>"> + " + alt="name) ?>" /> +

      name ?>

      +

      + description ?> +

      +       +
      + + -

      -
      - - $info): ?> - admin) continue ?> - -
      - " class="g-dialog-link" title=" $info->name))->for_html_attr() ?>"> - " - alt="name) ?>" /> -

      name ?>

      +

      - description ?> +

      -       + +
      - - - - -

      - -

      - +
      \ No newline at end of file diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php index 3e964801..a0af3ba8 100644 --- a/modules/recaptcha/views/admin_recaptcha.html.php +++ b/modules/recaptcha/views/admin_recaptcha.html.php @@ -1,5 +1,5 @@ -
      +

      reCAPTCHA Public/Private Key pair, which is also free. Once registered, the challenge and response strings are evaluated at recaptcha.net to determine if the form content has been entered by a bot.", @@ -7,27 +7,29 @@ "recaptcha_url" => html::mark_clean("http://recaptcha.net"))) ?>

      - -
      +
      + - -
      -

      -

      - -

      + +
      +

      +

      + +

      -
      - - +
      + + +
      +
      + +
      - - diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php index e447ee6d..eae767af 100644 --- a/modules/server_add/views/admin_server_add.html.php +++ b/modules/server_add/views/admin_server_add.html.php @@ -1,25 +1,22 @@ -
      -

      - -

      -
      -

      +
      +

      +
      +

      style="display: none;">
    -
    • -
    diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index 41fa4d41..4ed88e03 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -37,7 +37,7 @@ function editInPlace(element) { closeEditInPlaceForms(); // create edit form - var tag_id = $(this).attr('id').substr(5); + var tag_id = $(this).attr('rel'); var tag_name = $(this).html(); var tag_width = $(this).width(); $(this).parent().data("revert", $(this).parent().html()); @@ -67,7 +67,7 @@ function editInPlace(element) { console.log("success"); if (data.result == "success") { closeEditInPlaceForms(); // close form - $("#g-tag-" + data.tag_id).text(data.new_tagname); // update tagname + $(".g-tag[rel=" + data.tag_id + "]").text(data.new_tagname); // update tagname window.location.reload(); } else if (data.result == "error") { console.log("error"); diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 7771f7fe..67ba4d95 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -1,5 +1,5 @@ - -

    - -

    - count()/5 ?> - - - - - + +
    - count()) ?> -
    - $tag): ?> - name, 0, 1)) ?> - - - -
      - - $tags_per_column): /* new column */ ?> -
    		- - +
    +

    + +
    + + + + + - -
    + count()) ?> +
    + $tag): ?> + name, 0, 1)) ?> - - -
      - + + +
        + + $tags_per_column): /* new column */ ?> +
    		+ + + + + -
    + + + + +
    +
    + diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 2f8d8673..aae39c8c 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -41,88 +41,93 @@ }); } -
    - " - class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" - title="for_html_attr() ?>"> - - - -

    - -

    +
    +

    - - - - - - - - +
    + " + class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" + title="for_html_attr() ?>"> + + + - $user): ?> -
    user admin ? "admin" : "" ?>"> - - - - - - - -
    - " - title="for_html_attr() ?>" - alt="name) ?>" - width="20" - height="20" /> - name) ?> - - full_name) ?> - - email) ?> - - last_login == 0) ? "" : gallery::date($user->last_login) ?> - - id") ?>" - open_text="" - class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> - - id != $user->id && !$user->guest): ?> - id") ?>" - class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left"> - - - for_html_attr() ?>" - class="g-button ui-state-disabled ui-corner-all ui-icon-left"> - - -
    -
    -
    +

    -
    - " - class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" - title="for_html_attr() ?>"> - - - +
    + + + + + + + + -

    - -

    + $user): ?> + user admin ? "admin" : "" ?>"> + + + + + + + +
    + " + title="for_html_attr() ?>" + alt="name) ?>" + width="20" + height="20" /> + name) ?> + + full_name) ?> + + email) ?> + + last_login == 0) ? "" : gallery::date($user->last_login) ?> + + id") ?>" + open_text="" + class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> + + id != $user->id && !$user->guest): ?> + id") ?>" + class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left"> + + + for_html_attr() ?>" + class="g-button ui-state-disabled ui-corner-all ui-icon-left"> + + +
    +
    +
    -
    -
      - $group): ?> -
    • " /> - group = $group; ?> - -
      • - -
    -
    + +
    diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php index d034066a..af38cb41 100644 --- a/modules/watermark/views/admin_watermarks.html.php +++ b/modules/watermark/views/admin_watermarks.html.php @@ -1,37 +1,39 @@ -
    +

    - - " - title="for_html_attr() ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> - -

    -

    - -

    -
    -
    - -

    - watermark::position($position))) ?> -

    -

    - module::get_var("watermark", "transparency"))) ?> -

    -
    -
    - " - title="for_html_attr() ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> - " - title="for_html_attr() ?>" - class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> +
    + + " + title="for_html_attr() ?>" + class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"> + +

    +

    + +

    + +
    -
    diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 1d60d392..20593e9c 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -107,11 +107,11 @@ td { border: none; border-bottom: 1px solid #ccc; padding: .5em; - vertical-align: top; + vertical-align: middle; } -#g-admin-maintenance td { - vertical-align: middle; +th { + white-space: nowrap; } /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -474,14 +474,6 @@ tr.g-warning { margin-right: 1em; } -#g-user-admin-list { - margin-bottom: 1em; -} - -#g-user-admin-list td { - vertical-align: bottom; -} - #g-user-admin-list .admin { color: #55f; font-weight: bold; @@ -531,36 +523,19 @@ li.g-default-group h4, li.g-default-group .g-user { color: gray; } -#g-admin-advanced-settings tr.setting:hover { - background: #ffc; -} - -/* admin/sidebar ~~~~~~~~~~~~~~~~~~~~~~~~~ */ -.g-admin-blocks-list { - float: left; - height: 300px; - margin-left: 20px; - width: 30%; -} +/* Block admin ~~~~~~~~~~~~~~~~~~~~~~~~~ */ -.g-admin-blocks-list div:last-child { - border: .1em solid; - height: 100%; - overflow-y: auto; +#g-admin-blocks .g-block { + margin-right: 2em; + height: 200px; + width: 30% !important; } -.g-admin-blocks-list ul { - height: 98%; - margin: .1em .1em; - padding: .1em; -} - -.g-admin-blocks-list ul li { - background-color: #e8e8e8; - font-size: 1em; - font-weight: bold; - margin: .5em; - padding: .3em .8em; +#g-admin-blocks .g-block li { + background: #e7e7e7; + /*border: 1px solid #fff;*/ + margin-bottom: 1em; + padding: .4em .8em; } /** ******************************************************************* @@ -797,20 +772,10 @@ li.g-default-group h4, li.g-default-group .g-user { } #g-languages-form table { - width: 400px; - float: left; + width: 40%; margin: 0 3em 1em 0; } -#g-languages-form .installed { - background-color: #EEEEEE; -} - -#g-languages-form .default { - background-color: #C5DBEC; - font-weight: bold; -} - #g-languages-form input { clear: both; } @@ -824,10 +789,6 @@ li.g-default-group h4, li.g-default-group .g-user { padding: .5em; } -.g-doc-link { - float: right; -} - /** ******************************************************************* * 7) Right to left styles *********************************************************************/ -- cgit v1.2.3