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), 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); 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/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/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 *}}