From 8d256898c7533f2d61e2c0672f70314c68cd0187 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Sat, 29 Aug 2009 14:21:53 -0400
Subject: improved translation interface so that it now can be closed without
 going to the admin

---
 modules/gallery/js/l10n_client.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/js/l10n_client.js')

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index f5be5058..80fe166b 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,7 +198,7 @@ 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 {
-- 
cgit v1.2.3


From a1ce2d3f0aff6dcb7149f2d7327a10079e5c78f8 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Sat, 29 Aug 2009 19:19:04 -0400
Subject: you can close the l10n client directly from its interface now,
 without going back to the languages admin page

---
 modules/gallery/js/l10n_client.js          | 13 +++++++++++++
 modules/gallery/views/l10n_client.html.php |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/js/l10n_client.js')

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/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 5ee7eca3..6c440b68 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") ?>"
+			  href="<?= 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") ?>";
     var l10n_client_data = <?= json_encode($string_list) ?>;
     var plural_forms = <?= json_encode($plural_forms) ?>;
+		var toggle_l10n_mode_url = "<?= url::site("l10n_client/toggle_l10n_mode") ?>";
+		var csrf = "<?= access::csrf_token() ?>";
   </script>
 </div>
-- 
cgit v1.2.3