From 94f03efde0ed32dbd1ad90a79fe9f92f926d1da3 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 2 Sep 2017 17:49:55 +0200 Subject: [PATCH] Frio: add register template --- view/theme/frio/css/style.css | 9 +++ view/theme/frio/php/default.php | 2 +- view/theme/frio/templates/login.tpl | 62 ++++++++------- view/theme/frio/templates/profile_publish.tpl | 23 ++++++ view/theme/frio/templates/register.tpl | 75 +++++++++++++++++++ 5 files changed, 138 insertions(+), 33 deletions(-) create mode 100644 view/theme/frio/templates/profile_publish.tpl create mode 100644 view/theme/frio/templates/register.tpl diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index c782e62335..fd443a2bcd 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2679,6 +2679,15 @@ section.help-content-wrapper li { font-size: 0.96em; } +/* Register Page*/ +#register-openid-wrapper, #register-name-wrapper, #register-invite-wrapper, #profile-publish-wrapper { + margin-top: 20px; +} +#register-openid-end, #register-nickname-end +{ + margin-top: 40px; +} + /* * Overwriting for transparency and other colors */ diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index f07ffaecba..d4d18e797e 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -84,7 +84,7 @@ else <div class="container"> <div class="row"> <?php - if(($_REQUEST['pagename'] != "register") && ($_REQUEST['pagename'] != "lostpass") && ($_REQUEST['pagename'] != "login") && ($_SERVER['REQUEST_URI'] != "/")) + if(($_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) { echo" <aside class=\"col-lg-3 col-md-3 offcanvas-sm offcanvas-xs\"> diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl index 1615294c8d..a5e9b519e7 100644 --- a/view/theme/frio/templates/login.tpl +++ b/view/theme/frio/templates/login.tpl @@ -1,40 +1,38 @@ - <form id="login-form" action="{{$dest_url}}" role="form" method="post" > -<div id="login-group" role="group" aria-labelledby="login-head"> - <input type="hidden" name="auth-params" value="login" /> + <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> + <div id="login-head" class="sr-only">{{$login}}</div> + + <div id="login_standard"> + {{include file="field_input.tpl" field=$lname}} + {{include file="field_password.tpl" field=$lpassword}} + </div> + + {{if $openid}} + <div id="login_openid"> + {{include file="field_openid.tpl" field=$lopenid}} + </div> + {{/if}} + + {{include file="field_checkbox.tpl" field=$lremember}} + + <div id="login-extra-links" class="list-unstyled"> + {{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" class="pull-right">{{$lostlink}}</a> + </div> + + <div id="login-submit-wrapper" class="pull-right" > + <button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button> + </div> + <div class="clear"></div> + + {{foreach $hiddens as $k=>$v}} + <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" /> + {{/foreach}} - <div id="login_standard"> - {{include file="field_input.tpl" field=$lname}} - {{include file="field_password.tpl" field=$lpassword}} </div> - - {{if $openid}} - <div id="login_openid"> - {{include file="field_openid.tpl" field=$lopenid}} - </div> - {{/if}} - - {{include file="field_checkbox.tpl" field=$lremember}} - - <div id="login-extra-links" class="list-unstyled"> - {{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" class="pull-right">{{$lostlink}}</a> - </div> - - <div id="login-submit-wrapper" class="pull-right" > - <button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button> - </div> - <div class="clear"></div> - - {{foreach $hiddens as $k=>$v}} - <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" /> - {{/foreach}} - -</div> </form> - <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> diff --git a/view/theme/frio/templates/profile_publish.tpl b/view/theme/frio/templates/profile_publish.tpl new file mode 100644 index 0000000000..bf14cf58ab --- /dev/null +++ b/view/theme/frio/templates/profile_publish.tpl @@ -0,0 +1,23 @@ + +<div id="profile-publish-wrapper"> + <h5 id="profile-publish-desc-{{$instance}}"> + {{$pubdesc}} + </h5> + + <div id="profile-publish-yes-wrapper-{{$instance}}" class="field radio"> + <div class="radio"> + <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1"/> + <label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label> + </div> + <div id="profile-publish-break-{{$instance}}"></div> + </div> + + <div id="profile-publish-no-wrapper-{{$instance}}" class="field radio"> + <div class="radio"> + <input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"/> + <label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label> + </div> + + <div id="profile-publish-end-{{$instance}}"></div> + </div> +</div> diff --git a/view/theme/frio/templates/register.tpl b/view/theme/frio/templates/register.tpl new file mode 100644 index 0000000000..c91870e706 --- /dev/null +++ b/view/theme/frio/templates/register.tpl @@ -0,0 +1,75 @@ + +<div class="generic-page-wrapper"> + + <form action="register" method="post" id="register-form"> + + <input type="hidden" name="photo" value="{{$photo}}" /> + <input type="hidden" name="form_security_token" value="{{$form_security_token}}"> + + <h3 class="heading">{{$regtitle}}</h3> + + {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/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'}}"> + <span class="help-block" id="openid_url_tip">{{$fillwith}} {{$fillext}}</span> + </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> + <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> + </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'}}"> + </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 $passwords}} + {{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> + </div> + <div id="register-nickname-end" ></div> + + {{if $permonly}} + {{include file="field_textarea.tpl" field=$permonlybox}} + {{/if}} + + {{$publish}} + + <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> + </div> + <div id="register-submit-end" class="clear"></div> + + <h3>{{$importh}}</h3> + <div id ="import-profile"> + <a href="uimport">{{$importt}}</a> + </div> + </form> + + {{$license}} +</div>