diff --git a/mod/settings.php b/mod/settings.php index 3832de1b1f..c4e2482939 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -823,44 +823,11 @@ function settings_content(App $a) ]); } + $net_pub_desc = ''; if (strlen(DI::config()->get('system', 'directory'))) { $net_pub_desc = ' ' . DI::l10n()->t('Your profile will also be published in the global friendica directories (e.g. %s).', DI::config()->get('system', 'directory'), DI::config()->get('system', 'directory')); - } else { - $net_pub_desc = ''; } - $profile_in_net_dir = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc] - ]); - - $hide_friends = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')], - ]); - - $hide_wall = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')], - ]); - - $unlisted = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')], - ]); - - $accessiblephotos = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(local_user(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")], - ]); - - $blockwall = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], - ]); - - $blocktags = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], - ]); - - $unkmail = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], - ]); - $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl'); $prof_addr = Renderer::replaceMacros($tpl_addr,[ @@ -870,18 +837,6 @@ function settings_content(App $a) $stpl = Renderer::getMarkupTemplate('settings/settings.tpl'); - $expire_arr = [ - 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')], - 'label' => DI::l10n()->t('Expiration settings'), - 'items' => ['expire_items', DI::l10n()->t('Expire posts'), $expire_items, DI::l10n()->t('When activated, posts and comments will be expired.')], - 'notes' => ['expire_notes', DI::l10n()->t('Expire personal notes'), $expire_notes, DI::l10n()->t('When activated, the personal notes on your profile page will be expired.')], - 'starred' => ['expire_starred', DI::l10n()->t('Expire starred posts'), $expire_starred, DI::l10n()->t('Starring posts keeps them from being expired. That behaviour is overwritten by this setting.')], - 'photos' => ['expire_photos', DI::l10n()->t('Expire photos'), $expire_photos, DI::l10n()->t('When activated, photos will be expired.')], - 'network_only' => ['expire_network_only', DI::l10n()->t('Only expire posts by others'), $expire_network_only, DI::l10n()->t('When activated, your own posts never expire. Then the settings above are only valid for posts you received.')], - ]; - - $group_select = Group::displayGroupSelection(local_user(), $a->user['def_gid']); - // Private/public post links for the non-JS ACL form $private_post = 1; if (!empty($_REQUEST['public']) && !$_REQUEST['public']) { @@ -932,40 +887,32 @@ function settings_content(App $a) '$defloc' => ['defloc', DI::l10n()->t('Default Post Location:'), $defloc, ''], '$allowloc' => ['allow_location', DI::l10n()->t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''], + '$h_prv' => DI::l10n()->t('Security and Privacy Settings'), + '$visibility' => $profile['net-publish'], + '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("\x28to prevent spam abuse\x29")], + '$profile_in_dir' => $profile_in_dir, + '$profile_in_net_dir' => ['profile_in_netdirectory', DI::l10n()->t('Allow your profile to be searchable globally?'), $profile['net-publish'], DI::l10n()->t("Activate this setting if you want others to easily find and follow you. Your profile will be searchable on remote systems. This setting also determines whether Friendica will inform search engines that your profile should be indexed or not.") . $net_pub_desc], + '$hide_friends' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')], + '$hide_wall' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')], + '$unlisted' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')], + '$accessiblephotos' => ['accessible-photos', DI::l10n()->t('Make all posted pictures accessible'), DI::pConfig()->get(local_user(), 'system', 'accessible-photos'), DI::l10n()->t("This option makes every posted picture accessible via the direct link. This is a workaround for the problem that most other networks can't handle permissions on pictures. Non public pictures still won't be visible for the public on your photo albums though.")], + '$blockwall' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')], // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''), + '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''), + '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], + '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")], + '$group_select' => Group::displayGroupSelection(local_user(), $a->user['def_gid']), + '$permissions' => DI::l10n()->t('Default Post Permissions'), + '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user), - '$h_prv' => DI::l10n()->t('Security and Privacy Settings'), - - '$maxreq' => ['maxreq', DI::l10n()->t('Maximum Friend Requests/Day:'), $maxreq , DI::l10n()->t("\x28to prevent spam abuse\x29")], - '$permissions' => DI::l10n()->t('Default Post Permissions'), - '$visibility' => $profile['net-publish'], - '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->user), - '$blockwall'=> $blockwall, // array('blockwall', DI::l10n()->t('Allow friends to post to your profile page:'), !$blockwall, ''), - '$blocktags'=> $blocktags, // array('blocktags', DI::l10n()->t('Allow friends to tag your posts:'), !$blocktags, ''), - - // ACL permissions box - '$group_perms' => DI::l10n()->t('Show to Groups'), - '$contact_perms' => DI::l10n()->t('Show to Contacts'), - '$private' => DI::l10n()->t('Default Private Post'), - '$public' => DI::l10n()->t('Default Public Post'), - '$is_private' => $private_post, - '$return_path' => $query_str, - '$public_link' => $public_post_link, - '$settings_perms' => DI::l10n()->t('Default Permissions for New Posts'), - - '$group_select' => $group_select, - - - '$expire' => $expire_arr, - - '$profile_in_dir' => $profile_in_dir, - '$profile_in_net_dir' => $profile_in_net_dir, - '$hide_friends' => $hide_friends, - '$hide_wall' => $hide_wall, - '$unlisted' => $unlisted, - '$accessiblephotos' => $accessiblephotos, - '$unkmail' => $unkmail, - '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")], - + '$expire' => [ + 'label' => DI::l10n()->t('Expiration settings'), + 'days' => ['expire', DI::l10n()->t("Automatically expire posts after this many days:"), $expire, DI::l10n()->t('If empty, posts will not expire. Expired posts will be deleted')], + 'items' => ['expire_items', DI::l10n()->t('Expire posts'), $expire_items, DI::l10n()->t('When activated, posts and comments will be expired.')], + 'notes' => ['expire_notes', DI::l10n()->t('Expire personal notes'), $expire_notes, DI::l10n()->t('When activated, the personal notes on your profile page will be expired.')], + 'starred' => ['expire_starred', DI::l10n()->t('Expire starred posts'), $expire_starred, DI::l10n()->t('Starring posts keeps them from being expired. That behaviour is overwritten by this setting.')], + 'photos' => ['expire_photos', DI::l10n()->t('Expire photos'), $expire_photos, DI::l10n()->t('When activated, photos will be expired.')], + 'network_only' => ['expire_network_only', DI::l10n()->t('Only expire posts by others'), $expire_network_only, DI::l10n()->t('When activated, your own posts never expire. Then the settings above are only valid for posts you received.')], + ], '$h_not' => DI::l10n()->t('Notification Settings'), '$lbl_not' => DI::l10n()->t('Send a notification email when:'), diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php index 46c0a1384e..a97bc0e7bb 100644 --- a/src/Module/Admin/Features.php +++ b/src/Module/Admin/Features.php @@ -64,15 +64,14 @@ class Features extends BaseAdmin { parent::content($parameters); - $arr = []; - $features = Feature::get(false); + $features = []; - foreach ($features as $fname => $fdata) { - $arr[$fname] = []; - $arr[$fname][0] = $fdata[0]; + foreach (Feature::get(false) as $fname => $fdata) { + $features[$fname] = []; + $features[$fname][0] = $fdata[0]; foreach (array_slice($fdata, 1) as $f) { $set = DI::config()->get('feature', $f[0], $f[3]); - $arr[$fname][1][] = [ + $features[$fname][1][] = [ ['feature_' . $f[0], $f[1], $set, $f[2]], ['featurelock_' . $f[0], DI::l10n()->t('Lock feature %s', $f[1]), $f[4], ''] ]; @@ -82,9 +81,10 @@ class Features extends BaseAdmin $tpl = Renderer::getMarkupTemplate('admin/features.tpl'); $o = Renderer::replaceMacros($tpl, [ '$form_security_token' => parent::getFormSecurityToken("admin_manage_features"), - '$title' => DI::l10n()->t('Manage Additional Features'), - '$features' => $arr, - '$submit' => DI::l10n()->t('Save Settings'), + '$baseurl' => DI::baseUrl()->get(true), + '$title' => DI::l10n()->t('Manage Additional Features'), + '$features' => $features, + '$submit' => DI::l10n()->t('Save Settings'), ]); return $o; diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 501edaf4d9..cf3fee31b1 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -613,7 +613,7 @@ class Site extends BaseAdmin '$worker_title' => DI::l10n()->t('Worker'), '$relay_title' => DI::l10n()->t('Message Relay'), '$relocate' => DI::l10n()->t('Relocate Instance'), - '$relocate_warning' => DI::l10n()->t('Warning! Advanced function. Could make this server unreachable.'), + '$relocate_warning' => DI::l10n()->t('Warning! Advanced function. Could make this server unreachable.'), '$baseurl' => DI::baseUrl()->get(true), // name, label, value, help string, extra data... diff --git a/view/templates/admin/features.tpl b/view/templates/admin/features.tpl index b1c8bad8fc..46a7abea26 100644 --- a/view/templates/admin/features.tpl +++ b/view/templates/admin/features.tpl @@ -1,12 +1,11 @@ -

