diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/field_checkbox.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/field_colorinput.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_custom.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/field_input.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/field_intcheckbox.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_password.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_select.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/field_select_disabled.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/field_select_grouped.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/field_select_raw.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_textarea.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/field_themeselect.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/group_selection.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/login.tpl | 36 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 308 | ||||
| -rwxr-xr-x | view/tpl/settings_nick_set.tpl | 4 |
16 files changed, 226 insertions, 218 deletions
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 7a2781be0..b6edd8288 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,4 +1,6 @@ - <div class='field checkbox'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.3}}</span> + <div class="form-group field checkbox"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> + <span class="help-block">{{$field.3}}</span> </div> + <div class="clear"></div> diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index a1e912186..9b6f33462 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,6 +1,6 @@ - <div class='field input color'> - <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> - <input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> + <div class='form-group field input color'> + <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> <div id='end_{{$field.0}}' class='field_end'></div> </div> diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index 754f5b2f4..907b4c50e 100755 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,5 +1,5 @@ - <div class='field custom'> - <label class="mainlabel" for='{{$field.0}}'>{{$field.1}}</label> + <div class='form-group field custom'> + <label for='{{$field.0}}'>{{$field.1}}</label> {{$field.2}} - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index be6e3f047..e4756c218 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,6 @@ - <div class='field input'> - <label class="mainlabel" for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> - <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span> - <div id='end_{{$field.0}}' class='field_end'></div> + <div class='form-group field input'> + <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> + <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> + <div class="clear"></div> </div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 847783518..565f97760 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,4 +1,6 @@ - <div class='field checkbox'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <div><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div><span class='field_help'>{{$field.4}}</span> + <div class="form-group field checkbox"> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div> + <span class='help-block'>{{$field.4}}</span> </div> + <div class="clear"></div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 38ecf3d07..c9f4c5f6d 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ - <div class='field password'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> - <span class='field_help'>{{$field.3}}</span> + <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}}"> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 95d1855d6..762447290 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,7 +1,7 @@ - <div class='field select'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}'> + <div class='form-group field select'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl index e241be895..ee5e1508f 100644 --- a/view/tpl/field_select_disabled.tpl +++ b/view/tpl/field_select_disabled.tpl @@ -1,7 +1,7 @@ - <div class='field select'> - <label class="mainlabel" style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> - <select disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> + <div class='form-group field select'> + <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl index c7fb4f322..e6d1479de 100644 --- a/view/tpl/field_select_grouped.tpl +++ b/view/tpl/field_select_grouped.tpl @@ -1,6 +1,6 @@ - <div class='field select'> + <div class='form-group field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}'> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $group=>$opts}} <optgroup label='{{$group}}'> {{foreach $opts as $opt=>$val}} @@ -8,5 +8,5 @@ {{/foreach}} </optgroup> </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 74d575bd0..2780df58c 100755 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,7 +1,7 @@ - <div class='field select'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}'> + <div class='form-group field select'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{$field.4}} </select> - <span class='field_help'>{{$field.3}}</span> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index dad89a145..01fdc23f5 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ - <div class='field textarea'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <textarea name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> - <span class='field_help'>{{$field.3}}</span> + <div class='form-group field textarea'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <textarea class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> + <span class='help-block'>{{$field.3}}</span> </div> diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index 120727478..200cf726b 100755 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,7 +1,7 @@ <script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> - <div class='field select'> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> - <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > + <div class='form-group field select'> + <label for='id_{{$field.0}}'>{{$field.1}}</label> + <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> <span class='field_help'>{{$field.3}}</span> diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl index 2223125ea..270d2aa79 100755 --- a/view/tpl/group_selection.tpl +++ b/view/tpl/group_selection.tpl @@ -1,6 +1,6 @@ -<div class="field custom"> +<div class="form-group field custom"> <label for="group-selection" id="group-selection-lbl">{{$label}}</label> -<select name="group-selection" id="group-selection" > +<select class="form-control" name="group-selection" id="group-selection" > {{foreach $groups as $group}} <option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option> {{/foreach}} diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index f6f48e138..7bde90c23 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,33 +1,29 @@ - <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> - - <div id="login_standard"> - {{include file="field_input.tpl" field=$lname}} - {{include file="field_password.tpl" field=$lpassword}} - </div> + <div id="login-main"> + <div id="login_standard"> + {{include file="field_input.tpl" field=$lname}} + {{include file="field_password.tpl" field=$lpassword}} + </div> - <div id="login-extra-links"> - {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}} - <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> - </div> - - <div class="clear"></div> + <div id="login-extra-links"> + {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a> |{{/if}} + <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> + </div> + <div class="clear"></div> - {{include file="field_checkbox.tpl" field=$remember}} + {{include file="field_checkbox.tpl" field=$remember}} - <div id="login-standard-end"></div> + <div class="clear"></div> - <div id="login-submit-wrapper" > - <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" /> + <div id="login-submit-wrapper" > + <input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" /> + </div> </div> - + {{foreach $hiddens as $k=>$v}} <input type="hidden" name="{{$k}}" value="{{$v}}" /> {{/foreach}} - - </form> - <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 894f0fe83..3d13dc5de 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,152 +1,160 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$ptitle}}</h1> - -{{$nickname_block}} - -<form action="settings" id="settings-form" method="post" autocomplete="off" > -<input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> - -<h3 class="settings-heading">{{$h_basic}}</h3> - -{{include file="field_input.tpl" field=$username}} -{{include file="field_select_grouped.tpl" field=$timezone}} -{{include file="field_input.tpl" field=$defloc}} -{{include file="field_checkbox.tpl" field=$allowloc}} - -{{include file="field_checkbox.tpl" field=$adult}} - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> - - -<h3 class="settings-heading">{{$h_prv}}</h3> - -{{include file="field_select_grouped.tpl" field=$role}} - -<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> -{{include file="field_checkbox.tpl" field=$hide_presence}} - -<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> - -<div class="collapse well" id="settings-permissions-wrapper"> - -{{foreach $permiss_arr as $permit}} - {{include file="field_select.tpl" field=$permit}} -{{/foreach}} - <div class="settings-submit-wrapper" > - <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <button title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" type="submit" formaction="removeme"><i class="icon-trash"></i> {{$removeme}}</button> + <h2>{{$ptitle}}</h2> + <div class="clear"></div> </div> -</div> - -<div id="settings-default-perms" class="settings-default-perms" > - <button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> - {{$aclselect}} - <div id="settings-default-perms-menu-end"></div> -</div> -<br/> -<div id="settings-default-perms-end"></div> - -{{$group_select}} - -{{$profile_in_dir}} - -</div> - -<div class="settings-common-perms"> - - - -{{$suggestme}} - -{{include file="field_checkbox.tpl" field=$blocktags}} - - -{{include file="field_input.tpl" field=$expire}} - -</div> - - - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> - - - -<h3 class="settings-heading">{{$h_not}}</h3> -<div id="settings-notifications"> - -<div id="settings-activity-desc">{{$activity_options}}</div> -{{*not yet implemented *}} -{{*include file="field_checkbox.tpl" field=$post_joingroup*}} -{{include file="field_checkbox.tpl" field=$post_newfriend}} -{{include file="field_checkbox.tpl" field=$post_profilechange}} - - -<div id="settings-notify-desc">{{$lbl_not}}</div> - -<div class="group"> -{{include file="field_intcheckbox.tpl" field=$notify1}} -{{include file="field_intcheckbox.tpl" field=$notify2}} -{{include file="field_intcheckbox.tpl" field=$notify3}} -{{include file="field_intcheckbox.tpl" field=$notify4}} -{{include file="field_intcheckbox.tpl" field=$notify5}} -{{include file="field_intcheckbox.tpl" field=$notify6}} -{{include file="field_intcheckbox.tpl" field=$notify7}} -{{include file="field_intcheckbox.tpl" field=$notify8}} -</div> - -<div id="settings-vnotify-desc">{{$lbl_vnot}}</div> - -<div class="group"> -{{include file="field_intcheckbox.tpl" field=$vnotify1}} -{{include file="field_intcheckbox.tpl" field=$vnotify2}} -{{include file="field_intcheckbox.tpl" field=$vnotify3}} -{{include file="field_intcheckbox.tpl" field=$vnotify4}} -{{include file="field_intcheckbox.tpl" field=$vnotify5}} -{{include file="field_intcheckbox.tpl" field=$vnotify6}} -{{include file="field_intcheckbox.tpl" field=$vnotify10}} -{{include file="field_intcheckbox.tpl" field=$vnotify7}} -{{include file="field_intcheckbox.tpl" field=$vnotify8}} -{{include file="field_intcheckbox.tpl" field=$vnotify9}} -{{include file="field_intcheckbox.tpl" field=$vnotify11}} -{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} - -{{*include file="field_intcheckbox.tpl" field=$vnotify11*}} -</div> - -{{include file="field_input.tpl" field=$evdays}} - - - -</div> - -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> - - -{{if $menus}} -<h3 class="settings-heading">{{$lbl_misc}}</h3> - - - -<div id="settings-menu-desc">{{$menu_desc}}</div> -<div class="settings-channel-menu-div"> -<select name="channel_menu" class="settings-channel-menu-sel"> -{{foreach $menus as $menu }} -<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> -{{/foreach}} -</select> -</div> -<div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> -</div> -<div id="settings-channel-menu-end"></div> -{{/if}} -<div id="settings-remove-account-link"> -<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeme">{{$removeme}}</button> -</div> - + {{$nickname_block}} + <form action="settings" id="settings-form" method="post" autocomplete="off" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> + <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="basic-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse"> + {{$h_basic}} + </a> + </h3> + </div> + <div id="basic-settings-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="basic-settings"> + <div class="section-content-tools-wrapper"> + {{include file="field_input.tpl" field=$username}} + {{include file="field_select_grouped.tpl" field=$timezone}} + {{include file="field_input.tpl" field=$defloc}} + {{include file="field_checkbox.tpl" field=$allowloc}} + {{include file="field_checkbox.tpl" field=$adult}} + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> + </div> + </div> + </div> + </div> + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="privacy-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse" aria-expanded="true" aria-controls="privacy-settings-collapse"> + {{$h_prv}} + </a> + </h3> + </div> + <div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> + <div class="section-content-tools-wrapper"> + {{include file="field_select_grouped.tpl" field=$role}} + + <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> + {{include file="field_checkbox.tpl" field=$hide_presence}} + <button type="button" class="btn btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> + + <div class="collapse well" id="settings-permissions-wrapper"> + + {{foreach $permiss_arr as $permit}} + {{include file="field_select.tpl" field=$permit}} + {{/foreach}} + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> + </div> + </div> + + <div id="settings-default-perms" class="settings-default-perms" > + <button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$aclselect}} + <div id="settings-default-perms-menu-end"></div> + </div> + <div id="settings-default-perms-end"></div> + {{$group_select}} + {{$profile_in_dir}} + </div> + <div class="settings-common-perms"> + {{$suggestme}} + {{include file="field_checkbox.tpl" field=$blocktags}} + {{include file="field_input.tpl" field=$expire}} + </div> + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> + </div> + </div> + </div> + </div> + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="notification-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse" aria-expanded="true" aria-controls="notification-settings-collapse"> + {{$h_not}} + </a> + </h3> + </div> + <div id="notification-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="notification-settings"> + <div class="section-content-tools-wrapper"> + <div id="settings-notifications"> + <div id="settings-activity-desc">{{$activity_options}}</div> + <div class="group"> + {{*not yet implemented *}} + {{*include file="field_checkbox.tpl" field=$post_joingroup*}} + {{include file="field_checkbox.tpl" field=$post_newfriend}} + {{include file="field_checkbox.tpl" field=$post_profilechange}} + </div> + <div id="settings-notify-desc">{{$lbl_not}}</div> + <div class="group"> + {{include file="field_intcheckbox.tpl" field=$notify1}} + {{include file="field_intcheckbox.tpl" field=$notify2}} + {{include file="field_intcheckbox.tpl" field=$notify3}} + {{include file="field_intcheckbox.tpl" field=$notify4}} + {{include file="field_intcheckbox.tpl" field=$notify5}} + {{include file="field_intcheckbox.tpl" field=$notify6}} + {{include file="field_intcheckbox.tpl" field=$notify7}} + {{include file="field_intcheckbox.tpl" field=$notify8}} + </div> + <div id="settings-vnotify-desc">{{$lbl_vnot}}</div> + <div class="group"> + {{include file="field_intcheckbox.tpl" field=$vnotify1}} + {{include file="field_intcheckbox.tpl" field=$vnotify2}} + {{include file="field_intcheckbox.tpl" field=$vnotify3}} + {{include file="field_intcheckbox.tpl" field=$vnotify4}} + {{include file="field_intcheckbox.tpl" field=$vnotify5}} + {{include file="field_intcheckbox.tpl" field=$vnotify6}} + {{include file="field_intcheckbox.tpl" field=$vnotify10}} + {{include file="field_intcheckbox.tpl" field=$vnotify7}} + {{include file="field_intcheckbox.tpl" field=$vnotify8}} + {{include file="field_intcheckbox.tpl" field=$vnotify9}} + {{include file="field_intcheckbox.tpl" field=$vnotify11}} + {{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} + + {{*include file="field_intcheckbox.tpl" field=$vnotify11*}} + </div> + {{include file="field_input.tpl" field=$evdays}} + </div> + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> + </div> + </div> + </div> + </div> + {{if $menus}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings"> + <h3> + <a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse"> + {{$lbl_misc}} + </a> + </h3> + </div> + <div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> + <div class="section-content-wrapper"> + <div class="form-group"> + <label for="channel_menu">{{$menu_desc}}</label> + <select name="channel_menu" class="form-control"> + {{foreach $menus as $menu }} + <option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> + {{/foreach}} + </select> + </div> + <div class="settings-submit-wrapper" > + <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> + </div> + </div> + </div> + </div> + {{/if}} + </div> + </form> </div> diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index ae11c00c8..2460952fe 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,4 +1,4 @@ -<div id="settings-nick-wrapper" > -<div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div> +<div id="settings-nick-wrapper" class="section-content-info-wrapper"> +<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div> </div> <div id="settings-nick-end" ></div> |