Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

3 files changed, 12 insertions, 9 deletions

diff --git a/app/Template/action/event.php b/app/Template/action/event.php
index 7f968a97..b4741a98 100644
--- a/app/Template/action/event.php
+++ b/app/Template/action/event.php
@@ -11,7 +11,7 @@
     <?= $this->form->hidden('action_name', $values) ?>
 
     <?= $this->form->label(t('Event'), 'event_name') ?>
-    <?= $this->form->select('event_name', $events, $values) ?><br/>
+    <?= $this->form->select('event_name', $events, $values) ?>
 
     <div class="form-help">
         <?= t('When the selected event occurs execute the corresponding action.') ?>
diff --git a/app/Template/action/index.php b/app/Template/action/index.php
index 8275f080..c28c7a4b 100644
--- a/app/Template/action/index.php
+++ b/app/Template/action/index.php
@@ -67,9 +67,9 @@
     <?= $this->form->hidden('project_id', $values) ?>
 
     <?= $this->form->label(t('Action'), 'action_name') ?>
-    <?= $this->form->select('action_name', $available_actions, $values) ?><br/>
+    <?= $this->form->select('action_name', $available_actions, $values) ?>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Next step') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Next step') ?>" class="btn btn-blue">
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/action/params.php b/app/Template/action/params.php
index dcfaa9cc..a2350dea 100644
--- a/app/Template/action/params.php
+++ b/app/Template/action/params.php
@@ -15,22 +15,25 @@
 
         <?php if ($this->text->contains($param_name, 'column_id')): ?>
             <?= $this->form->label($param_desc, $param_name) ?>
-            <?= $this->form->select('params['.$param_name.']', $columns_list, $values) ?><br/>
+            <?= $this->form->select('params['.$param_name.']', $columns_list, $values) ?>
         <?php elseif ($this->text->contains($param_name, 'user_id')): ?>
             <?= $this->form->label($param_desc, $param_name) ?>
-            <?= $this->form->select('params['.$param_name.']', $users_list, $values) ?><br/>
+            <?= $this->form->select('params['.$param_name.']', $users_list, $values) ?>
         <?php elseif ($this->text->contains($param_name, 'project_id')): ?>
             <?= $this->form->label($param_desc, $param_name) ?>
-            <?= $this->form->select('params['.$param_name.']', $projects_list, $values) ?><br/>
+            <?= $this->form->select('params['.$param_name.']', $projects_list, $values) ?>
         <?php elseif ($this->text->contains($param_name, 'color_id')): ?>
             <?= $this->form->label($param_desc, $param_name) ?>
-            <?= $this->form->select('params['.$param_name.']', $colors_list, $values) ?><br/>
+            <?= $this->form->select('params['.$param_name.']', $colors_list, $values) ?>
         <?php elseif ($this->text->contains($param_name, 'category_id')): ?>
             <?= $this->form->label($param_desc, $param_name) ?>
-            <?= $this->form->select('params['.$param_name.']', $categories_list, $values) ?><br/>
+            <?= $this->form->select('params['.$param_name.']', $categories_list, $values) ?>
         <?php elseif ($this->text->contains($param_name, 'link_id')): ?>
             <?= $this->form->label($param_desc, $param_name) ?>
-            <?= $this->form->select('params['.$param_name.']', $links_list, $values) ?><br/>
+            <?= $this->form->select('params['.$param_name.']', $links_list, $values) ?>
+        <?php elseif ($this->text->contains($param_name, 'duration')): ?>
+            <?= $this->form->label($param_desc, $param_name) ?>
+            <?= $this->form->number('params['.$param_name.']', $values) ?>
         <?php else: ?>
             <?= $this->form->label($param_desc, $param_name) ?>
             <?= $this->form->text('params['.$param_name.']', $values) ?>