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

Move swimlane title and add swimlane anchor

Browse Source
This commit is contained in:
Frederic Guillot
2015-05-25 14:58:24 -04:00
parent 87c711cb55
commit 7442499bb5
6 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Helper/Url.php
View File

@@ -24,11 +24,12 @@ class Url extends \Core\Base
* @param boolean $csrf Add a CSRF token
* @param string $class CSS class attribute
* @param boolean $new_tab Open the link in a new tab
* @param string $anchor Link Anchor
* @return string
*/
public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false)
public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '')
{
return '<a href="'.$this->href($controller, $action, $params, $csrf).'" class="'.$class.'" title="'.$title.'" '.($new_tab ? 'target="_blank"' : '').'>'.$label.'</a>';
return '<a href="'.$this->href($controller, $action, $params, $csrf, $anchor).'" class="'.$class.'" title="'.$title.'" '.($new_tab ? 'target="_blank"' : '').'>'.$label.'</a>';
}
/**
@@ -39,9 +40,10 @@ class Url extends \Core\Base
* @param string $action Action name
* @param array $params Url parameters
* @param boolean $csrf Add a CSRF token
* @param string $anchor Link Anchor
* @return string
*/
public function href($controller, $action, array $params = array(), $csrf = false)
public function href($controller, $action, array $params = array(), $csrf = false, $anchor = '')
{
$values = array(
'controller' => $controller,
@@ -54,7 +56,7 @@ class Url extends \Core\Base
$values += $params;
return '?'.http_build_query($values, '', '&amp;');
return '?'.http_build_query($values, '', '&amp;').(empty($anchor) ? '' : '#'.$anchor);
}
/**

18
app/Template/board/swimlane.php
View File

@@ -1,19 +1,13 @@
<tr>
<tr id="swimlane-<?= $swimlane['id'] ?>">
<?php if (! $hide_swimlane): ?>
<th>
<?php if (! $not_editable && $swimlane['nb_tasks'] > 0): ?>
<a href="#" class="board-swimlane-toggle" data-swimlane-id="<?= $swimlane['id'] ?>">
<i class="fa fa-minus-circle hide-icon-swimlane-<?= $swimlane['id'] ?>"></i>
<i class="fa fa-plus-circle show-icon-swimlane-<?= $swimlane['id'] ?>" style="display: none"></i>
</a>
<span class="board-swimlane-toggle-title show-icon-swimlane-<?= $swimlane['id'] ?>"><?= $this->e($swimlane['name']) ?></span>
<?php endif ?>
<?= $this->e($swimlane['name']) ?>
<span title="<?= t('Task count') ?>" class="task-count">
(<span><?= $swimlane['nb_tasks'] ?></span>)
</span>
</th>
<?php endif ?>
@@ -54,7 +48,13 @@
<tr class="swimlane-row-<?= $swimlane['id'] ?>">
<?php if (! $hide_swimlane): ?>
<th></th>
<th class="board-swimlane-title">
<?= $this->e($swimlane['name']) ?>
<span title="<?= t('Task count') ?>" class="task-count">
(<span><?= $swimlane['nb_tasks'] ?></span>)
</span>
</th>
<?php endif ?>
<?php foreach ($swimlane['columns'] as $column): ?>

2
app/Template/task/layout.php
View File

@@ -3,7 +3,7 @@
<ul>
<li>
<i class="fa fa-table fa-fw"></i>
<?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
<?= $this->url->link(t('Back to the board'), 'board', 'show', array('project_id' => $task['project_id']), false, '', '', false, 'swimlane-'.$task['swimlane_id']) ?>
</li>
<li>
<i class="fa fa-calendar fa-fw"></i>