diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2014-06-20 16:01:53 -0300 |
|---|---|---|
| committer | Frédéric Guillot <fred@kanboard.net> | 2014-06-20 16:01:53 -0300 |
| commit | 08621f99e6333c5e218724d173654bf225586d59 (patch) | |
| tree | b986cd560c62d4a43f6405ac8017c8c975a0be61 /app | |
| parent | 169cbb56f83afedec74b51802d78342541c9128f (diff) | |
Merge pull-request #106 (datepicker and long column names fix)
Diffstat (limited to 'app')
| -rw-r--r-- | app/Templates/board_show.php | 4 | ||||
| -rw-r--r-- | app/Templates/layout.php | 3 | ||||
| -rw-r--r-- | app/Templates/task_edit.php | 6 | ||||
| -rw-r--r-- | app/Templates/task_new.php | 5 |
4 files changed, 11 insertions, 7 deletions
diff --git a/app/Templates/board_show.php b/app/Templates/board_show.php index 6a138bf9..d5f31413 100644 --- a/app/Templates/board_show.php +++ b/app/Templates/board_show.php @@ -3,7 +3,9 @@ <?php $column_with = round(100 / count($board), 2); ?> <?php foreach ($board as $column): ?> <th width="<?= $column_with ?>%"> - <a href="?controller=task&action=create&project_id=<?= $column['project_id'] ?>&column_id=<?= $column['id'] ?>" title="<?= t('Add a new task') ?>">+</a> + <div class="board-add-icon"> + <a href="?controller=task&action=create&project_id=<?= $column['project_id'] ?>&column_id=<?= $column['id'] ?>" title="<?= t('Add a new task') ?>">+</a> + </div> <?= Helper\escape($column['title']) ?> <?php if ($column['task_limit']): ?> <span title="<?= t('Task limit') ?>" class="task-limit"> diff --git a/app/Templates/layout.php b/app/Templates/layout.php index aa430477..62377588 100644 --- a/app/Templates/layout.php +++ b/app/Templates/layout.php @@ -12,6 +12,7 @@ <?= Helper\css('assets/css/app.css') ?> <?= Helper\css('assets/css/font-awesome.min.css') ?> + <?= Helper\css('assets/css/jquery-ui-1.10.4.custom.css'); ?> <link rel="icon" type="image/png" href="assets/img/favicon.png"> <link rel="apple-touch-icon" href="assets/img/touch-icon-iphone.png"> @@ -58,4 +59,4 @@ </section> <?php endif ?> </body> -</html>
\ No newline at end of file +</html> diff --git a/app/Templates/task_edit.php b/app/Templates/task_edit.php index c03c7d9a..015f746d 100644 --- a/app/Templates/task_edit.php +++ b/app/Templates/task_edit.php @@ -22,7 +22,6 @@ </div> <div class="form-column"> - <?= Helper\form_hidden('id', $values) ?> <?= Helper\form_hidden('project_id', $values) ?> @@ -44,7 +43,6 @@ <?= Helper\form_label(t('Due Date'), 'date_due') ?> <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/> <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div> - </div> <div class="form-actions"> @@ -53,4 +51,6 @@ </div> </form> </section> -</section>
\ No newline at end of file +</section> + +<?= Helper\js('assets/js/task.js'); ?> diff --git a/app/Templates/task_new.php b/app/Templates/task_new.php index 2938c4ca..392330ae 100644 --- a/app/Templates/task_new.php +++ b/app/Templates/task_new.php @@ -21,7 +21,6 @@ </div> <div class="form-column"> - <?= Helper\form_hidden('project_id', $values) ?> <?= Helper\form_label(t('Assignee'), 'owner_id') ?> @@ -50,4 +49,6 @@ </div> </form> </section> -</section>
\ No newline at end of file +</section> + +<?= Helper\js('assets/js/task.js'); ?> |