From 794f7f7645f7949705f47b95e88fc5d292bb0a7d Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 15 Feb 2015 18:25:54 -0500 Subject: Add board horizontal scrolling --- app/Template/board/filters.php | 5 ++++ app/Template/board/show.php | 52 +++++++++++++++++++++-------------------- app/Template/board/swimlane.php | 4 ++-- app/Template/board/task.php | 2 +- assets/css/app.css | 19 +++++++++++---- assets/css/src/board.css | 10 ++++++-- assets/css/src/dropdown.css | 4 ++-- assets/css/src/task.css | 5 ++++ 8 files changed, 65 insertions(+), 36 deletions(-) diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php index 272b0b73..64a01b8f 100644 --- a/app/Template/board/filters.php +++ b/app/Template/board/filters.php @@ -29,6 +29,11 @@ a(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'])) ?> + +
  • + a(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?> +
  • + acl->isManagerActionAllowed($project['id'])): ?>
  • diff --git a/app/Template/board/show.php b/app/Template/board/show.php index dc524737..9fa95dbd 100644 --- a/app/Template/board/show.php +++ b/app/Template/board/show.php @@ -1,27 +1,29 @@ - - - -
    - - - - -

    - +
    + +
    - render('board/swimlane', array( - 'project' => $project, - 'swimlane' => $swimlane, - 'board_highlight_period' => $board_highlight_period, - 'categories' => $categories, - 'hide_swimlane' => count($swimlanes) === 1, - 'not_editable' => isset($not_editable), - )) ?> +
    - -
    \ No newline at end of file + + + +

    + + + render('board/swimlane', array( + 'project' => $project, + 'swimlane' => $swimlane, + 'board_highlight_period' => $board_highlight_period, + 'categories' => $categories, + 'hide_swimlane' => count($swimlanes) === 1, + 'not_editable' => isset($not_editable), + )) ?> + + + + \ No newline at end of file diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php index ec5272f3..331b5ac2 100644 --- a/app/Template/board/swimlane.php +++ b/app/Template/board/swimlane.php @@ -2,7 +2,7 @@ - 0): ?> + 0): ?> @@ -18,7 +18,7 @@ - +
    a('+', 'task', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'task-creation-popover', t('Add a new task')) ?> diff --git a/app/Template/board/task.php b/app/Template/board/task.php index 5f73a5c2..8b9fca6b 100644 --- a/app/Template/board/task.php +++ b/app/Template/board/task.php @@ -22,7 +22,7 @@
  • a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-description-popover') ?>
  • a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-edit-popover') ?>
  • a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => 'board'), true) ?>
  • - + diff --git a/assets/css/app.css b/assets/css/app.css index 96705433..75838065 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -740,8 +740,14 @@ a.filter-on { } /* board table */ -#board { - table-layout: fixed; +#board-container { + overflow-x: auto; +} + +#board td, +#board th { + min-width: 230px; + max-width: 230px; } #board th a { @@ -827,6 +833,11 @@ a.task-board-collapsed-title { font-weight: normal; } +.task-board .dropdown { + float: left; + margin-right: 5px; +} + .task-board-title { margin-top: 10px; font-size: 1.1em; @@ -1429,10 +1440,10 @@ a.task-board-nobody { position: absolute; left: 0; z-index: 1000; - min-width: 180px; + min-width: 230px; list-style: none; margin: 3px 0 0 1px; - padding: 6px 0; + padding: 6px 0; background-color: #fff; border: 1px solid #b2b2b2; -webkit-border-radius: 3px; diff --git a/assets/css/src/board.css b/assets/css/src/board.css index 81c2a3a2..93b2bcb2 100644 --- a/assets/css/src/board.css +++ b/assets/css/src/board.css @@ -16,8 +16,14 @@ a.filter-on { } /* board table */ -#board { - table-layout: fixed; +#board-container { + overflow-x: auto; +} + +#board td, +#board th { + min-width: 230px; + max-width: 230px; } #board th a { diff --git a/assets/css/src/dropdown.css b/assets/css/src/dropdown.css index 3d176516..2c6d32c8 100644 --- a/assets/css/src/dropdown.css +++ b/assets/css/src/dropdown.css @@ -12,10 +12,10 @@ position: absolute; left: 0; z-index: 1000; - min-width: 180px; + min-width: 230px; list-style: none; margin: 3px 0 0 1px; - padding: 6px 0; + padding: 6px 0; background-color: #fff; border: 1px solid #b2b2b2; -webkit-border-radius: 3px; diff --git a/assets/css/src/task.css b/assets/css/src/task.css index 77bcc48c..81f281b2 100644 --- a/assets/css/src/task.css +++ b/assets/css/src/task.css @@ -36,6 +36,11 @@ a.task-board-collapsed-title { font-weight: normal; } +.task-board .dropdown { + float: left; + margin-right: 5px; +} + .task-board-title { margin-top: 10px; font-size: 1.1em; -- cgit v1.2.3