aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-18 15:06:33 -0800
committerFriendika <info@friendika.com>2010-11-18 15:06:33 -0800
commit0c7ae3aeee155425c0e2928ae67df76a7d1fe61e (patch)
tree66f907f8899f588ed42c0d9c01711c93cbe34dd9 /view
parentabc6199c175986c6d3f7b8b7944f1c3c1ec26163 (diff)
downloadvolse-hubzilla-0c7ae3aeee155425c0e2928ae67df76a7d1fe61e.tar.gz
volse-hubzilla-0c7ae3aeee155425c0e2928ae67df76a7d1fe61e.tar.bz2
volse-hubzilla-0c7ae3aeee155425c0e2928ae67df76a7d1fe61e.zip
smooth a few rough edges of openid
Diffstat (limited to 'view')
-rw-r--r--view/en/login.tpl6
-rw-r--r--view/en/settings.tpl4
-rw-r--r--view/theme/default/style.css15
3 files changed, 15 insertions, 10 deletions
diff --git a/view/en/login.tpl b/view/en/login.tpl
index 8fe09e7d3..396a00266 100644
--- a/view/en/login.tpl
+++ b/view/en/login.tpl
@@ -2,12 +2,12 @@
<form action="" method="post" >
<input type="hidden" name="auth-params" value="login" />
<div id="login-name-wrapper">
- <label for="login-name" id="label-login-name">Nickname or Email: </label>
- <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+ <label for="login-name" id="label-login-name">Nickname/Email/OpenID: </label>
+ <input type="text" maxlength="60" name="openid_url" class="openid" id="login-name" value="" />
</div>
<div id="login-name-end" ></div>
<div id="login-password-wrapper">
- <label for="login-password" id="label-login-password">Password: </label>
+ <label for="login-password" id="label-login-password">Password (if not OpenID): </label>
<input type="password" maxlength="60" name="password" id="login-password" value="" />
</div>
<div id="login-password-end"></div>
diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index f1926c004..734effc0c 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -128,8 +128,8 @@ Leave password fields blank unless changing
<div id="settings-confirm-end" ></div>
<div id="settings-openid-wrapper" >
-<label id="settings-openid-label" for="settings-openid" >(optional) OpenID: </label>
-<input type="text" id="settings-openid" class="openid" name="openid_url" value="$openid" />
+<label id="settings-openid-label" for="settings-openid" >OpenID: </label>
+<input type="text" id="settings-openid" class="openid" name="openid_url" value="$openid" />&nbsp;(Optional) Allow this OpenID to login to this account.
</div>
<div id="settings-openid-end" ></div>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index bd2e41849..ee73cd114 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -379,19 +379,24 @@ footer {
#label-login-name, #label-login-password, #login-extra-filler {
float: left;
- width: 150px;
+ width: 200px;
margin-bottom: 20px;
}
-#login-name, #login-password {
+#login-password {
+ float: left;
+ width: 170px;
+}
+
+#login-name {
float: left;
width: 150px;
}
#register-link, #lost-password-link {
float: left;
- font-size: 0.7em;
+ font-size: 80%;
margin-right: 15px;
}
@@ -400,8 +405,8 @@ footer {
}
#login-submit-button {
- margin-top: 10px;
- margin-left: 150px;
+/* margin-top: 10px; */
+ margin-left: 200px;
}
input#dfrn-url {