From c157e7ffa4d1e9a62e24a367b91b35ed38cf4b65 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 5 Jan 2018 02:17:36 -0500 Subject: [PATCH] Improve connectors settings display - Move settings templates to subfolder - Add accordion display to "General Theme Settings" in frio - Replace hand-written template with form field includes - Simplify sprintf(t()) structures --- mod/settings.php | 132 +++++++----------- view/templates/settings-end.tpl | 1 - .../addons.tpl} | 0 .../connectors.tpl} | 19 +++ .../display.tpl} | 0 view/templates/settings/display_end.tpl | 0 .../features.tpl} | 0 .../{settings-head.tpl => settings/head.tpl} | 0 .../nick_set.tpl} | 0 .../oauth.tpl} | 0 .../oauth_edit.tpl} | 0 .../pagetypes.tpl} | 0 view/templates/{ => settings}/settings.tpl | 0 view/templates/settings_display_end.tpl | 1 - view/templates/settings_nick_subdir.tpl | 7 - .../frio/templates/settings/connectors.tpl | 70 ++++++++++ .../display.tpl} | 0 .../features.tpl} | 0 .../oauth.tpl} | 0 .../oauth_edit.tpl} | 0 .../templates/{ => settings}/settings.tpl | 0 .../display_end.tpl} | 0 .../{settings-head.tpl => settings/head.tpl} | 0 .../templates/{ => settings}/settings.tpl | 0 .../display_end.tpl} | 0 .../{settings-head.tpl => settings/head.tpl} | 0 26 files changed, 136 insertions(+), 94 deletions(-) delete mode 100644 view/templates/settings-end.tpl rename view/templates/{settings_addons.tpl => settings/addons.tpl} (100%) rename view/templates/{settings_connectors.tpl => settings/connectors.tpl} (64%) rename view/templates/{settings_display.tpl => settings/display.tpl} (100%) create mode 100644 view/templates/settings/display_end.tpl rename view/templates/{settings_features.tpl => settings/features.tpl} (100%) rename view/templates/{settings-head.tpl => settings/head.tpl} (100%) rename view/templates/{settings_nick_set.tpl => settings/nick_set.tpl} (100%) rename view/templates/{settings_oauth.tpl => settings/oauth.tpl} (100%) rename view/templates/{settings_oauth_edit.tpl => settings/oauth_edit.tpl} (100%) rename view/templates/{settings_pagetypes.tpl => settings/pagetypes.tpl} (100%) rename view/templates/{ => settings}/settings.tpl (100%) delete mode 100644 view/templates/settings_display_end.tpl delete mode 100644 view/templates/settings_nick_subdir.tpl create mode 100644 view/theme/frio/templates/settings/connectors.tpl rename view/theme/frio/templates/{settings_display.tpl => settings/display.tpl} (100%) rename view/theme/frio/templates/{settings_features.tpl => settings/features.tpl} (100%) rename view/theme/frio/templates/{settings_oauth.tpl => settings/oauth.tpl} (100%) rename view/theme/frio/templates/{settings_oauth_edit.tpl => settings/oauth_edit.tpl} (100%) rename view/theme/frio/templates/{ => settings}/settings.tpl (100%) rename view/theme/frost-mobile/templates/{settings_display_end.tpl => settings/display_end.tpl} (100%) rename view/theme/frost-mobile/templates/{settings-head.tpl => settings/head.tpl} (100%) rename view/theme/frost-mobile/templates/{ => settings}/settings.tpl (100%) rename view/theme/frost/templates/{settings_display_end.tpl => settings/display_end.tpl} (100%) rename view/theme/frost/templates/{settings-head.tpl => settings/head.tpl} (100%) diff --git a/mod/settings.php b/mod/settings.php index 5a430e39d..75775e905 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -36,7 +36,7 @@ function settings_init(App $a) { // These lines provide the javascript needed by the acl selector - $tpl = get_markup_template("settings-head.tpl"); + $tpl = get_markup_template('settings/head.tpl'); $a->page['htmlhead'] .= replace_macros($tpl,array( '$ispublic' => t('everybody') )); @@ -683,7 +683,7 @@ function settings_content(App $a) { if (($a->argc > 1) && ($a->argv[1] === 'oauth')) { if (($a->argc > 2) && ($a->argv[2] === 'add')) { - $tpl = get_markup_template("settings_oauth_edit.tpl"); + $tpl = get_markup_template('settings/oauth_edit.tpl'); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_oauth"), '$title' => t('Add application'), @@ -709,7 +709,7 @@ function settings_content(App $a) { } $app = $r[0]; - $tpl = get_markup_template("settings_oauth_edit.tpl"); + $tpl = get_markup_template('settings/oauth_edit.tpl'); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_oauth"), '$title' => t('Add application'), @@ -743,7 +743,7 @@ function settings_content(App $a) { local_user()); - $tpl = get_markup_template("settings_oauth.tpl"); + $tpl = get_markup_template('settings/oauth.tpl'); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_oauth"), '$baseurl' => System::baseUrl(true), @@ -771,7 +771,7 @@ function settings_content(App $a) { call_hooks('plugin_settings', $settings_addons); - $tpl = get_markup_template("settings_addons.tpl"); + $tpl = get_markup_template('settings/addons.tpl'); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_addon"), '$title' => t('Plugin Settings'), @@ -792,8 +792,7 @@ function settings_content(App $a) { } } - - $tpl = get_markup_template("settings_features.tpl"); + $tpl = get_markup_template('settings/features.tpl'); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_features"), '$title' => t('Additional Features'), @@ -804,58 +803,22 @@ function settings_content(App $a) { } if (($a->argc > 1) && ($a->argv[1] === 'connectors')) { + $no_intelligent_shortening = intval(PConfig::get(local_user(), 'system', 'no_intelligent_shortening')); + $ostatus_autofriend = intval(PConfig::get(local_user(), 'system', 'ostatus_autofriend')); + $default_group = PConfig::get(local_user(), 'ostatus', 'default_group'); + $legacy_contact = PConfig::get(local_user(), 'ostatus', 'legacy_contact'); - $settings_connectors = ''; - $settings_connectors .= '

'. t('General Social Media Settings').'

'; - $settings_connectors .= ''; - $settings_connectors .= '
'; - + $settings_connectors = ''; call_hooks('connector_settings', $settings_connectors); if (is_site_admin()) { - $diasp_enabled = sprintf(t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? t('enabled') : t('disabled'))); - $ostat_enabled = sprintf(t('Built-in support for %s connectivity is %s'), t('GNU Social (OStatus)'), ((Config::get('system', 'ostatus_disabled')) ? t('disabled') : t('enabled'))); + $diasp_enabled = t('Built-in support for %s connectivity is %s', t('Diaspora'), ((Config::get('system', 'diaspora_enabled')) ? t('enabled') : t('disabled'))); + $ostat_enabled = t('Built-in support for %s connectivity is %s', t('GNU Social (OStatus)'), ((Config::get('system', 'ostatus_disabled')) ? t('disabled') : t('enabled'))); } else { $diasp_enabled = ""; $ostat_enabled = ""; @@ -884,7 +847,7 @@ function settings_content(App $a) { $mail_chk = ((DBM::is_result($r)) ? $r[0]['last_check'] : NULL_DATE); - $tpl = get_markup_template("settings_connectors.tpl"); + $tpl = get_markup_template('settings/connectors.tpl'); $mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : ''); @@ -896,6 +859,17 @@ function settings_content(App $a) { '$diasp_enabled' => $diasp_enabled, '$ostat_enabled' => $ostat_enabled, + '$general_settings' => t('General Social Media Settings'), + '$no_intelligent_shortening' => array('no_intelligent_shortening', t('Disable intelligent shortening'), $no_intelligent_shortening, t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.')), + '$ostatus_autofriend' => array('snautofollow', t('Automatically follow any GNU Social (OStatus) followers/mentioners'), $ostatus_autofriend, t('If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user.')), + '$default_group' => Group::displayGroupSelection(local_user(), $default_group, t("Default group for OStatus contacts")), + '$legacy_contact' => array('legacy_contact', t('Your legacy GNU Social account'), $legacy_contact, t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.')), + + '$repair_ostatus_url' => System::baseUrl() . '/repair_ostatus', + '$repair_ostatus_text' => t('Repair OStatus subscriptions'), + + '$settings_connectors' => $settings_connectors, + '$h_imap' => t('Email/Mailbox Setup'), '$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."), '$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $mail_chk, ''), @@ -910,8 +884,6 @@ function settings_content(App $a) { '$mail_action' => array('mail_action', t('Action after import:'), $mail_action, '', array(0=>t('None'), /*1=>t('Delete'),*/ 2=>t('Mark as seen'), 3=>t('Move to folder'))), '$mail_movetofolder' => array('mail_movetofolder', t('Move to folder:'), $mail_movetofolder, ''), '$submit' => t('Save Settings'), - - '$settings_connectors' => $settings_connectors )); call_hooks('display_settings', $o); @@ -993,7 +965,7 @@ function settings_content(App $a) { $theme_config = theme_content($a); } - $tpl = get_markup_template("settings_display.tpl"); + $tpl = get_markup_template('settings/display.tpl'); $o = replace_macros($tpl, array( '$ptitle' => t('Display Settings'), '$form_security_token' => get_form_security_token("settings_display"), @@ -1023,7 +995,7 @@ function settings_content(App $a) { '$theme_config' => $theme_config, )); - $tpl = get_markup_template("settings_display_end.tpl"); + $tpl = get_markup_template('settings/display_end.tpl'); $a->page['end'] .= replace_macros($tpl, array( '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes) )); @@ -1082,7 +1054,7 @@ function settings_content(App $a) { ($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY)) $a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY; - $pageset_tpl = get_markup_template('settings_pagetypes.tpl'); + $pageset_tpl = get_markup_template('settings/pagetypes.tpl'); $pagetype = replace_macros($pageset_tpl, array( '$account_types' => t("Account Types"), @@ -1158,52 +1130,42 @@ function settings_content(App $a) { $profile_in_net_dir = ''; } - $hide_friends = replace_macros($opt_tpl,array( - '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), + $hide_friends = replace_macros($opt_tpl, array( + '$field' => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))), )); - $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), - + $hide_wall = replace_macros($opt_tpl, array( + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))), )); - $blockwall = replace_macros($opt_tpl,array( - '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), - + $blockwall = replace_macros($opt_tpl, array( + '$field' => array('blockwall', t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); - $blocktags = replace_macros($opt_tpl,array( - '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), - + $blocktags = replace_macros($opt_tpl, array( + '$field' => array('blocktags', t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))), )); - $suggestme = replace_macros($opt_tpl,array( - '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), - + $suggestme = replace_macros($opt_tpl, array( + '$field' => array('suggestme', t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))), )); - $unkmail = replace_macros($opt_tpl,array( - '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), - + $unkmail = replace_macros($opt_tpl, array( + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))), )); - $invisible = (((!$profile['publish']) && (!$profile['net-publish'])) - ? true : false); - - if ($invisible) { + if (!$profile['publish'] && !$profile['net-publish']) { info(t('Profile is not published.') . EOL); } - //$subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . 'profile/' . $nickname : ''); - - $tpl_addr = get_markup_template("settings_nick_set.tpl"); + $tpl_addr = get_markup_template('settings/nick_set.tpl'); $prof_addr = replace_macros($tpl_addr,array( - '$desc' => sprintf(t("Your Identity Address is '%s' or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), System::baseUrl().'/profile/'.$nickname), + '$desc' => t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . $a->get_hostname() . $a->get_path(), System::baseUrl() . '/profile/' . $nickname), '$basepath' => $a->get_hostname() )); - $stpl = get_markup_template('settings.tpl'); + $stpl = get_markup_template('settings/settings.tpl'); $expire_arr = array( 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), diff --git a/view/templates/settings-end.tpl b/view/templates/settings-end.tpl deleted file mode 100644 index 8b1378917..000000000 --- a/view/templates/settings-end.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/templates/settings_addons.tpl b/view/templates/settings/addons.tpl similarity index 100% rename from view/templates/settings_addons.tpl rename to view/templates/settings/addons.tpl diff --git a/view/templates/settings_connectors.tpl b/view/templates/settings/connectors.tpl similarity index 64% rename from view/templates/settings_connectors.tpl rename to view/templates/settings/connectors.tpl index bdb928f5b..58306fb27 100644 --- a/view/templates/settings_connectors.tpl +++ b/view/templates/settings/connectors.tpl @@ -7,6 +7,25 @@
+ +

