From 82b6917c5f3e47e6e7350cc61e180abc4508ebb6 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 13 Jun 2016 10:57:42 +0200 Subject: [PATCH 1/3] frio: settings_display.tpl + rise frio to 0.2 Alpha --- mod/settings.php | 3 + .../theme/frio/templates/settings_display.tpl | 104 ++++++++++++++++++ view/theme/frio/templates/theme_settings.tpl | 4 +- view/theme/frio/theme.php | 4 +- 4 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 view/theme/frio/templates/settings_display.tpl diff --git a/mod/settings.php b/mod/settings.php index 5168589f7..89406b707 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -989,6 +989,9 @@ function settings_content(&$a) { '$infinite_scroll' => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''), '$no_auto_update' => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'), + '$d_tset' => t('General Theme Settings'), + '$d_ctset' => t('Custom Theme Settings'), + '$d_cset' => t('Content Settings'), 'stitle' => t('Theme settings'), '$theme_config' => $theme_config, )); diff --git a/view/theme/frio/templates/settings_display.tpl b/view/theme/frio/templates/settings_display.tpl new file mode 100644 index 000000000..585ea510d --- /dev/null +++ b/view/theme/frio/templates/settings_display.tpl @@ -0,0 +1,104 @@ + +
+ {{* include the title template for the settings title *}} + {{include file="section_title.tpl" title=$ptitle }} + + +
+ + +
+
+ + +
+
+ + {{include file="field_themeselect.tpl" field=$theme}} + + {{include file="field_themeselect.tpl" field=$mobile_theme}} + +
+ +
+
+ +
+
+
+ +
+ +
+
+ + {{if $theme_config}} + {{$theme_config}} + {{/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}} + {{include file="field_checkbox.tpl" field=$no_auto_update}} + {{include file="field_checkbox.tpl" field=$nosmile}} + {{include file="field_checkbox.tpl" field=$noinfo}} + {{include file="field_checkbox.tpl" field=$infinite_scroll}} + +
+ +
+
+
+
+
+ +
+ +
+
+ + {{include file="field_select.tpl" field=$first_day_of_week}} + +
+ +
+
+
+
+
+
+
+
diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index ebedfcfb5..aa0b6ca56 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -63,8 +63,8 @@ }); -
- +
+
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index a7c3b0c5d..bab2d696a 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -1,8 +1,8 @@ ReadMe and GitHub. - * Version: V.0.1 Alpha + * Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the ReadMe. + * Version: V.0.2 Alpha * Author: Rabuzarus * */ From 06792d6b37dd2bf366460484710403b7a51b0ede Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 13 Jun 2016 12:17:33 +0200 Subject: [PATCH 2/3] frio: fix an css issue with sidebar-group checkbox alignment --- view/theme/frio/css/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 28e75aa97..dc892c60b 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1018,6 +1018,15 @@ aside #group-sidebar .sidebar-group-li .group-edit-tool:hover, aside #saved-search-list .saved-search-li .savedsearchdrop:hover { opacity: 1; } +aside #group-sidebar li .group-checkbox { + margin: 0; +} +aside #group-sidebar li .group-edit-tool { + padding-right: 10px; +} +aside #group-sidebar li .group-edit-tool:first-child { + padding-right: 0px; +} /* contact block widget */ #contact-block .contact-block-content { From 2815173a52267c9a5fa6dce55ea0cc04eca1867f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 13 Jun 2016 22:20:09 +0200 Subject: [PATCH 3/3] Bugfix: Items weren't sorted correctly --- include/conversation.php | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 8f94d9630..416efa150 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -399,6 +399,38 @@ function contact_condition() { */ function item_fieldlist() { +/* +These Fields are not added below (yet). They are here to for bug search. +`item`.`type`, +`item`.`extid`, +`item`.`received`, +`item`.`changed`, +`item`.`author-avatar`, +`item`.`object`, +`item`.`target-type`, +`item`.`target`, +`item`.`resource-id`, +`item`.`tag`, +`item`.`attach`, +`item`.`inform`, +`item`.`file`, +`item`.`pubmail`, +`item`.`moderated`, +`item`.`visible`, +`item`.`spam`, +`item`.`starred`, +`item`.`bookmark`, +`item`.`unseen`, +`item`.`deleted`, +`item`.`origin`, +`item`.`forum_mode`, +`item`.`last-child`, +`item`.`mention`, +`item`.`global`, +`item`.`gcontact-id`, +`item`.`shadow`, +*/ + $fieldlist = "`item`.`author-link`, `item`.`verb`, `item`.`id`, `item`.`parent`, `item`.`uid`, `item`.`author-name`, `item`.`location`, `item`.`coord`, `item`.`title`, `item`.`uri`, `item`.`created`, `item`.`app`, `item`.`guid`, @@ -407,7 +439,7 @@ function item_fieldlist() { `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`, `item`.`event-id`, `item`.`object-type`, `item`.`starred`, `item`.`created`, `item`.`postopts`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`, - `item`.`plink`, `item`.`wall`, + `item`.`plink`, `item`.`wall`, `item`.`commented`, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`"; return $fieldlist;