aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/settings.tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-04-23 19:49:41 -0700
committerfriendica <info@friendica.com>2015-04-23 19:49:41 -0700
commit6679734135fb04f4a7beccb81663bf1e9574f062 (patch)
tree887488543d98b5dd297d917718bdd99844e83ba5 /view/tpl/settings.tpl
parent08b757a22cd2804bfec8ecf682b6987b8c06ca49 (diff)
parentc696860cc53bc25558d83de5eda65d9b583da382 (diff)
downloadvolse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.gz
volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.bz2
volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.zip
Merge branch 'master' into tres
Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
Diffstat (limited to 'view/tpl/settings.tpl')
-rwxr-xr-xview/tpl/settings.tpl312
1 files changed, 162 insertions, 150 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 894f0fe83..eb497bbb5 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,152 +1,164 @@
-<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">
+ <a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
+ <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" >
+ <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+ </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}};">
+ <div class="form-group">
+ <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
+ </div>
+ <div class="modal" id="apsModal">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+ <h4 class="modal-title">{{$lbl_p2macro}}</h4>
+ </div>
+ <div class="modal-body">
+ {{foreach $permiss_arr as $permit}}
+ {{include file="field_select.tpl" field=$permit}}
+ {{/foreach}}
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div><!-- /.modal-dialog -->
+ </div><!-- /.modal -->
+ <div id="settings-default-perms" class="form-group" >
+ <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i>&nbsp;{{$permissions}}</button>
+ {{$aclselect}}
+ </div>
+ {{$group_select}}
+ {{include file="field_checkbox.tpl" field=$hide_presence}}
+ {{$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" >
+ <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+ </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">
+ <h3>{{$activity_options}}</h3>
+ <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>
+ <h3>{{$lbl_not}}</h3>
+ <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>
+ <h3>{{$lbl_vnot}}</h3>
+ <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_input.tpl" field=$evdays}}
+ </div>
+ </div>
+ <div class="settings-submit-wrapper" >
+ <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+ </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>