{{$general_settings}}

+ + +
+ {{$settings_connectors}} {{if $mail_disabled}} diff --git a/view/templates/settings_display.tpl b/view/templates/settings/display.tpl similarity index 100% rename from view/templates/settings_display.tpl rename to view/templates/settings/display.tpl diff --git a/view/templates/settings/display_end.tpl b/view/templates/settings/display_end.tpl new file mode 100644 index 000000000..e69de29bb diff --git a/view/templates/settings_features.tpl b/view/templates/settings/features.tpl similarity index 100% rename from view/templates/settings_features.tpl rename to view/templates/settings/features.tpl diff --git a/view/templates/settings-head.tpl b/view/templates/settings/head.tpl similarity index 100% rename from view/templates/settings-head.tpl rename to view/templates/settings/head.tpl diff --git a/view/templates/settings_nick_set.tpl b/view/templates/settings/nick_set.tpl similarity index 100% rename from view/templates/settings_nick_set.tpl rename to view/templates/settings/nick_set.tpl diff --git a/view/templates/settings_oauth.tpl b/view/templates/settings/oauth.tpl similarity index 100% rename from view/templates/settings_oauth.tpl rename to view/templates/settings/oauth.tpl diff --git a/view/templates/settings_oauth_edit.tpl b/view/templates/settings/oauth_edit.tpl similarity index 100% rename from view/templates/settings_oauth_edit.tpl rename to view/templates/settings/oauth_edit.tpl diff --git a/view/templates/settings_pagetypes.tpl b/view/templates/settings/pagetypes.tpl similarity index 100% rename from view/templates/settings_pagetypes.tpl rename to view/templates/settings/pagetypes.tpl diff --git a/view/templates/settings.tpl b/view/templates/settings/settings.tpl similarity index 100% rename from view/templates/settings.tpl rename to view/templates/settings/settings.tpl diff --git a/view/templates/settings_display_end.tpl b/view/templates/settings_display_end.tpl deleted file mode 100644 index 8b1378917..000000000 --- a/view/templates/settings_display_end.tpl +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/templates/settings_nick_subdir.tpl b/view/templates/settings_nick_subdir.tpl deleted file mode 100644 index 49fad536c..000000000 --- a/view/templates/settings_nick_subdir.tpl +++ /dev/null @@ -1,7 +0,0 @@ - -