{{$title}}

-
- + + {{foreach $features as $g => $f}} -

{{$f.0}}

+

{{$f.0}}

{{foreach $f.1 as $fcat}} diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index b6d0c5930d..cb948aabe6 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -1,6 +1,6 @@ -
+

{{$title}} - {{$page}}

- + - - -

{{$h_pending}}

- {{if $pending}} - - - - {{foreach $th_pending as $th}}{{/foreach}} - - - - - + + +

{{$h_pending}}

+ {{if $pending}} +
{{$th}}
+ + + {{foreach $th_pending as $th}} + {{/foreach}} + + + + + {{foreach $pending as $u}} - + {{/foreach}} - -
{{$th}}
{{$u.created}} {{$u.name}} + + - - + + + + + +

{{$pendingnotetext}}: {{$u.note}}
-
{{$select_all}}
-
- {{else}} -

{{$no_pending}}

- {{/if}} - -

{{$h_users}}

- {{if $users}} - - - - - {{foreach $th_users as $th}} + +
+
{{$select_all}}
+
+ + +
+ {{else}} +

{{$no_pending}}

+ {{/if}} + +

{{$h_users}}

+ {{if $users}} + + + + + {{foreach $th_users as $th}} - {{/foreach}} - - - - - - {{foreach $users as $u}} - - - - - - - - - - {{else}} -   - {{/if}} - - {{/foreach}} - -
- {{if $order_users == $th.1}} - {{if $order_direction_users == "+"}} + {{if $order_users == $th.1}} + {{if $order_direction_users == "+"}} ↓ - {{else}} - ↑ - {{/if}} {{else}} - ↕ + ↑ {{/if}} - {{$th.0}} + {{else}} + ↕ + {{/if}} + {{$th.0}} +
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} - {{if $u.is_deletable}} - - {{if $u.is_deletable}} - - - {{else}} -   - {{/if}} -
-
{{$select_all}}
-
- - - -
- {{else}} - NO USERS?!? - {{/if}} - - {{if $deleted}} -

