- Patch #788696 by JohnAlbin: OpenID login styling is broken in RTL languages, crummy in LTR.

5 files changed, 49 insertions, 15 deletions

diff --git a/modules/openid/openid.css b/modules/openid/openid.css
index 63d1c01c6..882be2ceb 100644
--- a/modules/openid/openid.css
+++ b/modules/openid/openid.css
@@ -2,9 +2,9 @@
 
 #edit-openid-identifier {
   background-image: url("login-bg.png");
-  background-position: 0% 50%;
+  background-position: left 50%; /* LTR */
   background-repeat: no-repeat;
-  padding-left: 20px;
+  padding-left: 20px; /* LTR */
 }
 div.form-item-openid-identifier {
   display: block;
@@ -13,11 +13,6 @@ html.js #user-login-form div.form-item-openid-identifier,
 html.js #user-login div.form-item-openid-identifier {
   display: none;
 }
-html.js #user-login-form li.openid-link,
-html.js #user-login li.openid-link {
-  display : block;
-  list-style: none;
-}
 #user-login-form ul {
   margin-top: 0;
 }
@@ -27,14 +22,26 @@ html.js #user-login li.openid-link {
 #user-login ul li {
   margin: 0;
 }
-#user-login-form li.openid-link,
-#user-login-form li.user-link,
-#user-login li.openid-link,
-#user-login li.user-link {
+#user-login-form .openid-links {
+  padding-bottom: 0;
+}
+#user-login .openid-links {
+  padding-left: 0; /* LTR */
+}
+#user-login-form .openid-links li,
+#user-login .openid-links li {
   display: none;
+  list-style: none;
+}
+html.js #user-login-form li.openid-link,
+html.js #user-login li.openid-link {
+  display: block;
+  margin-left: 0; /* LTR */
 }
 #user-login-form li.openid-link a,
 #user-login li.openid-link a {
-  background: transparent url("login-bg.png") no-repeat 0 2px;
-  padding: 0 20px;
+  background-image: url("login-bg.png");
+  background-position: left top; /* LTR */
+  background-repeat: no-repeat;
+  padding: 0 0 0 1.5em; /* LTR */
 }
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 7411e0677..ebd63f0bb 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -136,7 +136,9 @@ function _openid_user_login_form_alter(&$form, &$form_state) {
   );
 
   $form['openid_links'] = array(
-    '#markup' => theme('item_list', array('items' => $items)),
+    '#theme' => 'item_list',
+    '#items' => $items,
+    '#attributes' => array('class' => array('openid-links')),
     '#weight' => 1,
   );
 
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index 0f92b3841..df6e03c7b 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -274,6 +274,14 @@ div.vertical-tabs {
 #user-login-form ul {
   text-align: right;
 }
+#user-login-form .openid-links {
+  padding-left: 0;
+  padding-right: 0.5em;
+}
+#user-login-form .openid-links li.user-link {
+  padding-left: 0;
+  padding-right: 1em;
+}
 
 div.admin .left {
   float: right;
diff --git a/themes/garland/style.css b/themes/garland/style.css
index f48df85f3..be429b75e 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -1055,6 +1055,15 @@ div.vertical-tabs ul.vertical-tabs-list li.selected a strong {
 #user-login-form ul {
   text-align: left; /* LTR */
 }
+#user-login .openid-links {
+  padding: 0;
+}
+#user-login-form .openid-links {
+  padding-left: 0.5em; /* LTR */
+}
+#user-login-form .openid-links li.user-link {
+  padding-left: 1em; /* LTR */
+}
 
 /**
  * User profiles.
diff --git a/themes/seven/style.css b/themes/seven/style.css
index c84fe5906..074a06dc4 100644
--- a/themes/seven/style.css
+++ b/themes/seven/style.css
@@ -110,7 +110,7 @@ ul,
 .item-list ul {
   list-style-type: disc;
   list-style-image: none;
-  margin: 0.25em 0 0.25em 1.5em;
+  margin: 0.25em 0 0.25em 1.5em; /* LTR */
 }
 .item-list ul li,
 li.leaf,
@@ -966,3 +966,11 @@ div.add-or-remove-shortcuts {
 #block-node-recent .more-link {
   padding: 0 5px 5px 0;
 }
+
+/* User login block */
+#user-login-form .openid-links {
+  margin-left: 0; /* LTR */
+}
+#user-login-form .openid-links .user-link {
+  margin-left: 1.5em; /* LTR */
+}