Merge remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / theme / smoothly / login.tpl

diff --git a/view/theme/smoothly/login.tpl b/view/theme/smoothly/login.tpl
index c5ce615393d60bd6b341ae662eb840848a86a37b..281890f4236f5e1d1a0e76bf2936c5ffe9eea901 100644 (file)
--- a/view/theme/smoothly/login.tpl
+++ b/view/theme/smoothly/login.tpl
@@ -1,35 +1,30 @@
+<img style="float:left; margin:5px 20px 0 0" src="/images/friendica-128.png" title="friendica">
+
 <div class="login-form">
 <form action="$dest_url" method="post" >
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       <img style="float:left; margin-right:20px" src="/images/friendica-128.png" title="friendica">
-       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+               {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+               {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
-       
+
        {{ if $openid }}
-                       <br />
-                       <div id="login_openid">
+               <div id="login_openid">
                        {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-                       </div>
+               </div>
        {{ endif }}
 
-<!--   <br />
-       <div class="login-extra-links">
-       By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-       </div>
--->
-
-       <br />
        <div id="login-submit-wrapper" >
                <input type="submit" name="submit" id="login-submit-button" value="$login" />
        </div>
 
        <br /><br />
        <div class="login-extra-links">
-               {{ if $register }}      <a href="register" title="$register.title" id="register-link">$register.desc</a><br />
-               {{ endif }}             <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+               {{ if $register }}      
+                       <a href="register" title="$register.title" id="register-link">$register.desc</a><br />
+                       <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+               {{ endif }}
        </div>
        
        {{ for $hiddens as $k=>$v }}