Fix review points

[friendica.git] / view / theme / frio / templates / register.tpl

diff --git a/view/theme/frio/templates/register.tpl b/view/theme/frio/templates/register.tpl
index 670f5d11ef0ab6b8953a65223dfe45871520b0fe..6ef70b3e6726eebb3b6f0f1d82f700c78e71df97 100644 (file)
--- a/view/theme/frio/templates/register.tpl
+++ b/view/theme/frio/templates/register.tpl
@@ -1,4 +1,3 @@
-
 <div class="generic-page-wrapper">
 
        <form action="register" method="post" id="register-form">
@@ -8,57 +7,72 @@
 
                <h3 class="heading">{{$regtitle}}</h3>
 
-               {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
+               {{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}}</div>{{/if}}
 
+               {{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
 
                {{if $oidlabel}}
                <div id="register-openid-wrapper" class="form-group">
-                       <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="openid_url" class="openid form-control" id="register-openid" value="{{$openid|escape:'html'}}">
+                       <label for="register-openid" id="label-register-openid">{{$oidlabel}}</label>
+                       <input type="text" maxlength="60" size="32" name="openid_url" class="openid form-control" id="register-openid" value="{{$openid}}">
                        <span class="help-block" id="openid_url_tip">{{$fillwith}}&nbsp;{{$fillext}}</span>
                </div>
-               <div id="register-openid-end" ></div>
+               <div id="register-openid-end"></div>
                {{/if}}
 
                {{if $invitations}}
                <div id="register-invite-wrapper" class="form-group">
-                       <label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+                       <label for="register-invite" id="label-register-invite">{{$invite_label}}</label>
                        <input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" class="form-control" value="{{$invite_id}}">
-                       <span class="help-block" id="invite_id_tip">{{$invite_desc}}</span>
+                       <span class="help-block" id="invite_id_tip">{{$invite_desc nofilter}}</span>
                </div>
-               <div id="register-name-end" ></div>
+               <div id="register-name-end"></div>
                {{/if}}
 
                <div id="register-name-wrapper" class="form-group">
-                       <label for="register-name" id="label-register-name" >{{$namelabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username|escape:'html'}}">
+                       <label for="register-name" id="label-register-name">{{$namelabel}}</label>
+                       <input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username}}" required>
                </div>
-               <div id="register-name-end" ></div>
+               <div id="register-name-end"></div>
 
 
-               <div id="register-email-wrapper" class="form-group">
-                       <label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="email" id="register-email" class="form-control" value="{{$email|escape:'html'}}">
-               </div>
-               <div id="register-email-end" ></div>
+               {{if !$additional}}
+                       <div id="register-email-wrapper" class="form-group">
+                               <label for="register-email" id="label-register-email">{{$addrlabel}}</label>
+                               <input type="text" maxlength="60" size="32" name="field1" id="register-email" class="form-control" value="{{$email}}" required>
+                       </div>
+                       <div id="register-email-end"></div>
 
-               {{if $passwords}}
+                       <div id="register-repeat-wrapper" class="form-group">
+                               <label for="register-repeat" id="label-register-repeat">{{$addrlabel2}}</label>
+                               <input type="text" maxlength="60" size="32" name="repeat" id="register-repeat" class="form-control" value="" required>
+                       </div>
+                       <div id="register-repeat-end"></div>
+               {{/if}}
+
+               {{if $ask_password}}
                {{include file="field_password.tpl" field=$password1}}
                {{include file="field_password.tpl" field=$password2}}
                {{/if}}
 
                <div id="register-nickname-wrapper" class="form-group">
-                       <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname|escape:'html'}}">
-                       <span class="help-block" id="nickname_tip">{{$nickdesc}}</span>
+                       <label for="register-nickname" id="label-register-nickname">{{$nicklabel}}</label>
+                       <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname}}" required>
+                       <span class="help-block" id="nickname_tip">{{$nickdesc nofilter}}</span>
                </div>
-               <div id="register-nickname-end" ></div>
+               <div id="register-nickname-end"></div>
+
+               {{if $additional}}
+                       {{include file="field_password.tpl" field=$parent_password}}
+               {{/if}}
+
+               <input type="input" id=tarpit" name="email" style="display: none;" placeholder="Don't enter anything here"/>
 
                {{if $permonly}}
                {{include file="field_textarea.tpl" field=$permonlybox}}
                {{/if}}
 
-               {{$publish}}
+               {{$publish nofilter}}
 
                {{if $showtoslink}}
                <p><a href="{{$baseurl}}/tos">{{$tostext}}</a></p>
@@ -66,20 +80,20 @@
                {{if $showprivstatement}}
                <h4>{{$privstatement.0}}</h4>
                {{for $i=1 to 3}}
-               <p>{{$privstatement[$i]}}</p>
+               <p>{{$privstatement[$i] nofilter}}</p>
                {{/for}}
                {{/if}}
 
                <div id="register-submit-wrapper" class="pull-right">
-                       <button type="submit" name="submit" id="register-submit-button" class="btn btn-primary" value="{{$regbutt|escape:'html'}}">{{$regbutt|escape:'html'}}</button>
+                       <button type="submit" name="submit" id="register-submit-button" class="btn btn-primary" value="{{$regbutt}}">{{$regbutt}}</button>
                </div>
                <div id="register-submit-end" class="clear"></div>
 
-               <h3>{{$importh}}</h3>
-               <div id ="import-profile">
-                       <a href="uimport">{{$importt}}</a>
-               </div>
+               {{if !$additional}}
+                       <h3>{{$importh}}</h3>
+                       <div id ="import-profile">
+                               <a href="uimport">{{$importt}}</a>
+                       </div>
+               {{/if}}
        </form>
-
-       {{$license}}
 </div>