{{$h_deleted}}

- - + + + + + + {{foreach $users as $u}} - - {{foreach $th_deleted as $th}}{{/foreach}} + + + + + + + + + + - - - {{foreach $deleted as $u}} - - - - - - - - - - {{/foreach}} - -
{{$th}}{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} + {{if $u.is_deletable}} + + {{else}} +   + {{/if}} + + {{if $u.is_deletable}} + + + + + + + {{else}} +   + {{/if}} +
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}}
- {{/if}} -

{{$h_newuser}}

-
- - - - - - - - - - - - - -
{{include file="field_input.tpl" field=$newusername}}
{{include file="field_input.tpl" field=$newusernickname}}
{{include file="field_input.tpl" field=$newuseremail}}
-
-
+ {{/foreach}} + + +
{{$select_all}}
+
+ + + +
+ {{else}} + NO USERS?!? + {{/if}} + +{{if $deleted}} +

{{$h_deleted}}

+ + + + + {{foreach $th_deleted as $th}} + + {{/foreach}} + + + + {{foreach $deleted as $u}} + + + + + + + + + + {{/foreach}} + +
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}}
+{{/if}} +

{{$h_newuser}}

+
+ + + + + + + + + + + + + +
{{include file="field_input.tpl" field=$newusername}}
{{include file="field_input.tpl" field=$newusernickname}}
{{include file="field_input.tpl" field=$newuseremail}}
+
+
diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl index 53b4beaad3..08452b124f 100644 --- a/view/templates/settings/connectors.tpl +++ b/view/templates/settings/connectors.tpl @@ -1,59 +1,60 @@ -

{{$title}}

{{$diasp_enabled}}
{{$ostat_enabled}}
- + +

+ {{$general_settings}} +

-

{{$general_settings}}

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

{{$h_imap}}

+ {{else}} + +

{{$h_imap}}

 - + {{/if}} - diff --git a/view/templates/settings/display.tpl b/view/templates/settings/display.tpl index a9f82c16b1..15247d8749 100644 --- a/view/templates/settings/display.tpl +++ b/view/templates/settings/display.tpl @@ -1,35 +1,34 @@ -

{{$ptitle}}

-
- + + -{{include file="field_themeselect.tpl" field=$theme}} -{{include file="field_input.tpl" field=$itemspage_network}} + {{include file="field_themeselect.tpl" field=$theme}} + {{include file="field_input.tpl" field=$itemspage_network}} -{{* Show the mobile theme selection only if mobile themes are available *}} -{{if count($mobile_theme.4) > 1}} -{{include file="field_themeselect.tpl" field=$mobile_theme}} -{{/if}} + {{* Show the mobile theme selection only if mobile themes are available *}} + {{if count($mobile_theme.4) > 1}} + {{include file="field_themeselect.tpl" field=$mobile_theme}} + {{/if}} -{{include file="field_input.tpl" field=$itemspage_mobile_network}} -{{include file="field_input.tpl" field=$ajaxint}} -{{include file="field_checkbox.tpl" field=$no_auto_update}} -{{include file="field_checkbox.tpl" field=$nosmile}} -{{include file="field_checkbox.tpl" field=$infinite_scroll}} -{{include file="field_checkbox.tpl" field=$no_smart_threading}} -{{include file="field_checkbox.tpl" field=$hide_dislike}} + {{include file="field_input.tpl" field=$itemspage_mobile_network}} + {{include file="field_input.tpl" field=$ajaxint}} + {{include file="field_checkbox.tpl" field=$no_auto_update}} + {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$infinite_scroll}} + {{include file="field_checkbox.tpl" field=$no_smart_threading}} + {{include file="field_checkbox.tpl" field=$hide_dislike}} -

{{$calendar_title}}

-{{include file="field_select.tpl" field=$first_day_of_week}} +

{{$calendar_title}}

+ {{include file="field_select.tpl" field=$first_day_of_week}} -
- -
+
+ +
-{{if $theme_config}} -

{{$stitle}}

-{{$theme_config nofilter}} -{{/if}} + {{if $theme_config}} +

{{$stitle}}

