AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add dropdown menu for subtasks

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-12 21:46:20 -05:00
parent 3699073371
commit 713113d6c0
6 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ New features:
* Forgot Password * Forgot Password
Improvements:
* Add dropdown menu for subtasks
Bug fixes: Bug fixes:
* Automatic action listeners were using the same instance * Automatic action listeners were using the same instance

6
app/Template/subtask/show.php
View File

@@ -13,7 +13,7 @@
<th><?= t('Assignee') ?></th> <th><?= t('Assignee') ?></th>
<th><?= t('Time tracking') ?></th> <th><?= t('Time tracking') ?></th>
<?php if ($editable): ?> <?php if ($editable): ?>
<th><?= t('Actions') ?></th> <th class="column-5"></th>
<?php endif ?> <?php endif ?>
</tr> </tr>
<?php foreach ($subtasks as $subtask): ?> <?php foreach ($subtasks as $subtask): ?>
@@ -61,6 +61,8 @@
</td> </td>
<?php if ($editable): ?> <?php if ($editable): ?>
<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> <ul>
<?php if ($subtask['position'] != $first_position): ?> <?php if ($subtask['position'] != $first_position): ?>
<li> <li>
@@ -79,6 +81,7 @@
<?= $this->url->link(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?> <?= $this->url->link(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
</li> </li>
</ul> </ul>
</div>
</td> </td>
<?php endif ?> <?php endif ?>
</tr> </tr>
@@ -87,7 +90,6 @@
<?php endif ?> <?php endif ?>
<?php if ($editable && $this->user->hasProjectAccess('subtask', 'save', $task['project_id'])): ?> <?php if ($editable && $this->user->hasProjectAccess('subtask', 'save', $task['project_id'])): ?>
<?php if (empty($subtasks)): ?> <?php if (empty($subtasks)): ?>
<div class="page-header"> <div class="page-header">
<h2><?= t('Sub-Tasks') ?></h2> <h2><?= t('Sub-Tasks') ?></h2>

2
assets/css/app.css
View File

File diff suppressed because one or more lines are too long

5
assets/css/src/dropdown.css
View File

@@ -67,6 +67,11 @@ ul.dropdown-submenu-open {
padding-right: 10px; padding-right: 10px;
} }
.dropdown-menu-link-icon {
color: #333;
text-decoration: none;
}
/* textarea dropdown */ /* textarea dropdown */
.textarea-dropdown { .textarea-dropdown {
list-style: none; list-style: none;

2
assets/js/app.js
View File

File diff suppressed because one or more lines are too long

18
assets/js/src/Dropdown.js
View File

@@ -14,25 +14,31 @@ Dropdown.prototype.listen = function() {
self.close(); self.close();
var submenu = $(this).next('ul'); var submenu = $(this).next('ul');
var submenuHeight = 240;
var offset = $(this).offset(); var offset = $(this).offset();
var height = $(this).height();
// Clone the submenu outside of the column to avoid clipping issue with overflow // Clone the submenu outside of the column to avoid clipping issue with overflow
$("body").append(jQuery("<div>", {"id": "dropdown"})); $("body").append(jQuery("<div>", {"id": "dropdown"}));
submenu.clone().appendTo("#dropdown"); submenu.clone().appendTo("#dropdown");
var clone = $("#dropdown ul"); var clone = $("#dropdown ul");
clone.css('left', offset.left); clone.addClass('dropdown-submenu-open');
var submenuHeight = clone.outerHeight();
var submenuWidth = clone.outerWidth();
if (offset.top + submenuHeight - $(window).scrollTop() > $(window).height()) { if (offset.top + submenuHeight - $(window).scrollTop() > $(window).height()) {
clone.css('top', offset.top - submenuHeight - height); clone.css('top', offset.top - submenuHeight - 5);
} }
else { else {
clone.css('top', offset.top + height); clone.css('top', offset.top + $(this).height());
} }
clone.addClass('dropdown-submenu-open'); if (offset.left + submenuWidth > $(window).width()) {
clone.css('left', offset.left - submenuWidth + $(this).outerWidth());
}
else {
clone.css('left', offset.left);
}
}); });
$(document).on('click', '.dropdown-submenu-open li', function(e) { $(document).on('click', '.dropdown-submenu-open li', function(e) {