diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/field_password.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/new_channel.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/register.tpl | 139 |
3 files changed, 58 insertions, 85 deletions
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index d19bc9414..1643fa855 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ <div class='form-group field password'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span class='help-block'>{{$field.3}}</span> + <span id="help_{{$field.0}}" class="help-block">{{$field.3}}</span> </div> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index f5e97ff27..cc1983ac4 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -19,11 +19,9 @@ {{/if}} {{include file="field_input.tpl" field=$name}} - <div id="newchannel-name-feedback" class="newchannel-feedback"></div> <div id="name-spinner"></div> {{include file="field_input.tpl" field=$nickname}} - <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="nick-spinner"></div> <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 997b4489a..4a827ca16 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -1,83 +1,58 @@ -<div class="generic-content-wrapper-styled"> -<h2>{{$title}}</h2> - -<form action="register" method="post" id="register-form"> - - - -{{if $reg_is}} -<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div> -{{/if}} -{{if $registertext}}<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div> -{{/if}} -{{if $other_sites}}<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div> -{{/if}} - -{{if $invitations}} - <p id="register-invite-desc">{{$invite_desc}}</p> - - <label for="register-invite" id="label-register-invite" class="register-label">{{$label_invite}}</label> - <input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="{{$invite_code}}" /> - <div id="register-invite-feedback" class="register-feedback"></div> - <div id="register-invite-end" class="register-field-end"></div> -{{/if}} - - {{if $auto_create}} - - {{if $default_role}} - <input type="hidden" name="permissions_role" value="{{$default_role}}" /> - {{else}} - <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> - {{include file="field_select_grouped.tpl" field=$role}} - <div id="newchannel-role-end" class="newchannel-field-end"></div> - {{/if}} - <label for="newchannel-name" id="label-newchannel-name" class="register-label" >{{$label_name}}</label> - <input type="text" maxlength="72" size="32" name="name" id="newchannel-name" class="register-input" value="{{$name}}" /> - <div id="name-spinner"></div> - <div id="newchannel-name-feedback" class="register-feedback"></div> - <div id="newchannel-name-end" class="register-field-end"></div> - <div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div> - - - {{/if}} - - <label for="register-email" id="label-register-email" class="register-label" >{{$label_email}}</label> - <input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="{{$email}}" /> - <div id="register-email-feedback" class="register-feedback"></div> - <div id="register-email-end" class="register-field-end"></div> - - <label for="register-password" id="label-register-password" class="register-label" >{{$label_pass1}}</label> - <input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="{{$pass1}}" /> - <div id="register-password-feedback" class="register-feedback"></div> - <div id="register-password-end" class="register-field-end"></div> - - <label for="register-password2" id="label-register-password2" class="register-label" >{{$label_pass2}}</label> - <input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="{{$pass2}}" /> - <div id="register-password2-feedback" class="register-feedback"></div> - <div id="register-password2-end" class="register-field-end"></div> - - {{if $auto_create}} - <label for="newchannel-nickname" id="label-newchannel-nickname" class="register-label" >{{$label_nick}}</label> - <input type="text" maxlength="72" size="32" name="nickname" id="newchannel-nickname" class="register-input" value="{{$nickname}}" /> - <div id="nick-spinner"></div> - <div id="newchannel-nick-desc" style="text-align: right;">{{$nick_hub}}</div> - <div id="newchannel-nickname-feedback" class="register-feedback"></div> - <div id="newchannel-nickname-end" class="register-field-end"></div> - <div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div> - - {{/if}} - - {{if $enable_tos}} - <input type="checkbox" name="tos" id="register-tos" value="1" /> - <label for="register-tos" id="label-register-tos">{{$label_tos}}</label> - <div id="register-tos-feedback" class="register-feedback"></div> - <div id="register-tos-end" class="register-field-end"></div> - {{else}} - <input type="hidden" name="tos" value="1" /> - {{/if}} - - <input type="submit" name="submit" class="btn btn-default" id="register-submit-button" value="{{$submit}}" /> - <div id="register-submit-end" class="register-field-end"></div> - -</form> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + <form action="register" method="post" id="register-form"> + {{if $reg_is}} + <div class="section-content-warning-wrapper"> + <div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div> + <div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div> + </div> + {{/if}} + + {{if $registertext}} + <div id="register-text" class="descriptive-paragraph">{{$registertext}}</div> + {{/if}} + + {{if $invitations}} + <div class="section-content-info-wrapper"> + <div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div> + </div> + {{include file="field_input.tpl" field=$invite_code}} + {{/if}} + + {{include file="field_input.tpl" field=$email}} + + {{include file="field_password.tpl" field=$pass1}} + + {{include file="field_password.tpl" field=$pass2}} + + {{if $auto_create}} + {{if $default_role}} + <input type="hidden" name="permissions_role" value="{{$default_role}}" /> + {{else}} + <div class="section-content-info-wrapper"> + {{$help_role}} + </div> + {{include file="field_select_grouped.tpl" field=$role}} + {{/if}} + + {{include file="field_input.tpl" field=$name}} + <div id="name-spinner"></div> + + {{include file="field_input.tpl" field=$nickname}} + <div id="nick-spinner"></div> + {{/if}} + + {{if $enable_tos}} + {{include file="field_checkbox.tpl" field=$tos}} + {{else}} + <input type="hidden" name="tos" value="1" /> + {{/if}} + + <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button> + <div id="register-submit-end" class="register-field-end"></div> + </form> + </div> </div> |