+ {{$theme_config nofilter}} + {{/if}}
diff --git a/view/templates/settings/features.tpl b/view/templates/settings/features.tpl index c69670b48d..e96daea2bd 100644 --- a/view/templates/settings/features.tpl +++ b/view/templates/settings/features.tpl @@ -1,22 +1,18 @@ -

{{$title}}

-
- + -{{foreach $features as $f}} -

{{$f.0}}

-
- -{{foreach $f.1 as $fcat}} - {{include file="field_checkbox.tpl" field=$fcat}} -{{/foreach}} -
- -
-
-{{/foreach}} + {{foreach $features as $f}} +

{{$f.0}}

+
+ {{foreach $f.1 as $fcat}} + {{include file="field_checkbox.tpl" field=$fcat}} + {{/foreach}} +
+ +
+
+ {{/foreach}}
- diff --git a/view/templates/settings/profile/index.tpl b/view/templates/settings/profile/index.tpl index 8c89dc1ba2..7188212c0d 100644 --- a/view/templates/settings/profile/index.tpl +++ b/view/templates/settings/profile/index.tpl @@ -97,7 +97,7 @@
-

{{$lbl_custom_fields_section}}

+

{{$lbl_custom_fields_section}}

{{$custom_fields_description nofilter}}
{{foreach $custom_fields as $custom_field}} diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl index fe83ebf0c5..bd0fa5f202 100644 --- a/view/templates/settings/settings.tpl +++ b/view/templates/settings/settings.tpl @@ -2,183 +2,173 @@ {{$nickname_block nofilter}} -
- + + -

{{$h_pass}}

-
-{{include file="field_password.tpl" field=$password1}} -{{include file="field_password.tpl" field=$password2}} -{{include file="field_password.tpl" field=$password3}} +

{{$h_pass}}

+
+ {{include file="field_password.tpl" field=$password1}} + {{include file="field_password.tpl" field=$password2}} + {{include file="field_password.tpl" field=$password3}} -{{if $oid_enable}} -{{include file="field_input.tpl" field=$openid}} -{{/if}} + {{if $oid_enable}} + {{include file="field_input.tpl" field=$openid}} + {{/if}} -
- -
-
+
+ +
+
-

{{$h_basic}}

-
+

{{$h_basic}}

+
-{{include file="field_input.tpl" field=$username}} -{{include file="field_input.tpl" field=$email}} -{{include file="field_password.tpl" field=$password4}} -{{include file="field_custom.tpl" field=$timezone}} -{{include file="field_select.tpl" field=$language}} -{{include file="field_input.tpl" field=$defloc}} -{{include file="field_checkbox.tpl" field=$allowloc}} + {{include file="field_input.tpl" field=$username}} + {{include file="field_input.tpl" field=$email}} + {{include file="field_password.tpl" field=$password4}} + {{include file="field_custom.tpl" field=$timezone}} + {{include file="field_select.tpl" field=$language}} + {{include file="field_input.tpl" field=$defloc}} + {{include file="field_checkbox.tpl" field=$allowloc}} -
- -
-
+
+ +
+
+

{{$h_prv}}

+
-

{{$h_prv}}

-
+ - + {{include file="field_input.tpl" field=$maxreq}} -{{include file="field_input.tpl" field=$maxreq}} + {{$profile_in_dir nofilter}} -{{$profile_in_dir nofilter}} + {{include file="field_checkbox.tpl" field=$profile_in_net_dir}} + {{include file="field_checkbox.tpl" field=$hide_friends}} + {{include file="field_checkbox.tpl" field=$hide_wall}} + {{include file="field_checkbox.tpl" field=$unlisted}} + {{include file="field_checkbox.tpl" field=$accessiblephotos}} + {{include file="field_checkbox.tpl" field=$blockwall}} + {{include file="field_checkbox.tpl" field=$blocktags}} + {{include file="field_checkbox.tpl" field=$unkmail}} + {{include file="field_input.tpl" field=$cntunkmail}} -{{$profile_in_net_dir nofilter}} + {{$group_select nofilter}} -{{$hide_friends nofilter}} +

{{$permissions}}

-{{$hide_wall nofilter}} + {{$aclselect nofilter}} +
+ +
+
-{{$unlisted nofilter}} +

{{$expire.label}}

+
+
+ {{include file="field_input.tpl" field=$expire.days}} + {{include file="field_checkbox.tpl" field=$expire.items}} + {{include file="field_checkbox.tpl" field=$expire.notes}} + {{include file="field_checkbox.tpl" field=$expire.starred}} + {{include file="field_checkbox.tpl" field=$expire.network_only}} -{{$accessiblephotos nofilter}} +
+ +
+
+
-{{$blockwall nofilter}} +

{{$h_not}}

+
+
-{{$blocktags nofilter}} +
{{$lbl_not}}
-{{$unkmail nofilter}} +
+ {{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}} +
-{{include file="field_input.tpl" field=$cntunkmail}} + {{include file="field_checkbox.tpl" field=$email_textonly}} + {{include file="field_checkbox.tpl" field=$detailed_notif}} -{{$group_select nofilter}} + {{include file="field_checkbox.tpl" field=$desktop_notifications}} + -

{{$expire.label}}

