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/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) ?>