diff options
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/admin_site.tpl | 24 | ||||
| -rw-r--r-- | view/tpl/register.tpl | 45 |
2 files changed, 32 insertions, 37 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 0fff7029a..b6fd2348d 100644 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -5,11 +5,11 @@ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{include file="field_input.tpl" field=$sitename}} - + {{include file="field_input.tpl" field=$location}} {{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$siteinfo}} {{include file="field_textarea.tpl" field=$admininfo}} - + {{include file="field_select.tpl" field=$access_policy}} {{include file="field_input.tpl" field=$reply_address}} {{include file="field_input.tpl" field=$from_email}} {{include file="field_input.tpl" field=$from_email_name}} @@ -33,21 +33,19 @@ {{include file="field_input.tpl" field=$register_text}} {{include file="field_select_grouped.tpl" field=$role}} {{include file="field_select.tpl" field=$register_policy}} - {{include file="field_checkbox.tpl" field=$register_wo_email}} + {{** include file="field_checkbox.tpl" field=$register_wo_email **}} {{include file="register_duty.tpl" field=$register_duty}} {{include file="field_input.tpl" field=$register_perday}} - {{include file="field_input.tpl" field=$register_sameip}} + {{** include file="field_input.tpl" field=$register_sameip **}} {{$reg_delay}} {{$reg_expire}} {{include file="field_checkbox.tpl" field=$reg_autochannel}} {{include file="field_checkbox.tpl" field=$invitation_only}} {{include file="field_checkbox.tpl" field=$invitation_also}} {{include file="field_checkbox.tpl" field=$verify_email}} - {{include file="field_input.tpl" field=$abandon_days}} + {{include file="field_input.tpl" field=$minimum_age}} - {{include file="field_select.tpl" field=$access_policy}} - {{include file="field_input.tpl" field=$location}} - {{include file="field_input.tpl" field=$sellpage}} + {{** include file="field_input.tpl" field=$sellpage **}} {{include file="field_input.tpl" field=$first_page}} <div class="submit"> @@ -62,6 +60,7 @@ {{include file="field_checkbox.tpl" field=$open_pubstream}} {{include file="field_textarea.tpl" field=$incl}} {{include file="field_textarea.tpl" field=$excl}} + {{include file="field_input.tpl" field=$abandon_days}} <div class="submit"> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /></div> @@ -80,6 +79,7 @@ {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$default_expire_days}} {{include file="field_input.tpl" field=$active_expire_days}} + <div class="submit"> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /> @@ -127,12 +127,4 @@ } }); }); - // [hilmar-> - $('head').append( - '<style> '+ - ' .zuiqmid { font-weight: normal; font-family: monospace; }'+ - ' .zui_n { width: 5em; text-align: center; }'+ - ' .zuia { cursor: pointer; font-weight: bold; }'+ - '</style>'); - // <-hilmar] </script> diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index b38507f92..d6f70d118 100644 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -5,9 +5,10 @@ <div class="section-content-wrapper"> <form action="register" method="post" id="register-form"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - {{if $reg_is || $other_sites || $now}} + {{if $reg_is || $other_sites || $now || $msg}} <div class="section-content-warning-wrapper"> - <h3>{{$now}}</h3> + <div class="h3">{{$now}}</div> + <div id="register-desc" class="descriptive-paragraph">{{$msg}}</div> <div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div> <div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div> </div> @@ -18,6 +19,26 @@ </div> {{/if}} + {{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}} + + <div class="position-relative"> + <div id="name-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div> + {{include file="field_input.tpl" field=[$name.0,$name.1,"","","",$atform]}} + </div> + <div class="position-relative"> + <div id="nick-spinner" class="spinner-wrapper position-absolute" style="top: 2.5rem; right: 0.5rem;"><div class="spinner s"></div></div> + {{include file="field_input.tpl" field=[$nickname.0,$nickname.1,"","","",$atform]}} + </div> + {{/if}} + <div> {{if $invitations}} <a id="zar014" href="javascript:;" style="display: inline-block;">{{$haveivc}}</a> @@ -33,22 +54,6 @@ {{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.0,$name.1,"","","",$atform]}} - <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> - - {{include file="field_input.tpl" field=[$nickname.0,$nickname.1,"","","",$atform]}} - <div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> - {{/if}} {{if $enable_tos}} {{include file="field_checkbox.tpl" field=[$tos.0,$tos.1,"","","",$atform]}} @@ -59,8 +64,6 @@ <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" {{$atform}}>{{$submit}}</button> <div id="register-submit-end" class="register-field-end"></div> </form> - <br /> - <div class="descriptive-text">{{$verify_note}} {{$msg}}</div> </div> </div> {{* @@ -76,7 +79,7 @@ {{$tao}} - var week_days = ['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday']; + var week_days = ['Monday', 'Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday']; $('.register_date').each( function () { var date = new Date($(this).data('utc')); $(this).html(date.toLocaleString(undefined, {weekday: 'short', hour: 'numeric', minute: 'numeric'})); |