-
-
-{{include file="field_input.tpl" field=$expire.days}} -{{include file="field_checkbox.tpl" field=$expire.items}} -{{include file="field_checkbox.tpl" field=$expire.notes}} -{{include file="field_checkbox.tpl" field=$expire.starred}} -{{include file="field_checkbox.tpl" field=$expire.network_only}} +
-
- -
-
-
+
+ +
+
-

{{$h_not}}

-
-
+

{{$h_advn}}

+
+
{{$h_descadvn}}
-
{{$lbl_not}}
+ {{$pagetype nofilter}} -
-{{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}} -
+
+ +
+
-{{include file="field_checkbox.tpl" field=$email_textonly}} -{{include file="field_checkbox.tpl" field=$detailed_notif}} +

{{$importcontact}}

+
+ +
{{$importcontact_text}}
+ -{{include file="field_checkbox.tpl" field=$desktop_notifications}} - - -
- -
- -
-
- -

{{$h_advn}}

-
-
{{$h_descadvn}}
- -{{$pagetype nofilter}} - -
- -
-
- -

{{$importcontact}}

-
- -
{{$importcontact_text}}
- - -
- -
-
- -

{{$relocate}}

-
-
{{$relocate_text}}
- -
- -
-
+
+ +
+
diff --git a/view/theme/frio/css/mod_admin.css b/view/theme/frio/css/mod_admin.css index 76056d4a14..84a42ad6dc 100644 --- a/view/theme/frio/css/mod_admin.css +++ b/view/theme/frio/css/mod_admin.css @@ -1,6 +1,5 @@ #admin-users.adminpage > h1 { padding: 0 15px; } -#admin-users.adminpage .panel-collapse { margin-left: -15px; margin-right: -15px; } #adminpage.adminpage > h1 { padding: 0 15px; } @@ -18,5 +17,8 @@ tr.details th { border-top: 0!important; } -.adminpage td > .checkbox { margin: 0; } +.adminpage td > .checkbox, +.adminpage th > .checkbox { + margin: 0; +} .adminpage td { word-break: break-all; } \ No newline at end of file diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 5ace932ea1..46a633f17a 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2832,11 +2832,6 @@ ul li:hover .contact-wrapper .contact-action-link:hover { margin-bottom: 20px; } -.panel-group-settings > .panel, -.panel-group-settings > form > .panel { - padding-left: 10px; - padding-right: 10px; -} #profile-photo-upload-section { display: none; padding: 10px; @@ -2875,7 +2870,7 @@ details.profile-jot-net[open] summary:before { /* Emulates Bootstrap display */ .settings-block { - margin: 0 -15px 5px; + margin: 0 0 5px; color: #333; background-color: rgba(255,255,255,0.95); border-radius: 4px; @@ -2904,6 +2899,12 @@ details.profile-jot-net[open] summary:before { font-size: 18px; } +.section-subtitle-wrapper > h2 { + font-size: 18px; + margin-top: 10px; + margin-bottom: 10px; +} + .fakelink > h3:before { padding-right: 10px; } diff --git a/view/theme/frio/templates/admin/features.tpl b/view/theme/frio/templates/admin/features.tpl new file mode 100644 index 0000000000..13db0a300c --- /dev/null +++ b/view/theme/frio/templates/admin/features.tpl @@ -0,0 +1,34 @@ +
+

{{$title}}

+ + + {{* We organize the settings in collapsable panel-groups *}} +
+ {{foreach $features as $g => $f}} +
+ +
+
+ {{foreach $f.1 as $fcat}} +
+ {{include file="field_checkbox.tpl" field=$fcat.0}} + {{include file="field_checkbox.tpl" field=$fcat.1}} +
+ {{/foreach}} +
+
+ +
+
+
+ {{/foreach}} +
+ + +
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 902b8a0002..652fe91c33 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -1,4 +1,3 @@ - -
+

{{$title}} - {{$page}}

