4 files changed, 26 insertions, 6 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 013f7e11..16dd143c 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -185,7 +185,7 @@ input[type="reset"] {
 
 .g-short-form .g-cancel {
   display: block;
-  padding: .2em .8em;
+  margin: .3em .8em;
 }
 
 #g-sidebar .g-short-form li {
@@ -677,6 +677,7 @@ div#g-action-status {
 
 .rtl .g-left,
 .rtl .g-inline li,
+.rtl .g-short-form li,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
@@ -723,3 +724,15 @@ div#g-action-status {
 .rtl input.checkbox {
   margin-right: .4em;
 }
+
+/* Superfish RTL ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .sf-menu a.sf-with-ul {
+	padding-left: 2.25em;
+	padding-right: 1em;
+}
+
+.rtl .sf-sub-indicator {
+	left: .75em !important;
+  right: auto;
+}
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 9aaac1ce..0bd14915 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -179,8 +179,15 @@
       var button = $(this).find("input[type=submit]");
 
       $(".g-short-form").addClass("ui-helper-clearfix");
-      $(".g-short-form input[type=text]").addClass("ui-corner-left");
-      $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
+
+      // Place button's on the left for RTL languages
+      if ($(".rtl").length) {
+        $(".g-short-form input[type=text]").addClass("ui-corner-right");
+        $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-left");
+      } else {
+        $(".g-short-form input[type=text]").addClass("ui-corner-left");
+        $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
+      }
 
       // Set the input value equal to label text
       if (input.val() == "") {
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index b2665a5f..9a5e3f05 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -54,7 +54,7 @@
         <? endif ?>
       </ul>
 
-      <div class="g-info">
+      <div class="g-message-block g-info">
         <p>
           <?= t("Your Gallery 2 has the following importable data in it") ?>
         </p>
diff --git a/modules/gallery/views/in_place_edit.html.php b/modules/gallery/views/in_place_edit.html.php
index 03cbdc69..45cf1d8c 100644
--- a/modules/gallery/views/in_place_edit.html.php
+++ b/modules/gallery/views/in_place_edit.html.php
@@ -1,8 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= form::open($action, array("method" => "post", "id" => "g-in-place-edit-form", "class" => "g-short-form"), $hidden) ?>
   <ul>
-    <li <? if (!empty($errors["input"])): ?> class="g-error"<? endif ?>>
-      <?= form::input("input", $form["input"], " class='textbox'") ?>
+    <li<? if (!empty($errors["input"])): ?> class="g-error"<? endif ?>>
+      <?= form::input("input", $form["input"], " class=\"textbox\"") ?>
     </li>
     <li>
       <?= form::submit(array("class" => "submit ui-state-default"), t("Save")) ?>