7 files changed, 29 insertions, 6 deletions
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index a212ef85..40830bc0 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -223,6 +223,7 @@ class gallery_installer {
     module::set_var("gallery", "resize_size", 640);
     module::set_var("gallery", "default_locale", "en_US");
     module::set_var("gallery", "image_quality", 75);
+    module::set_var("gallery", "image_sharpen", 15);
 
     // Add rules for generating our thumbnails and resizes
     graphics::add_rule(
@@ -259,7 +260,7 @@ class gallery_installer {
     module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 10);
+    module::set_version("gallery", 11);
   }
 
   static function upgrade($version) {
@@ -336,6 +337,12 @@ class gallery_installer {
 
       module::set_version("gallery", $version = 10);
     }
+
+    if ($version == 10) {
+      module::set_var("gallery", "image_sharpen", 15);
+
+      module::set_version("gallery", $version = 11);
+    }
 }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index cc37a193..787f8dc3 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -209,6 +209,7 @@ class graphics_Core {
       Image::factory($input_file)
         ->resize($options["width"], $options["height"], $options["master"])
         ->quality(module::get_var("gallery", "image_quality"))
+        ->sharpen(module::get_var("gallery", "image_sharpen"))
         ->save($output_file);
     }
 
diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index 80fe166b..35986e5a 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -205,6 +205,19 @@ Gallery.behaviors.l10nClient = function(context) {
       Gallery.l10nClient.toggle(0);
     }
   });
+	
+	// Close the l10n client using an AJAX call and refreshing the page
+  $('#gCloseL10n').click(function(event) {
+		$.ajax({
+      type: "GET",
+      url: toggle_l10n_mode_url,
+      data: "csrf=" + csrf,
+      success: function() {
+        window.location.reload(true);
+      }
+    });
+		event.preventDefault();
+  });
 
   // Register keybindings using jQuery hotkeys
   // TODO: Either remove hotkeys code or add query.hotkeys.js.
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index a7defba9..9b3e1f2b 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -212,8 +212,7 @@ class ORM_MPTT_Core extends ORM {
    * @return  ORM_MTPP
    */
   function move_to($target) {
-    if ($this->left_ptr <= $target->left_ptr &&
-        $this->right_ptr >= $target->right_ptr) {
+    if ($this->is_descendant($target)) {
       throw new Exception("@todo INVALID_TARGET can't move item inside itself");
     }
 
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index dfb1a7a2..6b9dd1ba 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 10
+version = 11
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 0eb0b38c..509e87b5 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -4,7 +4,7 @@
   var animation = null;
   var delta = 1;
   animate_progress_bar = function() {
-    var current_value = Number($(".gProgressBar div").css("width").replace("%", ""));
+    var current_value = parseInt($(".gProgressBar div").css("width").replace("%", ""));
     if (target_value > current_value) {
       // speed up
       delta = Math.min(delta + 0.04, 3);
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index aca1e654..c68a63c8 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -3,7 +3,8 @@
   <div class="labels">
     <span id="l10n-client-toggler">
       <a id="gMinimizeL10n">_</a>
-      <a id="gCloseL10n" href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>">X</a>
+      <a id="gCloseL10n" title="<?= t("Stop the translation mode")->for_html_attr() ?>"
+         href="<?= html::clean_attribute(url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token())) ?>">X</a>
     </span>
     <div class="label strings"><h2><?= t("Page Text") ?>
     <? if (!Input::instance()->get('show_all_l10n_messages')): ?>
@@ -76,5 +77,7 @@
     var MSG_CLOSE_X = <?= t("X")->for_js() ?>;
     var l10n_client_data = <?= json_encode($string_list) ?>;
     var plural_forms = <?= json_encode($plural_forms) ?>;
+    var toggle_l10n_mode_url = <?= html::js_string(url::site("l10n_client/toggle_l10n_mode")) ?>;
+    var csrf = <?= html::js_string(access::csrf_token()) ?>;
   </script>
 </div>