-
- - -
+
+ + +
-
- {{include file="field_input.tpl" field=$sitename}} - {{include file="field_input.tpl" field=$sender_email}} - {{include file="field_textarea.tpl" field=$banner}} - {{include file="field_input.tpl" field=$shortcut_icon}} - {{include file="field_input.tpl" field=$touch_icon}} - {{include file="field_textarea.tpl" field=$additional_info}} - {{include file="field_select.tpl" field=$language}} - {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$ssl_policy}} - {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}} - {{include file="field_checkbox.tpl" field=$hide_help}} - {{include file="field_select.tpl" field=$singleuser}} +
+ {{include file="field_input.tpl" field=$sitename}} + {{include file="field_input.tpl" field=$sender_email}} + {{include file="field_textarea.tpl" field=$banner}} + {{include file="field_input.tpl" field=$shortcut_icon}} + {{include file="field_input.tpl" field=$touch_icon}} + {{include file="field_textarea.tpl" field=$additional_info}} + {{include file="field_select.tpl" field=$language}} + {{include file="field_select.tpl" field=$theme}} + {{include file="field_select.tpl" field=$theme_mobile}} + {{include file="field_select.tpl" field=$ssl_policy}} + {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}} + {{include file="field_checkbox.tpl" field=$hide_help}} + {{include file="field_select.tpl" field=$singleuser}} +
@@ -63,21 +64,22 @@ * Registration */ -->
-
- - {{include file="field_input.tpl" field=$register_text}} - {{include file="field_select.tpl" field=$register_policy}} - {{include file="field_input.tpl" field=$daily_registrations}} - {{include file="field_checkbox.tpl" field=$no_multi_reg}} - {{include file="field_checkbox.tpl" field=$no_openid}} - {{include file="field_checkbox.tpl" field=$no_regfullname}} +
+ {{include file="field_input.tpl" field=$register_text}} + {{include file="field_select.tpl" field=$register_policy}} + {{include file="field_input.tpl" field=$daily_registrations}} + {{include file="field_checkbox.tpl" field=$no_multi_reg}} + {{include file="field_checkbox.tpl" field=$no_openid}} + {{include file="field_checkbox.tpl" field=$no_regfullname}} +
@@ -91,22 +93,24 @@ * File upload */ -->
-
- {{include file="field_select.tpl" field=$storagebackend}} - {{foreach from=$storageform item=$field}} - {{include file=$field.field field=$field}} - {{/foreach}} -
- {{include file="field_input.tpl" field=$maximagesize}} - {{include file="field_input.tpl" field=$maximagelength}} - {{include file="field_input.tpl" field=$jpegimagequality}} +
+ {{include file="field_select.tpl" field=$storagebackend}} + {{foreach from=$storageform item=$field}} + {{include file=$field.field field=$field}} + {{/foreach}} +
+ {{include file="field_input.tpl" field=$maximagesize}} + {{include file="field_input.tpl" field=$maximagelength}} + {{include file="field_input.tpl" field=$jpegimagequality}} +
@@ -119,46 +123,47 @@ * Corporate */ -->
-
- {{include file="field_input.tpl" field=$allowed_sites}} - {{include file="field_input.tpl" field=$allowed_email}} - {{include file="field_input.tpl" field=$forbidden_nicknames}} - {{include file="field_checkbox.tpl" field=$no_oembed_rich_content}} - {{include file="field_input.tpl" field=$allowed_oembed}} - {{include file="field_checkbox.tpl" field=$block_public}} - {{include file="field_checkbox.tpl" field=$force_publish}} - {{include file="field_select.tpl" field=$community_page_style}} - {{include file="field_input.tpl" field=$max_author_posts_community_page}} +
+ {{include file="field_input.tpl" field=$allowed_sites}} + {{include file="field_input.tpl" field=$allowed_email}} + {{include file="field_input.tpl" field=$forbidden_nicknames}} + {{include file="field_checkbox.tpl" field=$no_oembed_rich_content}} + {{include file="field_input.tpl" field=$allowed_oembed}} + {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$force_publish}} + {{include file="field_select.tpl" field=$community_page_style}} + {{include file="field_input.tpl" field=$max_author_posts_community_page}} - {{include file="field_checkbox.tpl" field=$ostatus_disabled}} + {{include file="field_checkbox.tpl" field=$ostatus_disabled}} - {{if $diaspora_able}} - {{include file="field_checkbox.tpl" field=$diaspora_enabled}} - {{else}} -
- - {{$diaspora_not_able}} + {{if $diaspora_able}} + {{include file="field_checkbox.tpl" field=$diaspora_enabled}} + {{else}} +
+ + {{$diaspora_not_able}} +
+ {{/if}} + {{include file="field_checkbox.tpl" field=$dfrn_only}} + {{include file="field_input.tpl" field=$global_directory}} +

+ +

