From f2ad8dd1d4fe281d2232248afeecb0b013bc0143 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 11 Jun 2016 22:35:08 +0200 Subject: [PATCH 1/5] frio: add settings.tpl --- .../frio/templates/field_intcheckbox.tpl | 7 + view/theme/frio/templates/settings.tpl | 309 ++++++++++++++++++ 2 files changed, 316 insertions(+) create mode 100644 view/theme/frio/templates/field_intcheckbox.tpl create mode 100644 view/theme/frio/templates/settings.tpl diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl new file mode 100644 index 000000000..192cf7384 --- /dev/null +++ b/view/theme/frio/templates/field_intcheckbox.tpl @@ -0,0 +1,7 @@ + +
+ + + {{$field.4}} +
+
diff --git a/view/theme/frio/templates/settings.tpl b/view/theme/frio/templates/settings.tpl new file mode 100644 index 000000000..fc11fb32a --- /dev/null +++ b/view/theme/frio/templates/settings.tpl @@ -0,0 +1,309 @@ +
+ {{* include the title template for the settings title *}} + {{include file="section_title.tpl" title=$ptitle }} + + {{$nickname_block}} + +
+ + + {{* We organize the settings in collapsable panel-groups *}} +
+ {{* The password setting section *}} +
+ +
+
+ {{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}} + +
+ +
+
+
+
+
+ + {{* The basic setting section *}} +
+ +
+
+ + {{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}} + +
+ +
+
+
+
+
+ + {{* The privacity setting section *}} +
+ +
+
+ + + + {{include file="field_input.tpl" field=$maxreq}} + + {{$profile_in_dir}} + + {{$profile_in_net_dir}} + + {{$hide_friends}} + + {{$hide_wall}} + + {{$blockwall}} + + {{$blocktags}} + + {{$suggestme}} + + {{$unkmail}} + + + {{include file="field_input.tpl" field=$cntunkmail}} + + {{include file="field_input.tpl" field=$expire.days}} + + +
+ {{$expire.label}} + + {{* The modal for advanced-expire *}} + +
+ + {{* Block for setting default permissions *}} +
+ {{$permissions}} {{$permdesc}} +
+ + {{* We include the aclModal directly into the template since we cant use frio's default modal *}} + +
+
+
+ + {{$group_select}} + + +
+ +
+
+
+
+
+ + {{* The notification setting section *}} +
+ +
+
+
+ +

{{$activity_options}}

+ +
+ {{include file="field_checkbox.tpl" field=$post_newfriend}} + {{include file="field_checkbox.tpl" field=$post_joingroup}} + {{include file="field_checkbox.tpl" field=$post_profilechange}} +
+ + +

{{$lbl_not}}

+ +
+ {{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}} + + + {{* commented out because it was commented out in the original template +
+ + {{$desktop_notifications_note}} +
+ *}} + + {{include file="field_yesno.tpl" field=$desktop_notifications}} + +
+ +
+ +
+
+
+
+
+ + {{* The additional account setting section *}} +
+ +
+
+ +
{{$h_descadvn}}
+ + {{$pagetype}} + +
+ +
+
+
+
+
+ + {{* The relocate setting section *}} +
+ +
+
+ +
{{$relocate_text}}
+ +
+
+ +
+
+
+
+
+
+
+
+ From 56b600381e889f03bdea7bd3d3f6b46738457256 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 12 Jun 2016 00:15:48 +0200 Subject: [PATCH 2/5] frio: add some more settings templates --- view/theme/frio/templates/removeme.tpl | 24 ++++++++++ .../frio/templates/settings_features.tpl | 36 +++++++++++++++ view/theme/frio/templates/settings_oauth.tpl | 44 +++++++++++++++++++ .../frio/templates/settings_oauth_edit.tpl | 18 ++++++++ 4 files changed, 122 insertions(+) create mode 100644 view/theme/frio/templates/removeme.tpl create mode 100644 view/theme/frio/templates/settings_features.tpl create mode 100644 view/theme/frio/templates/settings_oauth.tpl create mode 100644 view/theme/frio/templates/settings_oauth_edit.tpl diff --git a/view/theme/frio/templates/removeme.tpl b/view/theme/frio/templates/removeme.tpl new file mode 100644 index 000000000..2e599a0da --- /dev/null +++ b/view/theme/frio/templates/removeme.tpl @@ -0,0 +1,24 @@ +
+ {{* include the title template for the settings title *}} + {{include file="section_title.tpl" title=$title }} + +
+
{{$desc}}
+ +
+ + +
+ + +
+
+ +
+ +
+
+
+
+
+ diff --git a/view/theme/frio/templates/settings_features.tpl b/view/theme/frio/templates/settings_features.tpl new file mode 100644 index 000000000..8d92caa5d --- /dev/null +++ b/view/theme/frio/templates/settings_features.tpl @@ -0,0 +1,36 @@ +
+ {{* include the title template for the settings title *}} + {{include file="section_title.tpl" title=$title }} + + +
+ + {{* We organize the settings in collapsable panel-groups *}} +
+ {{foreach $features as $g => $f}} +
+ +
+
+ {{foreach $f.1 as $fcat}} + {{include file="field_yesno.tpl" field=$fcat}} + {{/foreach}} + +
+ +
+
+
+
+
+ {{/foreach}} +
+ +
+
diff --git a/view/theme/frio/templates/settings_oauth.tpl b/view/theme/frio/templates/settings_oauth.tpl new file mode 100644 index 000000000..ffd40f2ab --- /dev/null +++ b/view/theme/frio/templates/settings_oauth.tpl @@ -0,0 +1,44 @@ +
+ {{* include the title template for the settings title *}} + {{include file="section_title.tpl" title=$title }} + + +
+ + + + + {{foreach $apps as $app}} +
+ + {{if $app.name}}

{{$app.name}}

{{else}}

{{$noname}}

{{/if}} + {{if $app.my}} + {{if $app.oauth_token}} +
+ {{/if}} + {{/if}} + {{if $app.my}} +   + + {{/if}} +
+ {{/foreach}} + +
+
diff --git a/view/theme/frio/templates/settings_oauth_edit.tpl b/view/theme/frio/templates/settings_oauth_edit.tpl new file mode 100644 index 000000000..91dfa0455 --- /dev/null +++ b/view/theme/frio/templates/settings_oauth_edit.tpl @@ -0,0 +1,18 @@ + +

{{$title}}

+ +
+ + + {{include file="field_input.tpl" field=$name}} + {{include file="field_input.tpl" field=$key}} + {{include file="field_input.tpl" field=$secret}} + {{include file="field_input.tpl" field=$redirect}} + {{include file="field_input.tpl" field=$icon}} + +
+ +
+
+ +
From 64753f474c23257756118f326fe396b93fb5389b Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 12 Jun 2016 18:55:20 +0200 Subject: [PATCH 3/5] fix config & pconfig --- include/Core/Config.php | 2 +- include/Core/PConfig.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Core/Config.php b/include/Core/Config.php index b5d80c82e..ff3541884 100644 --- a/include/Core/Config.php +++ b/include/Core/Config.php @@ -172,7 +172,7 @@ class Config { // manage array value $dbvalue = (is_array($value)?serialize($value):$value); $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue); - if(self::get($family,$key,true) === false) { + if(self::get($family,$key,null,true) === false) { $a->config[$family][$key] = $value; $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", dbesc($family), diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index 09c3c2a0b..c47559d0e 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -161,7 +161,7 @@ class PConfig { // manage array value $dbvalue = (is_array($value)?serialize($value):$value); - if(self::get($uid,$family,$key,true) === false) { + if(self::get($uid,$family,$key,null, true) === false) { $a->config[$uid][$family][$key] = $value; $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", intval($uid), From b2ba25bd272c46a9b4c3c159e5d6a00c8a9301f7 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 12 Jun 2016 19:15:12 +0200 Subject: [PATCH 4/5] fix federation statistics --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 36b2ca730..547c37fb6 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -289,7 +289,7 @@ function admin_page_federation(&$a) { // what versions for that platform do we know at all? // again only the active nodes - $v = q('SELECT COUNT(*) AS `total, version` FROM `gserver` + $v = q('SELECT COUNT(*) AS `total`, `version` FROM `gserver` WHERE `last_contact` > `last_failure` AND `platform` LIKE "%s" AND `version` != "" GROUP BY `version` ORDER BY `version`;', $p); From b19af8f0b7b3ecb19f1449f3491ce03a6728e61f Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 12 Jun 2016 19:59:27 +0200 Subject: [PATCH 5/5] frio: add css for settings templates --- view/theme/frio/css/style.css | 15 ++++++++++----- view/theme/frio/templates/profile_edit.tpl | 2 +- .../frio/templates/profile_listing_header.tpl | 2 +- view/theme/frio/templates/settings.tpl | 2 +- view/theme/frio/templates/settings_features.tpl | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 4e8ba06e3..68c971c48 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1747,13 +1747,12 @@ ul.dropdown-menu li:hover { /* PAGES */ /* Profile-page */ -.generic-page-wrapper ,#profile-page, .settings-content-wrapper, +.generic-page-wrapper ,#profile-page, .profile_photo-content-wrapper, photos-content-wrapper, .contacts-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .events-content-wrapper, .message-content-wrapper, .apps-content-wrapper, -.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper, -.profile_photo-content-wrapper, photos-content-wrapper { +.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper { min-height: calc(100vh - 150px); padding: 15px; padding-bottom: 20px; @@ -1971,11 +1970,11 @@ ul li:hover .contact-wrapper a.contact-action-link:hover { #profile-listing-new-link-wrapper { margin-bottom: 20px; } -.profiles-content-wrapper #profile-edit-wrapper { +.panel-group-settings { margin-left: -15px; margin-right: -15px; } -.profiles-content-wrapper #profile-edit-wrapper > .panel { +.panel-group-settings > .panel { padding-left: 15px; padding-right: 15px; } @@ -2003,6 +2002,12 @@ ul li:hover .contact-wrapper a.contact-action-link:hover { font-family: FontAwesome; content: "\f0da"; } +#settings-nick-wrapper { + margin-bottom: 20px; +} +.group { + margin-left: 20px; +} /* * Overwriting for transparency and other colors */ diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl index 09dfc33f2..5d82c1c14 100644 --- a/view/theme/frio/templates/profile_edit.tpl +++ b/view/theme/frio/templates/profile_edit.tpl @@ -69,7 +69,7 @@ {{* friendica differs in $detailled_profile (all fields available and a short Version if this is variable false *}} {{if $detailled_profile}} -
+
{{* The personal settings *}}