5 files changed, 70 insertions, 70 deletions

diff --git a/core/css/quickedit.css b/core/css/quick.css
index 62cd0cb6..ab8c5437 100644
--- a/core/css/quickedit.css
+++ b/core/css/quick.css
@@ -1,16 +1,16 @@
-.gQuickEdit {
+.gQuick {
   margin: 0 !important;
   padding: 0 !important;
   border: none !important;
 }
 
-#gQuickEditPane {
+#gQuickPane {
   background: #fff;
   opacity: 0.8;
   border-bottom: 1px dashed #000;
 }
 
-#gQuickEditPane div {
+#gQuickPane div {
   background-color: red;
   float: right;
   display: inline;
@@ -18,7 +18,7 @@
   margin: 8px;
 }
 
-#gQuickEditPane .rotate-clockwise {
+#gQuickPane .rotate-clockwise {
   background: url('../images/arrow_rotate_clockwise.png');
   width: 16px;
   height: 16px;
@@ -27,11 +27,11 @@
   right: 0px;
 }
 
-#gQuickEditPane .rotate-clockwise span {
+#gQuickPane .rotate-clockwise span {
   display: none;
 }
 
-#gQuickEditPane .rotate-counter-clockwise {
+#gQuickPane .rotate-counter-clockwise {
   background: url('../images/arrow_rotate_anticlockwise.png');
   width: 16px;
   height: 16px;
@@ -40,6 +40,6 @@
   left: 0px;
 }
 
-#gQuickEditPane .rotate-counter-clockwise span {
+#gQuickPane .rotate-counter-clockwise span {
   display: none;
 }
diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php
index 8ce0c8ca..0976c37a 100644
--- a/core/helpers/core_block.php
+++ b/core/helpers/core_block.php
@@ -27,8 +27,8 @@ class core_block_Core {
     }
     if ($theme->page_type == "album" && access::can("edit", $theme->item())) {
       $buf .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" .
-        url::file("core/css/quickedit.css") . "\" />";
-      $buf .= html::script("core/js/quickedit.js");
+        url::file("core/css/quick.css") . "\" />";
+      $buf .= html::script("core/js/quick.js");
     }
     return $buf;
   }
@@ -36,7 +36,7 @@ class core_block_Core {
   public static function thumb_top($theme, $child) {
     if ($child->type == "photo" && access::can("edit", $child)) {
       $edit_link = url::site("quick/edit/$child->id");
-      return "<div class=\"gQuickEdit\" quickedit_link=\"$edit_link\">";
+      return "<div class=\"gQuick\" quick_link=\"$edit_link\">";
     }
   }
 
diff --git a/core/js/quick.js b/core/js/quick.js
new file mode 100644
index 00000000..858ba3f2
--- /dev/null
+++ b/core/js/quick.js
@@ -0,0 +1,58 @@
+$(document).ready(function() {
+  $(".gQuick").hover(show_quick, function() {});
+});
+
+var show_quick = function() {
+  var quick = $(this);
+  $("#gQuickPane").remove();
+  quick.append("<div id=\"gQuickPane\"></div>");
+  var img = quick.find("img");
+  var pos = img.position();
+  $("#gQuickPane").css({
+    "position": "absolute",
+    "top": pos.top,
+    "left": pos.left,
+    "width": img.innerWidth() + 1,
+    "height": 32
+  });
+  quick.hover(function() { }, hide_quick);
+  $.get(
+    quick.attr("quick_link"),
+    {},
+    function(data, textStatus) {
+      $("#gQuickPane").html(data);
+      $("#gQuickPane div").click(function() {
+        quick_do(quick, $(this), img);
+      });
+    }
+  );
+};
+
+var quick_do = function(quick, pane, img) {
+  img.css("opacity", "0.2");
+  quick.addClass("gLoadingLarge");
+  $.ajax({
+    type: "GET",
+    url: pane.attr("quick_link"),
+    dataType: "json",
+    success: function(data) {
+      img.css("opacity", "1");
+      img.attr("width", data.width);
+      img.attr("height", data.height);
+      img.attr("src", data.src);
+      var pos = img.position();
+      quick.removeClass("gLoadingLarge");
+      $("#gQuickPane").css({
+        "position": "absolute",
+        "top": pos.top,
+        "left": pos.left,
+        "width": img.innerWidth() + 1,
+        "height": 32
+      });
+    }
+  });
+};
+
+var hide_quick = function() {
+  $("#gQuickPane").remove();
+};
diff --git a/core/js/quickedit.js b/core/js/quickedit.js
deleted file mode 100644
index 307a5f3a..00000000
--- a/core/js/quickedit.js
+++ /dev/null
@@ -1,58 +0,0 @@
-$(document).ready(function() {
-  $(".gQuickEdit").hover(show_quickedit, function() {});
-});
-
-var show_quickedit = function() {
-  var quick_edit = $(this);
-  $("#gQuickEditPane").remove();
-  quick_edit.append("<div id=\"gQuickEditPane\"></div>");
-  var img = quick_edit.find("img");
-  var pos = img.position();
-  $("#gQuickEditPane").css({
-    "position": "absolute",
-    "top": pos.top,
-    "left": pos.left,
-    "width": img.innerWidth() + 1,
-    "height": 32
-  });
-  quick_edit.hover(function() { }, hide_quickedit);
-  $.get(
-    quick_edit.attr("quickedit_link"),
-    {},
-    function(data, textStatus) {
-      $("#gQuickEditPane").html(data);
-      $("#gQuickEditPane div").click(function() {
-        quickedit(quick_edit, $(this), img);
-      });
-    }
-  );
-};
-
-var quickedit = function(quick_edit, pane, img) {
-  img.css("opacity", "0.2");
-  quick_edit.addClass("gLoadingLarge");
-  $.ajax({
-    type: "GET",
-    url: pane.attr("quickedit_link"),
-    dataType: "json",
-    success: function(data) {
-      img.css("opacity", "1");
-      img.attr("width", data.width);
-      img.attr("height", data.height);
-      img.attr("src", data.src);
-      var pos = img.position();
-      quick_edit.removeClass("gLoadingLarge");
-      $("#gQuickEditPane").css({
-        "position": "absolute",
-        "top": pos.top,
-        "left": pos.left,
-        "width": img.innerWidth() + 1,
-        "height": 32
-      });
-    }
-  });
-};
-
-var hide_quickedit = function() {
-  $("#gQuickEditPane").remove();
-};
diff --git a/core/views/quick_edit.html.php b/core/views/quick_edit.html.php
index a7df97f1..940c5c2a 100644
--- a/core/views/quick_edit.html.php
+++ b/core/views/quick_edit.html.php
@@ -1,13 +1,13 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? if ($item->type == "photo"): ?>
 <div class="rotate-counter-clockwise"
-     quickedit_link="<?= url::site("quick/rotate/$item->id/ccw?csrf=" . access::csrf_token()) ?>">
+     quick_link="<?= url::site("quick/rotate/$item->id/ccw?csrf=" . access::csrf_token()) ?>">
   <span>
     <?= _("Rotate CCW") ?>
   </span>
 </div>
 <div class="rotate-clockwise"
-     quickedit_link="<?= url::site("quick/rotate/$item->id/cw?csrf=" . access::csrf_token()) ?>">
+     quick_link="<?= url::site("quick/rotate/$item->id/cw?csrf=" . access::csrf_token()) ?>">
   <span>
     <?= _("Rotate CCW") ?>
   </span>