+ {{include file="field_checkbox.tpl" field=$newuser_private}} + {{include file="field_checkbox.tpl" field=$enotify_no_content}} + {{include file="field_checkbox.tpl" field=$private_addons}} + {{include file="field_checkbox.tpl" field=$disable_embedded}} + {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} + {{include file="field_checkbox.tpl" field=$explicit_content}}
- {{/if}} - {{include file="field_checkbox.tpl" field=$dfrn_only}} - {{include file="field_input.tpl" field=$global_directory}} -
- -
- {{include file="field_checkbox.tpl" field=$newuser_private}} - {{include file="field_checkbox.tpl" field=$enotify_no_content}} - {{include file="field_checkbox.tpl" field=$private_addons}} - {{include file="field_checkbox.tpl" field=$disable_embedded}} - {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} - {{include file="field_checkbox.tpl" field=$explicit_content}} -
@@ -170,28 +175,29 @@ * Corporate */ -->
-
- - {{include file="field_select.tpl" field=$rino}} - {{include file="field_checkbox.tpl" field=$verifyssl}} - {{include file="field_input.tpl" field=$proxy}} - {{include file="field_input.tpl" field=$proxyuser}} - {{include file="field_input.tpl" field=$timeout}} - {{include file="field_input.tpl" field=$maxloadavg_frontend}} - {{include file="field_input.tpl" field=$optimize_max_tablesize}} - {{include file="field_input.tpl" field=$optimize_fragmentation}} - {{include file="field_input.tpl" field=$abandon_days}} - {{include file="field_input.tpl" field=$temppath}} - {{include file="field_checkbox.tpl" field=$suppress_tags}} - {{include file="field_checkbox.tpl" field=$nodeinfo}} - {{include file="field_select.tpl" field=$check_new_version_url}} +
+ {{include file="field_select.tpl" field=$rino}} + {{include file="field_checkbox.tpl" field=$verifyssl}} + {{include file="field_input.tpl" field=$proxy}} + {{include file="field_input.tpl" field=$proxyuser}} + {{include file="field_input.tpl" field=$timeout}} + {{include file="field_input.tpl" field=$maxloadavg_frontend}} + {{include file="field_input.tpl" field=$optimize_max_tablesize}} + {{include file="field_input.tpl" field=$optimize_fragmentation}} + {{include file="field_input.tpl" field=$abandon_days}} + {{include file="field_input.tpl" field=$temppath}} + {{include file="field_checkbox.tpl" field=$suppress_tags}} + {{include file="field_checkbox.tpl" field=$nodeinfo}} + {{include file="field_select.tpl" field=$check_new_version_url}} +
@@ -203,21 +209,22 @@ * Contact Directory */ -->
-
- - {{include file="field_checkbox.tpl" field=$poco_completion}} - {{include file="field_select.tpl" field=$gcontact_discovery}} - {{include file="field_input.tpl" field=$poco_requery_days}} - {{include file="field_select.tpl" field=$poco_discovery}} - {{include file="field_select.tpl" field=$poco_discovery_since}} - {{include file="field_checkbox.tpl" field=$poco_local_search}} +
+ {{include file="field_checkbox.tpl" field=$poco_completion}} + {{include file="field_select.tpl" field=$gcontact_discovery}} + {{include file="field_input.tpl" field=$poco_requery_days}} + {{include file="field_select.tpl" field=$poco_discovery}} + {{include file="field_select.tpl" field=$poco_discovery_since}} + {{include file="field_checkbox.tpl" field=$poco_local_search}} +
@@ -229,24 +236,25 @@ * Performance */ -->
-
- - {{include file="field_checkbox.tpl" field=$only_tag_search}} - {{include file="field_input.tpl" field=$itemcache}} - {{include file="field_input.tpl" field=$itemcache_duration}} - {{include file="field_input.tpl" field=$max_comments}} - {{include file="field_checkbox.tpl" field=$proxy_disabled}} - {{include file="field_checkbox.tpl" field=$dbclean}} - {{include file="field_input.tpl" field=$dbclean_expire_days}} - {{include file="field_input.tpl" field=$dbclean_unclaimed}} - {{include file="field_input.tpl" field=$dbclean_expire_conv}} +
+ {{include file="field_checkbox.tpl" field=$only_tag_search}} + {{include file="field_input.tpl" field=$itemcache}} + {{include file="field_input.tpl" field=$itemcache_duration}} + {{include file="field_input.tpl" field=$max_comments}} + {{include file="field_checkbox.tpl" field=$proxy_disabled}} + {{include file="field_checkbox.tpl" field=$dbclean}} + {{include file="field_input.tpl" field=$dbclean_expire_days}} + {{include file="field_input.tpl" field=$dbclean_unclaimed}} + {{include file="field_input.tpl" field=$dbclean_expire_conv}} +
@@ -258,21 +266,22 @@ * Worker */ -->
-
- - {{include file="field_input.tpl" field=$maxloadavg}} - {{include file="field_input.tpl" field=$min_memory}} - {{include file="field_input.tpl" field=$worker_queues}} - {{include file="field_checkbox.tpl" field=$worker_dont_fork}} - {{include file="field_checkbox.tpl" field=$worker_fastlane}} - {{include file="field_checkbox.tpl" field=$worker_frontend}} +
+ {{include file="field_input.tpl" field=$maxloadavg}} + {{include file="field_input.tpl" field=$min_memory}} + {{include file="field_input.tpl" field=$worker_queues}} + {{include file="field_checkbox.tpl" field=$worker_dont_fork}} + {{include file="field_checkbox.tpl" field=$worker_fastlane}} + {{include file="field_checkbox.tpl" field=$worker_frontend}} +
@@ -284,55 +293,55 @@ * Relay */ -->
-
- - {{include file="field_checkbox.tpl" field=$relay_subscribe}} - {{include file="field_input.tpl" field=$relay_server}} - {{include file="field_checkbox.tpl" field=$relay_directly}} - {{include file="field_select.tpl" field=$relay_scope}} - {{include file="field_input.tpl" field=$relay_server_tags}} - {{include file="field_checkbox.tpl" field=$relay_user_tags}} +
+ {{include file="field_checkbox.tpl" field=$relay_subscribe}} + {{include file="field_input.tpl" field=$relay_server}} + {{include file="field_checkbox.tpl" field=$relay_directly}} + {{include file="field_select.tpl" field=$relay_scope}} + {{include file="field_input.tpl" field=$relay_server_tags}} + {{include file="field_checkbox.tpl" field=$relay_user_tags}} +
- + - -
- -
-
- × - {{$relocate_warning}} + +
+ + + + - {{* separate form for relocate... *}} - - - {{include file="field_input.tpl" field=$relocate_url}} - - +
+
+
+ {{$relocate_warning}} +
+ {{include file="field_input.tpl" field=$relocate_url}} +
- -
+
+
diff --git a/view/theme/frio/templates/admin/users.tpl b/view/theme/frio/templates/admin/users.tpl index a9c5f003ee..71d3638623 100644 --- a/view/theme/frio/templates/admin/users.tpl +++ b/view/theme/frio/templates/admin/users.tpl @@ -18,26 +18,31 @@ ** -->
-
- {{if $pending}} + {{if $pending}} - + {{foreach $th_pending as $th}}{{/foreach}} - {{foreach $pending as $u}} + {{foreach $pending as $u}} - {{if $u.note}} + {{if $u.note}} - {{/if}} - {{/foreach}} + {{/if}} + {{/foreach}}
+
+ + +
+ 		{{$th}}
@@ -53,37 +58,27 @@
{{$pendingnotetext}} {{$u.note}}
-
-
-
- - -
-
-
- - -
-
+ +
- {{else}} + {{else}}
{{$no_pending}}
- {{/if}} + {{/if}}
@@ -95,48 +90,52 @@ ** -->
-
- {{if $users}} -
- - - - - - {{foreach $th_users as $k=>$th}} - {{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }} - + + {{/foreach}} + +
- + {{if $u.is_deletable}} + {{if $u.blocked}} + + + + {{else}} + + + + {{/if}} + + + + {{else}} +   + {{/if}} +
- {{if $users}} -
-
-
- - -
-
-
- - - -
-
- {{/if}} + + +
+ {{else}} +
NO USERS?!?
+ {{/if}}
- {{if $deleted}}
-
@@ -328,12 +313,12 @@ ** -->
-
@@ -342,11 +327,9 @@ {{include file="field_input.tpl" field=$newusernickname}} {{include file="field_input.tpl" field=$newuseremail}}
-
+
- -
diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl index 92d2ed861e..2f3564c94b 100644 --- a/view/theme/frio/templates/settings/connectors.tpl +++ b/view/theme/frio/templates/settings/connectors.tpl @@ -1,25 +1,23 @@
- {{* include the title template for the settings title *}} - {{include file="section_title.tpl" title=$title}} +

