From 79fd49f61198e5eb6c3ecaefab7b34208b2b3eee Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 6 Jun 2016 21:22:54 +0200 Subject: [PATCH 1/4] Exit with "system unavailable" when the maximum number of processes is reached --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 17258fd0ab..bf4ee378af 100644 --- a/index.php +++ b/index.php @@ -65,7 +65,7 @@ if(!$install) { if ($processlist["amount"] > $max_processes) { logger("Processcheck: Maximum number of processes for frontend tasks (".$max_processes.") reached.", LOGGER_DEBUG); - return; + system_unavailable(); } } From c87d426d5fa279ccc13909210250b1be12645a42 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Tue, 7 Jun 2016 00:38:39 +0200 Subject: [PATCH 2/4] frio: follow & peoplefind widget template --- view/theme/frio/css/style.css | 10 ++++++++++ view/theme/frio/templates/follow.tpl | 12 ++++++++++++ view/theme/frio/templates/peoplefind.tpl | 18 ++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 view/theme/frio/templates/follow.tpl create mode 100644 view/theme/frio/templates/peoplefind.tpl diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 11f85ae93f..f09cdbf1fc 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -929,6 +929,16 @@ aside .vcard #wallmessage-link { width: 100%; } +aside #peoplefind-sidebar input, +aside #follow-sidebar input { + height: 30px; + background-position: 10px 5px; +} +aside #peoplefind-sidebar .form-group-search .form-button-search, +aside #follow-sidebar .form-group-search .form-button-search { + padding: 2px 8px; +} + /* contact block widget */ #contact-block .contact-block-content { clear: both; diff --git a/view/theme/frio/templates/follow.tpl b/view/theme/frio/templates/follow.tpl new file mode 100644 index 0000000000..8100f853e8 --- /dev/null +++ b/view/theme/frio/templates/follow.tpl @@ -0,0 +1,12 @@ + +
+

{{$connect}}

+
{{$desc}}
+
+
+ + +
+
+
+ diff --git a/view/theme/frio/templates/peoplefind.tpl b/view/theme/frio/templates/peoplefind.tpl new file mode 100644 index 0000000000..941fd1a4d3 --- /dev/null +++ b/view/theme/frio/templates/peoplefind.tpl @@ -0,0 +1,18 @@ + +
+

{{$findpeople}}

+
{{$desc}}
+
+
+ + +
+
+ + + + {{if $inv}} + + {{/if}} +
+ From 615db43736c6883572e74c1b24e0eab13176cdbc Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Tue, 7 Jun 2016 01:28:38 +0200 Subject: [PATCH 3/4] frio: add group_side widget template --- view/theme/frio/css/style.css | 14 ++++++- view/theme/frio/templates/follow.tpl | 4 +- view/theme/frio/templates/group_side.tpl | 49 ++++++++++++++++++++++++ view/theme/frio/templates/peoplefind.tpl | 7 +++- 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 view/theme/frio/templates/group_side.tpl diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index f09cdbf1fc..00d49b8a61 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -939,6 +939,18 @@ aside #follow-sidebar .form-group-search .form-button-search { padding: 2px 8px; } +aside #group-sidebar .group-edit-tool { + opacity: 0.1; + transition: all 0.25s ease-in-out; +} +aside #group-sidebar .sidebar-group-li:hover .group-edit-tool { + opacity: 0.8; + transition: all 0.25s ease-in-out; +} +aside #group-sidebar .sidebar-group-li .group-edit-tool:hover { + opacity: 1; +} + /* contact block widget */ #contact-block .contact-block-content { clear: both; @@ -1637,7 +1649,7 @@ ul.dropdown-menu li:hover { .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 { +.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper { min-height: calc(100vh - 150px); padding: 15px; padding-bottom: 20px; diff --git a/view/theme/frio/templates/follow.tpl b/view/theme/frio/templates/follow.tpl index 8100f853e8..a35bcb2131 100644 --- a/view/theme/frio/templates/follow.tpl +++ b/view/theme/frio/templates/follow.tpl @@ -1,8 +1,10 @@

{{$connect}}

-
{{$desc}}
+ +
{{$desc}}
{{* The description *}}
+ {{* The input field - For visual consistence we are using a search input field*}}
diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl new file mode 100644 index 0000000000..682da5e118 --- /dev/null +++ b/view/theme/frio/templates/group_side.tpl @@ -0,0 +1,49 @@ +
+

{{$title}}

+ + + + {{if $newgroup}} + + {{else}} + + {{/if}} + + {{if $ungrouped}}{{/if}} +
diff --git a/view/theme/frio/templates/peoplefind.tpl b/view/theme/frio/templates/peoplefind.tpl index 941fd1a4d3..6b31c92ada 100644 --- a/view/theme/frio/templates/peoplefind.tpl +++ b/view/theme/frio/templates/peoplefind.tpl @@ -1,13 +1,18 @@

{{$findpeople}}

-
{{$desc}}
+ +
{{$desc}}
{{* The description *}} +
+ {{* The search field *}}
+ + {{* Additional links *}} From d752ea9abcff6ae6d64200af2273c61733392186 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Tue, 7 Jun 2016 01:42:01 +0200 Subject: [PATCH 4/4] frio: fix close hovercard on mousleave --- view/theme/frio/js/hovercard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/js/hovercard.js b/view/theme/frio/js/hovercard.js index 518505c5ab..6e2a827cd6 100644 --- a/view/theme/frio/js/hovercard.js +++ b/view/theme/frio/js/hovercard.js @@ -86,7 +86,7 @@ $(document).ready(function(){ } } }, 500); - }).on("mouseleave", ".userinfo", function(e) { // action when mouse leaves the hover-card + }).on("mouseleave", ".userinfo, .wall-item-responses a, .wall-item-bottom .mention a", function(e) { // action when mouse leaves the hover-card var timeNow = new Date().getTime(); // copy the original title to the title atribute var title = $(this).attr("data-orig-title");