aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-03-01 16:21:32 +0100
committerMario Vavti <mario@mariovavti.com>2015-03-01 16:21:32 +0100
commitb4a2f764abbc551f84fd5f6a4265e1d71c343569 (patch)
treee04b4f89f61870f32b12c2bcc1ed2f7751e66c7b /view
parent6e64f9af54c6af4fd93afb4d7d7a1594bfb55913 (diff)
downloadvolse-hubzilla-b4a2f764abbc551f84fd5f6a4265e1d71c343569.tar.gz
volse-hubzilla-b4a2f764abbc551f84fd5f6a4265e1d71c343569.tar.bz2
volse-hubzilla-b4a2f764abbc551f84fd5f6a4265e1d71c343569.zip
fix login
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css68
-rwxr-xr-xview/tpl/login.tpl36
2 files changed, 18 insertions, 86 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 95a5d6fc1..f049e10dc 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -277,75 +277,11 @@ footer {
margin-bottom: 10px;
}
-#main-login {
+#login-main {
+ max-width: 300px;
margin-top: 50px;
}
-#main-login #id_username, #main-login #id_password {
- width: 200px;
- padding: 10px;
- float: left;
-}
-
-#main-login #id_remember {
- float: left;
- padding: 0;
- margin-bottom: 0;
- margin-left: 0;
- width: 20px;
-}
-
-#main-login .field.checkbox > label {
- margin-bottom: 0;
- float: left;
- width: 100px;
- padding-left: 0;
-}
-
-#main-login .field_end {
- clear: both;
-}
-
-#main-login .field.input label, #main-login .field.password label {
- float: left;
- width: 100px;
-}
-
-#login_standard {
- width: 350px;
- float: left;
-}
-
-
-#login_standard input,
-#login_openid input {
- width: 180px;
-}
-
-#login-extra-links {
- clear: both;
- width: 300px;
-}
-
-#register-link {
- float: left;
- margin-left: 100px;
-}
-#lost-password-link {
- float: right;
-}
-
-#login-standard-end {
- clear: both;
-}
-
-#login-submit-button {
-
- margin-left: 100px;
- margin-top: 10px;
-}
-
-
#cropimage-wrapper, #cropimage-preview-wrapper {
float: left;
padding: 30px;
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index f6f48e138..7bde90c23 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,33 +1,29 @@
-
<form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
<input type="hidden" name="auth-params" value="login" />
-
- <div id="login_standard">
- {{include file="field_input.tpl" field=$lname}}
- {{include file="field_password.tpl" field=$lpassword}}
- </div>
+ <div id="login-main">
+ <div id="login_standard">
+ {{include file="field_input.tpl" field=$lname}}
+ {{include file="field_password.tpl" field=$lpassword}}
+ </div>
- <div id="login-extra-links">
- {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
- <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
- </div>
-
- <div class="clear"></div>
+ <div id="login-extra-links">
+ {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>&nbsp;|{{/if}}
+ <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+ </div>
+ <div class="clear"></div>
- {{include file="field_checkbox.tpl" field=$remember}}
+ {{include file="field_checkbox.tpl" field=$remember}}
- <div id="login-standard-end"></div>
+ <div class="clear"></div>
- <div id="login-submit-wrapper" >
- <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" />
+ <div id="login-submit-wrapper" >
+ <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" />
+ </div>
</div>
-
+
{{foreach $hiddens as $k=>$v}}
<input type="hidden" name="{{$k}}" value="{{$v}}" />
{{/foreach}}
-
-
</form>
-
<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>