3 files changed, 10 insertions, 7 deletions
diff --git a/app/Template/category/edit.php b/app/Template/category/edit.php
index 1aae2f2a..d788f673 100644
--- a/app/Template/category/edit.php
+++ b/app/Template/category/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Category modification for the project "%s"', $project['name']) ?></h2>
 </div>
 
-<form method="post" action="<?= $this->url->href('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('category', 'update', array('project_id' => $project['id'], 'category_id' => $values['id'])) ?>" autocomplete="off">
 
     <?= $this->form->csrf() ?>
 
@@ -33,8 +33,8 @@
     <div class="form-help"><?= $this->url->doc(t('Write your text in Markdown'), 'syntax-guide') ?></div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue">
         <?= t('or') ?>
-        <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id'])) ?>
+        <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
     </div>
 </form>
 \ No newline at end of file
diff --git a/app/Template/category/index.php b/app/Template/category/index.php
index dba537d0..e99b6d52 100644
--- a/app/Template/category/index.php
+++ b/app/Template/category/index.php
@@ -5,20 +5,23 @@
 <table>
     <tr>
         <th><?= t('Category Name') ?></th>
-        <th><?= t('Actions') ?></th>
+        <th class="column-8"><?= t('Actions') ?></th>
     </tr>
     <?php foreach ($categories as $category_id => $category_name): ?>
     <tr>
         <td><?= $this->e($category_name) ?></td>
         <td>
+            <div class="dropdown">
+            <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
             <ul>
                 <li>
-                    <?= $this->url->link(t('Edit'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
+                    <?= $this->url->link(t('Edit'), 'category', 'edit', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
                 </li>
                 <li>
-                    <?= $this->url->link(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id)) ?>
+                    <?= $this->url->link(t('Remove'), 'category', 'confirm', array('project_id' => $project['id'], 'category_id' => $category_id), false, 'popover') ?>
                 </li>
             </ul>
+            </div>
         </td>
     </tr>
     <?php endforeach ?>
diff --git a/app/Template/category/remove.php b/app/Template/category/remove.php
index ce589785..cad58d37 100644
--- a/app/Template/category/remove.php
+++ b/app/Template/category/remove.php
@@ -11,7 +11,7 @@
         <div class="form-actions">
             <?= $this->url->link(t('Yes'), 'category', 'remove', array('project_id' => $project['id'], 'category_id' => $category['id']), true, 'btn btn-red') ?>
             <?= t('or') ?>
-            <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('cancel'), 'category', 'index', array('project_id' => $project['id']), false, 'close-popover') ?>
         </div>
     </div>
 </section>
 \ No newline at end of file