{{$title}}

{{$diasp_enabled}}

{{$ostat_enabled}}

- +
-
-
- +
{{include file="field_checkbox.tpl" field=$accept_only_sharer}} {{include file="field_checkbox.tpl" field=$disable_cw}} @@ -35,11 +33,9 @@ {{include file="field_input.tpl" field=$legacy_contact}}

{{$repair_ostatus_text}}

- -
- -
-
+
+
+
diff --git a/view/theme/frio/templates/settings/display.tpl b/view/theme/frio/templates/settings/display.tpl index f67bb3f407..95dde620e8 100644 --- a/view/theme/frio/templates/settings/display.tpl +++ b/view/theme/frio/templates/settings/display.tpl @@ -1,71 +1,65 @@ -
- {{* include the title template for the settings title *}} - {{include file="section_title.tpl" title=$ptitle }} - - +

{{$ptitle}}

- +
-
-
- +
{{include file="field_themeselect.tpl" field=$theme}} {{* Show the mobile theme selection only if mobile themes are available *}} {{if count($mobile_theme.4) > 1}} {{include file="field_themeselect.tpl" field=$mobile_theme}} {{/if}} - -
- -
-
- +
+
+
-
-
+
{{if $theme_config}} {{$theme_config nofilter}} {{/if}}
+
+ +
-
-
- +
{{include file="field_input.tpl" field=$itemspage_network}} {{include file="field_input.tpl" field=$itemspage_mobile_network}} {{include file="field_input.tpl" field=$ajaxint}} @@ -74,32 +68,27 @@ {{include file="field_checkbox.tpl" field=$infinite_scroll}} {{include file="field_checkbox.tpl" field=$no_smart_threading}} {{include file="field_checkbox.tpl" field=$hide_dislike}} - -
- -
-
+
+
+
-
-
- +
{{include file="field_select.tpl" field=$first_day_of_week}} - -
- -
-
+
+
+
diff --git a/view/theme/frio/templates/settings/features.tpl b/view/theme/frio/templates/settings/features.tpl index 1db5fd9669..61fecf57f7 100644 --- a/view/theme/frio/templates/settings/features.tpl +++ b/view/theme/frio/templates/settings/features.tpl @@ -1,31 +1,26 @@
- {{* include the title template for the settings title *}} - {{include file="section_title.tpl" title=$title }} - - +

{{$title}}

- + {{* We organize the settings in collapsable panel-groups *}}
{{foreach $features as $g => $f}}
-
-
+
{{foreach $f.1 as $fcat}} {{include file="field_checkbox.tpl" field=$fcat}} {{/foreach}} - -
- -
-
+
+
+
diff --git a/view/theme/frio/templates/settings/profile/index.tpl b/view/theme/frio/templates/settings/profile/index.tpl index 05a4bb215d..21387437ec 100644 --- a/view/theme/frio/templates/settings/profile/index.tpl +++ b/view/theme/frio/templates/settings/profile/index.tpl @@ -1,5 +1,5 @@
- {{include file="section_title.tpl" title=$banner}} +

{{$banner}}

{{* The actions dropdown which can performed to the current profile *}}