Merge branch 'master' of git://github.com/gallery/gallery3

3 files changed, 32 insertions, 89 deletions

diff --git a/modules/gallery/js/albums_form_add.js b/modules/gallery/js/albums_form_add.js
index 06a364f3..43166f27 100644
--- a/modules/gallery/js/albums_form_add.js
+++ b/modules/gallery/js/albums_form_add.js
@@ -1,12 +1,23 @@
 $("#gAddAlbumForm input[name=title]").change(
   function() {
     $("#gAddAlbumForm input[name=name]").attr(
-      "value", $("#gAddAlbumForm input[name=title]").attr("value").
-        replace(/\s+/g, "_").replace(/\.+$/, ""));
+      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+        .replace(/[\s\/]+/g, "-").replace(/\.+$/, ""));
+    $("#gAddAlbumForm input[name=slug]").attr(
+      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+        .replace(/[^A-Za-z0-9-_]+/g, "-")
+	.replace(/^-+/, "")
+	.replace(/-+$/, ""));
   });
 $("#gAddAlbumForm input[name=title]").keyup(
   function() {
     $("#gAddAlbumForm input[name=name]").attr(
-      "value", $("#gAddAlbumForm input[name=title]").attr("value").
-        replace(/\s+/g, "_").replace(/\.+$/, ""));
+      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+        .replace(/[\s\/]+/g, "-")
+	.replace(/\.+$/, ""));
+    $("#gAddAlbumForm input[name=slug]").attr(
+      "value", $("#gAddAlbumForm input[name=title]").attr("value")
+        .replace(/[^A-Za-z0-9-_]+/g, "-")
+	.replace(/^-+/, "")
+	.replace(/-+$/, ""));
   });
diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index f5be5058..35986e5a 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -58,7 +58,8 @@ jQuery.extend(Gallery, {
         case 1:
           $('#l10n-client-string-select, #l10n-client-string-editor, #l10n-client .labels .label').show();
           $('#l10n-client').height('22em').removeClass('hidden');
-        $('#l10n-client-toggler').text(MSG_CLOSE_X);
+					//$('#l10n-client').slideUp();
+					$('#gMinimizeL10n').text("_");
         /*
          * This CSS clashes with Gallery's CSS, probably due to
          * YUI's grid / floats.
@@ -72,7 +73,7 @@ jQuery.extend(Gallery, {
           $('#l10n-client-string-select, #l10n-client-string-editor, #l10n-client .labels .label').hide();
           $('#l10n-client').height('2em').addClass('hidden');
           // TODO: Localize this message
-          $('#l10n-client-toggler').text(MSG_TRANSLATE_TEXT);
+					$('#gMinimizeL10n').text(MSG_TRANSLATE_TEXT);
         /*
           if(!$.browser.msie) {
             $('body').css('border-bottom', '0px');
@@ -197,13 +198,26 @@ Gallery.behaviors.l10nClient = function(context) {
   });
 
   // When l10n_client window is clicked, toggle based on current state.
-  $('#l10n-client-toggler').click(function() {
+  $('#gMinimizeL10n').click(function() {
     if($('#l10n-client').is('.hidden')) {
       Gallery.l10nClient.toggle(1);
     } else {
       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/js/quick.js b/modules/gallery/js/quick.js
deleted file mode 100644
index 3ac97f8e..00000000
--- a/modules/gallery/js/quick.js
+++ /dev/null
@@ -1,82 +0,0 @@
-$(document).ready(function() {
-  if ($("#gAlbumGrid").length) {
-    // @todo Add quick edit pane for album (meta, move, permissions, delete)
-    $(".gItem").hover(show_quick, function() {});
-  }
-  if ($("#gPhoto").length) {
-    $("#gPhoto").hover(show_quick, function() {});
-  }
-});
-
-var show_quick = function() {
-  var cont = $(this);
-  var quick = $(this).find(".gQuick");
-  var img = cont.find(".gThumbnail,.gResize");
-  $("#gQuickPane").remove();
-  cont.append("<div id=\"gQuickPane\"></div>");
-  $("#gQuickPane").hide();
-  cont.hover(function() {}, hide_quick);
-  $.get(
-    quick.attr("href"),
-    {},
-    function(data, textStatus) {
-      $("#gQuickPane").html(data).slideDown("fast");
-      $(".ui-state-default").hover(
-        function() {
-          $(this).addClass("ui-state-hover");
-        },
-        function() {
-          $(this).removeClass("ui-state-hover");
-        }
-      );
-      $("#gQuickPane a:not(.options)").click(function(e) {
-        e.preventDefault();
-        quick_do(cont, $(this), img);
-      });
-      $("#gQuickPane a.options").click(function(e) {
-        e.preventDefault();
-        $("#gQuickPaneOptions").slideToggle("fast");
-      });
-    }
-  );
-};
-
-var quick_do = function(cont, pane, img) {
-  if (pane.hasClass("ui-state-disabled")) {
-    return false;
-  }
-  if (pane.hasClass("gDialogLink")) {
-    openDialog(pane);
-  } else {
-    img.css("opacity", "0.1");
-    cont.addClass("gLoadingLarge");
-    $.ajax({
-      type: "GET",
-      url: pane.attr("href"),
-      dataType: "json",
-      success: function(data) {
-        img.css("opacity", "1");
-        cont.removeClass("gLoadingLarge");
-        if (data.src) {
-          img.attr("width", data.width);
-          img.attr("height", data.height);
-          img.attr("src", data.src);
-          if (data.height > data.width) {
-            img.css("margin-top", -32);
-          } else {
-            img.css("margin-top", 0);
-          }
-        } else if (data.location) {
-          window.location = data.location;
-        } else if (data.reload) {
-          window.location.reload();
-        }
-      }
-    });
-  }
-  return false;
-};
-
-var hide_quick = function() {
-  $("#gQuickPane").remove();
-};