3 files changed, 6 insertions, 20 deletions
diff --git a/app/Template/action_creation/create.php b/app/Template/action_creation/create.php
index c0d2880e..04aa761c 100644
--- a/app/Template/action_creation/create.php
+++ b/app/Template/action_creation/create.php
@@ -1,16 +1,12 @@
 <div class="page-header">
     <h2><?= t('Add an action') ?></h2>
 </div>
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'event', array('project_id' => $project['id'])) ?>">
+<form method="post" action="<?= $this->url->href('ActionCreationController', 'event', array('project_id' => $project['id'])) ?>">
     <?= $this->form->csrf() ?>
     <?= $this->form->hidden('project_id', $values) ?>
 
     <?= $this->form->label(t('Action'), 'action_name') ?>
     <?= $this->form->select('action_name', $available_actions, $values) ?>
 
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array(), false, 'close-popover') ?>
-    </div>
+    <?= $this->modal->submitButtons(t('Next step')) ?>
 </form>
diff --git a/app/Template/action_creation/event.php b/app/Template/action_creation/event.php
index cdf00310..58996ad8 100644
--- a/app/Template/action_creation/event.php
+++ b/app/Template/action_creation/event.php
@@ -2,8 +2,7 @@
     <h2><?= t('Choose an event') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'params', array('project_id' => $project['id'])) ?>">
-
+<form method="post" action="<?= $this->url->href('ActionCreationController', 'params', array('project_id' => $project['id'])) ?>">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->hidden('project_id', $values) ?>
@@ -19,9 +18,5 @@
         <?= t('When the selected event occurs execute the corresponding action.') ?>
     </div>
 
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Next step') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
-    </div>
+    <?= $this->modal->submitButtons(t('Next step')) ?>
 </form>
diff --git a/app/Template/action_creation/params.php b/app/Template/action_creation/params.php
index c9608f21..0cc98f50 100644
--- a/app/Template/action_creation/params.php
+++ b/app/Template/action_creation/params.php
@@ -2,8 +2,7 @@
     <h2><?= t('Define action parameters') ?></h2>
 </div>
 
-<form class="popover-form" method="post" action="<?= $this->url->href('ActionCreationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
+<form method="post" action="<?= $this->url->href('ActionCreationController', 'save', array('project_id' => $project['id'])) ?>" autocomplete="off">
     <?= $this->form->csrf() ?>
 
     <?= $this->form->hidden('project_id', $values) ?>
@@ -50,9 +49,5 @@
         <?php endif ?>
     <?php endforeach ?>
 
-    <div class="form-actions">
-        <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
-        <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'ActionController', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
-    </div>
+    <?= $this->modal->submitButtons() ?>
 </form>