Merge https://github.com/friendica/red into pending_merge

1 files changed, 6 insertions, 16 deletions

diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 7bde90c23..9472bd961 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,29 +1,19 @@
 <form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
 	<div id="login-main">
-		<div id="login_standard">
-		{{include file="field_input.tpl" field=$lname}}
-		{{include file="field_password.tpl" field=$lpassword}}
+		<div id="login-input" class="form-group">
+			{{include file="field_input.tpl" field=$lname}}
+			{{include file="field_password.tpl" field=$lpassword}}
+			{{include file="field_checkbox.tpl" field=$remember}}
+			<button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
 		</div>
-	
 		<div id="login-extra-links">
-			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>&nbsp;|{{/if}}
+			{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
 			<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
 		</div>
-		<div class="clear"></div>
-
-		{{include file="field_checkbox.tpl" field=$remember}}
-	
-		<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>
 	</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>