From de6959f59f5464a117b692c822c7f17d4f169199 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 5 Feb 2014 23:24:04 +0100 Subject: [PATCH 1/3] Fix typo --- lib/classes/task/Scheduler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/task/Scheduler.php b/lib/classes/task/Scheduler.php index c221ee3478..d4c36bda4f 100644 --- a/lib/classes/task/Scheduler.php +++ b/lib/classes/task/Scheduler.php @@ -281,7 +281,7 @@ class task_Scheduler $this->log( sprintf( - "Got task %s (%) with status %s", + "Got task %s (%s) with status %s", $taskPoll[$tkey]["task"]->getID(), $taskPoll[$tkey]["task"]->getName(), $status From 1d9f2ae7212ecd1a21d1762e7a618c4ccf916aa7 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Thu, 6 Feb 2014 15:18:53 +0100 Subject: [PATCH 2/3] Fix #1687 Css inline issue for registration collection name --- www/skins/admin/css/Main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/skins/admin/css/Main.css b/www/skins/admin/css/Main.css index 63b26947c4..e9ebbb5070 100644 --- a/www/skins/admin/css/Main.css +++ b/www/skins/admin/css/Main.css @@ -292,3 +292,7 @@ div.switch_right.unchecked { #tab_demandes .dl-horizontal dt { width: 130px; } + +#tab_demandes .table .btn-group { + display: block; +} From 6a71aed5f472da8d57f1a4fe874beeaf6a5f26c5 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Thu, 6 Feb 2014 15:14:58 +0100 Subject: [PATCH 3/3] Fix #1688 Set submit button as absolute position --- templates/web/admin/user/demand.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/web/admin/user/demand.html.twig b/templates/web/admin/user/demand.html.twig index ff72e2a381..552158ace0 100644 --- a/templates/web/admin/user/demand.html.twig +++ b/templates/web/admin/user/demand.html.twig @@ -199,6 +199,7 @@ +
{% set tableColls = table['coll'] %} {% for row in table['user'] %} @@ -270,8 +271,9 @@
{% endfor %}
+ -
+