diff options
| -rw-r--r-- | view/css/mod_settings.css | 57 | ||||
| -rw-r--r-- | view/js/mod_settings.js | 5 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 62 |
3 files changed, 34 insertions, 90 deletions
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 58e13b54f..6af091c8f 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -1,58 +1,3 @@ - -ul#settings-privacy-macros { - list-style-type: none; - margin: 0 0 10px 0; - padding: 0; -} -#settings-privacy-macros li { - margin-top: 5px; -} - -#settings-permissions-wrapper { - margin-top: 15px; -} - -#settings-default-perms { - margin-top: 15px; -} - -#settings-perm-advanced { - margin-top: 15px; -} - -.settings-common-perms { - margin-top: 15px; -} - -.settings-submit-wrapper { - margin-bottom: 10px; -} - -#settings-remove-account-link { - margin-top: 15px; - margin-bottom: 45px; -} - -#settings-notify-desc, #settings-activity-desc, #settings-vnotify-desc { - font-weight: bold; - margin-bottom: 15px; -} - -#settings-menu-desc { - font-weight: bold; - float: left; - width: 350px; -} - -#settings-channel-menu-div select { - float: left; -} - -#settings-channel-menu-end { - clear: both; - margin-bottom: 15px; -} - #dspr-pubcomment-label { float: left; width: 350px; @@ -68,5 +13,5 @@ ul#settings-privacy-macros { } .group { - margin-left: 20px; + margin-left: 10px; } diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index 0db0dd165..5e52d56ab 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -4,11 +4,6 @@ var ispublic = aStr['everybody'] ; $(document).ready(function() { $('form').areYouSure(); // Warn user about unsaved settings - $("a#settings-default-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); - $("#id_permissions_role").change(function() { var role = $("#id_permissions_role").val(); if(role == 'custom') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 3d13dc5de..02937e4b2 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -24,7 +24,7 @@ {{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}} /> + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> </div> @@ -40,28 +40,34 @@ <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 class="form-group"> + <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> </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 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">×</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> {{$permissions}}</button> + {{$aclselect}} </div> - <div id="settings-default-perms-end"></div> {{$group_select}} + {{include file="field_checkbox.tpl" field=$hide_presence}} {{$profile_in_dir}} </div> <div class="settings-common-perms"> @@ -70,7 +76,7 @@ {{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}} /> + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> </div> @@ -86,14 +92,14 @@ <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> + <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> - <div id="settings-notify-desc">{{$lbl_not}}</div> + <h3>{{$lbl_not}}</h3> <div class="group"> {{include file="field_intcheckbox.tpl" field=$notify1}} {{include file="field_intcheckbox.tpl" field=$notify2}} @@ -104,7 +110,7 @@ {{include file="field_intcheckbox.tpl" field=$notify7}} {{include file="field_intcheckbox.tpl" field=$notify8}} </div> - <div id="settings-vnotify-desc">{{$lbl_vnot}}</div> + <h3>{{$lbl_vnot}}</h3> <div class="group"> {{include file="field_intcheckbox.tpl" field=$vnotify1}} {{include file="field_intcheckbox.tpl" field=$vnotify2}} @@ -118,13 +124,11 @@ {{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*}} + {{include file="field_input.tpl" field=$evdays}} </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}} /> + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> </div> @@ -143,9 +147,9 @@ <div class="form-group"> <label for="channel_menu">{{$menu_desc}}</label> <select name="channel_menu" class="form-control"> - {{foreach $menus as $menu }} + {{foreach $menus as $menu }} <option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> - {{/foreach}} + {{/foreach}} </select> </div> <div class="settings-submit-wrapper" > |