-It appears that your website is located in a subdirectory of the
-{{$hostname}} website, so this setting may not work reliably.
-

-

If you have any issues, you may have better results using the profile
address '{{$baseurl}}/profile/{{$nickname}}'. -

\ No newline at end of file diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl new file mode 100644 index 000000000..c388a6e25 --- /dev/null +++ b/view/theme/frio/templates/settings/connectors.tpl @@ -0,0 +1,70 @@ +
+ {{* include the title template for the settings title *}} + {{include file="section_title.tpl" title=$title}} + +

{{$diasp_enabled}}

+

{{$ostat_enabled}}

+ + + + +
+
+ +
+
+ + {{include file="field_checkbox.tpl" field=$no_intelligent_shortening}} + {{include file="field_checkbox.tpl" field=$ostatus_autofriend}} + {{$default_group}} + {{include file="field_input.tpl" field=$legacy_contact}} + +

{{$repair_ostatus_text}}

+ +
+ +
+
+
+
+
+
+ + {{$settings_connectors}} + +{{if $mail_disabled}} + +{{else}} + +

{{$h_imap}}

+ + +{{/if}} + + +
\ No newline at end of file diff --git a/view/theme/frio/templates/settings_display.tpl b/view/theme/frio/templates/settings/display.tpl similarity index 100% rename from view/theme/frio/templates/settings_display.tpl rename to view/theme/frio/templates/settings/display.tpl diff --git a/view/theme/frio/templates/settings_features.tpl b/view/theme/frio/templates/settings/features.tpl similarity index 100% rename from view/theme/frio/templates/settings_features.tpl rename to view/theme/frio/templates/settings/features.tpl diff --git a/view/theme/frio/templates/settings_oauth.tpl b/view/theme/frio/templates/settings/oauth.tpl similarity index 100% rename from view/theme/frio/templates/settings_oauth.tpl rename to view/theme/frio/templates/settings/oauth.tpl diff --git a/view/theme/frio/templates/settings_oauth_edit.tpl b/view/theme/frio/templates/settings/oauth_edit.tpl similarity index 100% rename from view/theme/frio/templates/settings_oauth_edit.tpl rename to view/theme/frio/templates/settings/oauth_edit.tpl diff --git a/view/theme/frio/templates/settings.tpl b/view/theme/frio/templates/settings/settings.tpl similarity index 100% rename from view/theme/frio/templates/settings.tpl rename to view/theme/frio/templates/settings/settings.tpl diff --git a/view/theme/frost-mobile/templates/settings_display_end.tpl b/view/theme/frost-mobile/templates/settings/display_end.tpl similarity index 100% rename from view/theme/frost-mobile/templates/settings_display_end.tpl rename to view/theme/frost-mobile/templates/settings/display_end.tpl diff --git a/view/theme/frost-mobile/templates/settings-head.tpl b/view/theme/frost-mobile/templates/settings/head.tpl similarity index 100% rename from view/theme/frost-mobile/templates/settings-head.tpl rename to view/theme/frost-mobile/templates/settings/head.tpl diff --git a/view/theme/frost-mobile/templates/settings.tpl b/view/theme/frost-mobile/templates/settings/settings.tpl similarity index 100% rename from view/theme/frost-mobile/templates/settings.tpl rename to view/theme/frost-mobile/templates/settings/settings.tpl diff --git a/view/theme/frost/templates/settings_display_end.tpl b/view/theme/frost/templates/settings/display_end.tpl similarity index 100% rename from view/theme/frost/templates/settings_display_end.tpl rename to view/theme/frost/templates/settings/display_end.tpl diff --git a/view/theme/frost/templates/settings-head.tpl b/view/theme/frost/templates/settings/head.tpl similarity index 100% rename from view/theme/frost/templates/settings-head.tpl rename to view/theme/frost/templates/settings/head.tpl