aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-11-28 20:58:23 -0800
committerFriendika <info@friendika.com>2010-11-28 20:58:23 -0800
commit62bb471ba0bf8d996e4548b835cd23fa3da92696 (patch)
tree55b9839eaad40bf7dac0ddba94c27da7f7dec015 /view
parent34a8fb935d9619c5114981862dfe2949a90f09bb (diff)
downloadvolse-hubzilla-62bb471ba0bf8d996e4548b835cd23fa3da92696.tar.gz
volse-hubzilla-62bb471ba0bf8d996e4548b835cd23fa3da92696.tar.bz2
volse-hubzilla-62bb471ba0bf8d996e4548b835cd23fa3da92696.zip
localise login template, allow openid to be disabled
Diffstat (limited to 'view')
-rw-r--r--view/en/settings.tpl3
-rw-r--r--view/login.tpl (renamed from view/en/login.tpl)10
-rw-r--r--view/register.tpl3
-rw-r--r--view/theme/default/style.css5
4 files changed, 12 insertions, 9 deletions
diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 734effc0c..095dd70a4 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -128,8 +128,7 @@ 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" >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.
+ $oidhtml
</div>
<div id="settings-openid-end" ></div>
diff --git a/view/en/login.tpl b/view/login.tpl
index 396a00266..78f624eed 100644
--- a/view/en/login.tpl
+++ b/view/login.tpl
@@ -2,23 +2,23 @@
<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/Email/OpenID: </label>
- <input type="text" maxlength="60" name="openid_url" class="openid" id="login-name" value="" />
+ <label for="login-name" id="label-login-name">$namelabel</label>
+ <input type="text" maxlength="60" name="openid_url" class="$classname" 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 (if not OpenID): </label>
+ <label for="login-password" id="label-login-password">$passlabel</label>
<input type="password" maxlength="60" name="password" id="login-password" value="" />
</div>
<div id="login-password-end"></div>
<div id="login-extra-links">
<div id="login-extra-filler">&nbsp;</div>
$register_html
- <a href="lostpass" title="Lost your password?" id="lost-password-link" >Password Reset</a>
+ <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div>
<div id="login-extra-end"></div>
<div id="login-submit-wrapper" >
- <input type="submit" name="submit" id="login-submit-button" value="Login" />
+ <input type="submit" name="submit" id="login-submit-button" value="$login" />
</div>
<div id="login-submit-end"></div>
</form>
diff --git a/view/register.tpl b/view/register.tpl
index b4d1e31d2..08da5112d 100644
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -11,8 +11,7 @@
<p id="register-fill-ext">$fillext</p>
<div id="register-openid-wrapper" >
- <label for="register-openid" id="label-register-openid" >$oidlabel</label>
- <input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
+ $oidhtml
</div>
<div id="register-openid-end" ></div>
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 831772659..a7896eb35 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -404,6 +404,11 @@ footer {
width: 153px;
}
+#login-name.no-openid {
+ float: left;
+ width: 170px;
+}
+
#register-link, #lost-password-link {
float: left;
font-size: 80%;