From 11a7a08b9d98073a3dcb012bea4ec32e8baf649d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 6 Nov 2017 17:08:48 -0800 Subject: [PATCH 01/10] bring back tabindex to submit comments --- view/js/main.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index 882f50e8a..c3873d823 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -32,7 +32,12 @@ function handle_comment_form(e) { var fields_empty = true; if(form.find('.comment-edit-text').length) { - form.find('.comment-edit-text').addClass('expanded').removeAttr('placeholder'); + var commentElm = form.find('.comment-edit-text').attr('id'); + var submitElm = commentElm.replace(/text/,'submit'); + + $('#' + commentElm).addClass('expanded').removeAttr('placeholder'); + $('#' + commentElm).attr('tabindex','9'); + $('#' + submitElm).attr('tabindex','10'); form.find(':not(:visible)').show(); } @@ -43,7 +48,12 @@ function handle_comment_form(e) { fields_empty = false; }); if(fields_empty) { - form.find('.comment-edit-text').removeClass('expanded').attr('placeholder', aStr.comment); + var emptyCommentElm = form.find('.comment-edit-text').attr('id'); + var emptySubmitElm = commentElm.replace(/text/,'submit'); + + $('#' + emptyCommentElm).removeClass('expanded').attr('placeholder', aStr.comment); + $('#' + emptyCommentElm).removeAttr('tabindex'); + $('#' + emptySubmitElm).removeAttr('tabindex'); form.find(':not(.comment-edit-text)').hide(); } }); From 3f1a4b655900d64ad2c13f1906eb77eaf15d11b5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 6 Nov 2017 20:13:14 -0800 Subject: [PATCH 02/10] second half of issue #893 - move channel default permissions to its own module so we can apply different page/widget layouts than for connedit; the relevant functionality is abandoned on mod_connedit but still intact. Trying a slightly different look/behaviour for inherited settings and the associated checkboxes. This may need a bit more tweaking but overall looks a lot cleaner. --- Zotlabs/Module/Defperms.php | 267 ++++++++++++++++++++++++++++++ Zotlabs/Widget/Settings_menu.php | 2 +- view/js/mod_defperms.js | 32 ++++ view/pdl/mod_defperms.pdl | 6 + view/theme/redbasic/css/style.css | 16 ++ view/tpl/defperms.tpl | 55 ++++++ 6 files changed, 377 insertions(+), 1 deletion(-) create mode 100644 Zotlabs/Module/Defperms.php create mode 100644 view/js/mod_defperms.js create mode 100644 view/pdl/mod_defperms.pdl create mode 100755 view/tpl/defperms.tpl diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php new file mode 100644 index 000000000..4e7ddb55a --- /dev/null +++ b/Zotlabs/Module/Defperms.php @@ -0,0 +1,267 @@ + $desc) { + + $checkinherited = \Zotlabs\Access\PermissionLimits::Get(local_channel(),$perm); + $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true); + + if(array_key_exists('perms_' . $perm, $_POST)) { + set_abconfig($channel['channel_id'],$orig_record[0]['abook_xchan'],'my_perms',$perm, + intval($_POST['perms_' . $perm])); + if($autoperms) { + set_pconfig($channel['channel_id'],'autoperms',$perm,intval($_POST['perms_' . $perm])); + } + } + else { + set_abconfig($channel['channel_id'],$orig_record[0]['abook_xchan'],'my_perms',$perm,0); + if($autoperms) { + set_pconfig($channel['channel_id'],'autoperms',$perm,0); + } + } + } + } + + if(! is_null($autoperms)) + set_pconfig($channel['channel_id'],'system','autoperms',$autoperms); + + + notice( t('Settings updated.') . EOL); + + + // Refresh the structure in memory with the new data + + $r = q("SELECT abook.*, xchan.* + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d and abook_id = %d LIMIT 1", + intval(local_channel()), + intval($contact_id) + ); + if($r) { + \App::$poi = $r[0]; + } + + + $this->defperms_clone($a); + + goaway(z_root() . '/defperms'); + + return; + + } + + /* @brief Clone connection + * + * + */ + + function defperms_clone(&$a) { + + if(! \App::$poi) + return; + + $channel = \App::get_channel(); + + $r = q("SELECT abook.*, xchan.* + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d and abook_id = %d LIMIT 1", + intval(local_channel()), + intval(\App::$poi['abook_id']) + ); + if($r) { + \App::$poi = array_shift($r); + } + + $clone = \App::$poi; + + unset($clone['abook_id']); + unset($clone['abook_account']); + unset($clone['abook_channel']); + + $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); + if($abconfig) + $clone['abconfig'] = $abconfig; + + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); + } + + /* @brief Generate content of connection edit page + * + * + */ + + function get() { + + $sort_type = 0; + $o = ''; + + if(! local_channel()) { + notice( t('Permission denied.') . EOL); + return login(); + } + + $section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : ''); + $channel = \App::get_channel(); + + $yes_no = array(t('No'),t('Yes')); + + $connect_perms = \Zotlabs\Access\Permissions::connect_perms(local_channel()); + + $o .= "\n"; + + if(\App::$poi) { + + $sections = []; + + $self = false; + + $tpl = get_markup_template('defperms.tpl'); + + + $perms = array(); + $channel = \App::get_channel(); + + $contact = \App::$poi; + + $global_perms = \Zotlabs\Access\Permissions::Perms(); + + $existing = get_all_perms(local_channel(),$contact['abook_xchan']); + $hidden_perms = []; + + foreach($global_perms as $k => $v) { + $thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k); + + $checkinherited = \Zotlabs\Access\PermissionLimits::Get(local_channel(),$k); + + $inherited = (($checkinherited & PERMS_SPECIFIC) ? false : true); + + $perms[] = [ 'perms_' . $k, $v, intval($thisperm), '', $yes_no, (($inherited) ? ' disabled="disabled" ' : '') ]; + if($inherited) { + $hidden_perms[] = [ 'perms_' . $k, intval($thisperm) ]; + } + } + + $pcat = new \Zotlabs\Lib\Permcat(local_channel()); + $pcatlist = $pcat->listing(); + $permcats = []; + if($pcatlist) { + foreach($pcatlist as $pc) { + $permcats[$pc['name']] = $pc['localname']; + } + } + + $o .= replace_macros($tpl, [ + '$header' => t('Connection Default Permissions'), + '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no), + '$permcat' => [ 'permcat', t('Permission role'), '', '',$permcats ], + '$permcat_new' => t('Add permission role'), + '$permcat_enable' => feature_enabled(local_channel(),'permcats'), + '$section' => $section, + '$sections' => $sections, + '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), + '$autoapprove' => t('Automatic approval settings'), + '$unapproved' => $unapproved, + '$inherited' => t('inherited'), + '$submit' => t('Submit'), + '$me' => t('My Settings'), + '$perms' => $perms, + '$hidden_perms' => $hidden_perms, + '$permlbl' => t('Individual Permissions'), + '$permnote_self' => t('Some individual permissions may have been preset or locked based on your channel type and privacy settings.'), + '$contact_id' => $contact['abook_id'], + '$name' => $contact['xchan_name'], + ]); + + $arr = array('contact' => $contact,'output' => $o); + + call_hooks('contact_edit', $arr); + + return $arr['output']; + + } + } +} diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php index c15ad0980..e15ed96a5 100644 --- a/Zotlabs/Widget/Settings_menu.php +++ b/Zotlabs/Widget/Settings_menu.php @@ -107,7 +107,7 @@ class Settings_menu { if($role === false || $role === 'custom') { $tabs[] = array( 'label' => t('Connection Default Permissions'), - 'url' => z_root() . '/connedit/' . $abook_self_id, + 'url' => z_root() . '/defperms', 'selected' => '' ); } diff --git a/view/js/mod_defperms.js b/view/js/mod_defperms.js new file mode 100644 index 000000000..c89142579 --- /dev/null +++ b/view/js/mod_defperms.js @@ -0,0 +1,32 @@ +$(document).ready(function() { + + $('#id_permcat').change(function() { + $('.loading-role-rotator').show(); + var permName = $('#id_permcat').val(); + loadConnectionRole(permName); + }); + + +}); + + +function loadConnectionRole(name) { + + if(! name) + name = 'default'; + + $('.defperms-edit input').each(function() { + if(! $(this).is(':disabled')) + $(this).removeAttr('checked'); + }); + + $.get('permcat/' + name, function(data) { + $(data.perms).each(function() { + if(this.value) + $('#id_perms_' + this.name).attr('checked','checked'); + }); + $('.loading-role-rotator').hide(); + }); +} + + diff --git a/view/pdl/mod_defperms.pdl b/view/pdl/mod_defperms.pdl new file mode 100644 index 000000000..53a3ac9e5 --- /dev/null +++ b/view/pdl/mod_defperms.pdl @@ -0,0 +1,6 @@ +[region=aside] +[widget=settings_menu][/widget] +[/region] +[region=right_aside] +[widget=notifications][/widget] +[/region] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9f9ece7c3..3228a8b02 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -977,6 +977,11 @@ a .drop-icons:hover { color: #FF0000; } +.perm-inherited { + color: #FF0000; +} + + #menulist { list-style-type: none; } @@ -1639,6 +1644,17 @@ dl.bb-dl > dd > li { background-color: #0275d8; } + +.form-group.checkbox > div > input:disabled + label .onoffswitch-switch { + background-color: red; + border-radius: 3px; + opacity: 0.3; + filter:alpha(opacity=30); + +} + + + .help-searchlist { list-style-type: none; } diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl new file mode 100755 index 000000000..f4a711957 --- /dev/null +++ b/view/tpl/defperms.tpl @@ -0,0 +1,55 @@ +
+
+

