Changed OpenID registration

[friendica.git] / view / templates / login.tpl

diff --git a/view/templates/login.tpl b/view/templates/login.tpl
index e1e8c5f3a6cc581c9b38afef16848583c1871577..733c218164a764397721219f7973c64a61d15742 100644 (file)
--- a/view/templates/login.tpl
+++ b/view/templates/login.tpl
@@ -4,11 +4,14 @@
 <div id="login-group" role="group" aria-labelledby="login-head">
        <input type="hidden" name="auth-params" value="login" />
 
-       <div id="login-head" class="sr-only">{{$login}}</div>
+       <h3 id="login-head" class="sr-only">{{$login}}</h3>
 
        <div id="login_standard">
        {{include file="field_input.tpl" field=$lname}}
        {{include file="field_password.tpl" field=$lpassword}}
+       <div id="login-lost-password-link">
+               <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+       </div>
        </div>
        
        {{if $openid}}
@@ -17,23 +20,24 @@
                </div>
        {{/if}}
 
-       {{include file="field_checkbox.tpl" field=$lremember}}
-
-       <div id="login-extra-links">
-               {{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>{{/if}}
-               <a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
-       </div>
-       
        <div id="login-submit-wrapper" >
-               <input type="submit" name="submit" id="login-submit-button" value="{{$login|escape:'html'}}" />
+               <input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
        </div>
+
+       {{include file="field_checkbox.tpl" field=$lremember}}
        
        {{foreach $hiddens as $k=>$v}}
-               <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
+               <input type="hidden" name="{{$k}}" value="{{$v}}" />
        {{/foreach}}
        
 </div>
 </form>
 
+{{if $register}}
+<div id="login-extra-links">
+       <h3 id="login-head" class="sr-only">{{$register.title}}</h3>
+       <a href="{{$register.url}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>
+</div>
+{{/if}}
 
 <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>