{{$header}}

+
+
+
+ + + + +
+
+
+
+
+

{{$autolbl}}

+

{{$permnote_self}}

+
+ {{if $permcat_enable}} + +  {{$permcat_new}} + {{include file="field_select.tpl" field=$permcat}} + {{/if}} + +
+ {{foreach $perms as $prm}} + {{include file="field_checkbox.tpl" field=$prm}} + {{/foreach}} +
+ + {{if $hidden_perms}} + {{foreach $hidden_perms as $prm}} + + {{/foreach}} + {{/if}} + + + +
+
+ {{$autoapprove}} +
+ {{include file="field_checkbox.tpl" field=$autoperms}} +
+ +
+ +
+
+
+
+
+
+
+
From 5376a734d45554fafacb674a725dc2831db1bf14 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 6 Nov 2017 21:55:36 -0800 Subject: [PATCH 03/10] .htignore update --- .gitignore | 3 ++- Zotlabs/Module/Defperms.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0e5233eaf..b001b6b27 100755 --- a/.gitignore +++ b/.gitignore @@ -19,10 +19,11 @@ Thumbs.db -## Ignore RedMatrix site specific files and folders +## Ignore site specific files and folders .htconfig.php favicon.* addon/ +widget/ custom/ /store/ # site apps diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php index 4e7ddb55a..9214331e4 100644 --- a/Zotlabs/Module/Defperms.php +++ b/Zotlabs/Module/Defperms.php @@ -159,7 +159,7 @@ class Defperms extends \Zotlabs\Web\Controller { build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); } - /* @brief Generate content of connection edit page + /* @brief Generate content of connection default permissions page * * */ From 549866c0900c1ff550e001323c59a74352920770 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Nov 2017 10:43:13 +0100 Subject: [PATCH 04/10] add location info to the navbar --- include/nav.php | 12 +++++++----- view/tpl/navbar_default.tpl | 12 +++++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/nav.php b/include/nav.php index af0ebbae2..42c42e881 100644 --- a/include/nav.php +++ b/include/nav.php @@ -27,6 +27,8 @@ function nav($template = 'default') { EOT; + $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + if(local_channel()) { $channel = App::get_channel(); $observer = App::get_observer(); @@ -39,17 +41,17 @@ EOT; intval(get_account_id()) ); } + $sitelocation = (($is_owner) ? '' : App::$profile['reddress']); } - elseif(remote_channel()) + elseif(remote_channel()) { $observer = App::get_observer(); + $sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname()); + } require_once('include/conversation.php'); - $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + $channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']); - $myident = (($channel) ? $channel['xchan_addr'] : ''); - - $sitelocation = (($myident) ? $myident : App::get_hostname()); /** * diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b330993c8..4f0b9a110 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -17,8 +17,8 @@ {{/if}} {{if $userinfo}} -
-
+
+
{{$userinfo.name}}
@@ -60,7 +60,13 @@ {{/if}}
- + + {{$sel.name}} + {{if $sitelocation}} +
+ {{$sitelocation}} + {{/if}} +
{{/if}}
From 1bb6dfc9a03550063d5b25fd804e586d45eb61fa Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Nov 2017 10:58:15 +0100 Subject: [PATCH 05/10] move style out of template --- view/theme/redbasic/css/style.css | 5 +++++ view/tpl/navbar_default.tpl | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9f9ece7c3..fd155c71a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1255,6 +1255,11 @@ img.mail-conv-sender-photo { border-radius: $radius; } +#nav-app-link { + padding: 0 !important; + line-height: 1.175; +} + .page-title { margin: 7px 0px; } diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 4f0b9a110..d02ad2e97 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -60,11 +60,10 @@ {{/if}}
- + {{$sel.name}} {{if $sitelocation}} -
- {{$sitelocation}} +
{{$sitelocation}} {{/if}}
From 47fbdda40951be5109c739f63331e2bb95ebd64a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 7 Nov 2017 11:22:11 +0100 Subject: [PATCH 06/10] rename channel app events to calendar and add nav_set_selected() to /cal --- Zotlabs/Module/Cal.php | 2 ++ include/nav.php | 6 +++--- view/theme/redbasic/css/style.css | 5 +---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 41676ce02..c8403e979 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -69,6 +69,8 @@ class Cal extends \Zotlabs\Web\Controller { notice( t('Permissions denied.') . EOL); return; } + + nav_set_selected('Calendar'); $sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event'); diff --git a/include/nav.php b/include/nav.php index 42c42e881..9df50c9fe 100644 --- a/include/nav.php +++ b/include/nav.php @@ -440,10 +440,10 @@ function channel_apps($is_owner = false, $nickname = null) { if($p['view_stream'] && $cal_link) { $tabs[] = [ - 'label' => t('Events'), + 'label' => t('Calendar'), 'url' => z_root() . $cal_link, - 'sel' => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''), - 'title' => t('Events'), + 'sel' => ((argv(0) == 'cal') ? 'active' : ''), + 'title' => t('Calendar'), 'id' => 'event-tab', 'icon' => 'calendar' ]; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fd155c71a..1b991ce17 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -161,10 +161,6 @@ nav { filter:alpha(opacity=$nav_percent_min_opacity); } -#nav-app-link { - white-space: nowrap; -} - #powered-by { font-size: 0.5rem; position: absolute; @@ -1258,6 +1254,7 @@ img.mail-conv-sender-photo { #nav-app-link { padding: 0 !important; line-height: 1.175; + white-space: nowrap; } .page-title { From 9d584fc72062422ec38a6321aedb7ca43f4ea429 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 Nov 2017 08:57:30 +0100 Subject: [PATCH 07/10] truncate nav-app-link if appropriate --- view/css/bootstrap-red.css | 2 +- view/theme/redbasic/css/style.css | 5 +++++ view/tpl/navbar_default.tpl | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 2dfc9e07b..18efd69e4 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -19,7 +19,6 @@ nav .dropdown-menu { } } - @media screen and (max-width: 767px) { .navbar { padding: .5rem 7px; @@ -41,6 +40,7 @@ nav .dropdown-menu { .navbar-toggler-right { padding: 0.2rem 0; + white-space: nowrap; } #navbar-collapse-1 i { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0fe823b7e..22a619959 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1262,6 +1262,11 @@ img.mail-conv-sender-photo { white-space: nowrap; } +#nav-app-link-wrapper { + min-width: 0; + flex-basis: 25%; +} + .page-title { margin: 7px 0px; } diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index d02ad2e97..1f771e5ae 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -59,8 +59,8 @@
{{/if}}
-
- + From a8d527f1cda1c35ca19c7c94435c78d1036e4861 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 8 Nov 2017 11:01:19 +0100 Subject: [PATCH 09/10] only show nav app link if we have a selected app --- view/tpl/navbar_default.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index e4150ba50..994254bc4 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -60,12 +60,14 @@ {{/if}}
{{/if}}
From e7d20efb1b8d579bcb9bdef99205aad19281f6b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 8 Nov 2017 12:00:15 +0100 Subject: [PATCH 10/10] css fixes --- view/theme/redbasic/css/style.css | 10 +++++----- view/tpl/navbar_default.tpl | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 22a619959..6df5a060b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1262,11 +1262,6 @@ img.mail-conv-sender-photo { white-space: nowrap; } -#nav-app-link-wrapper { - min-width: 0; - flex-basis: 25%; -} - .page-title { margin: 7px 0px; } @@ -1504,6 +1499,11 @@ blockquote { left: 0px; } + #nav-app-link-wrapper { + min-width: 0; + flex-basis: 25%; + } + } .shareable_element_text { diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 994254bc4..426d32047 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -59,17 +59,17 @@
{{/if}} +{{if $sel.name}} {{/if}} +{{/if}}
{{if $nav.help.6}}