summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Template/board/task.php10
-rw-r--r--app/Template/board/task_public.php4
-rw-r--r--assets/css/app.css50
-rw-r--r--assets/css/src/board.css4
-rw-r--r--assets/css/src/dropdown.css4
-rw-r--r--assets/css/src/task.css42
6 files changed, 84 insertions, 30 deletions
diff --git a/app/Template/board/task.php b/app/Template/board/task.php
index 8b9fca6b..4c5a4252 100644
--- a/app/Template/board/task.php
+++ b/app/Template/board/task.php
@@ -44,8 +44,14 @@
) ?>
</span>
- <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->getTaskAge($task['date_creation']) ?></span>
- <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->getTaskAge($task['date_moved']) ?></span>
+ <?php if ($task['score']): ?>
+ <span class="task-score"><?= $this->e($task['score']) ?></span>
+ <?php endif ?>
+
+ <div class="task-board-days">
+ <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->getTaskAge($task['date_creation']) ?></span>
+ <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->getTaskAge($task['date_moved']) ?></span>
+ </div>
<div class="task-board-title">
<?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php
index 4e3ad18c..650b956d 100644
--- a/app/Template/board/task_public.php
+++ b/app/Template/board/task_public.php
@@ -18,6 +18,10 @@
<?php endif ?>
</span>
+ <?php if ($task['score']): ?>
+ <span class="task-score"><?= $this->e($task['score']) ?></span>
+ <?php endif ?>
+
<div class="task-board-title">
<?= $this->a($this->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
</div>
diff --git a/assets/css/app.css b/assets/css/app.css
index 75838065..34b29daa 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -723,6 +723,10 @@ nav .active a {
font-size: 0.9em;
}
/* board filters */
+.board-filters {
+ font-size: 0.9em;
+}
+
a.filter-on {
font-weight: bold;
color: #333;
@@ -840,6 +844,7 @@ a.task-board-collapsed-title {
.task-board-title {
margin-top: 10px;
+ margin-bottom: 10px;
font-size: 1.1em;
}
@@ -906,35 +911,54 @@ a.task-board-nobody {
color: #000;
}
-.task-board-date-overdue {
+span.task-board-date-overdue {
color: #D90000;
+ opacity: 1.0;
}
/* task score */
.task-score {
font-weight: bold;
position: absolute;
+}
+
+.task-board .task-score {
font-size: 1.6em;
- right: 5px;
+ left: 2px;
+ bottom: 0;
+}
+
+.task-show-details .task-score {
bottom: 5px;
+ right: 5px;
+ font-size: 2em;
}
/* task age */
-.task-days-age {
+.task-board-days {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ text-align: right;
+ opacity: 0.5;
font-size: 0.8em;
- border: #888 1px solid;
- border-radius:2px;
+}
+
+.task-board-days:hover {
+ opacity: 1.0;
+}
+
+.task-days-age {
+ border: #666 1px solid;
padding: 1px 4px 1px 2px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.task-days-incolumn {
- font-size: 0.8em;
- border: #888 1px solid;
+ border: #666 1px solid;
border-left: none;
margin-left: -5px;
- border-radius:2px;
padding: 1px 2px 1px 4px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
@@ -961,12 +985,6 @@ a.task-board-nobody {
list-style-type: circle;
}
-.task-show-details .task-score {
- font-size: 1.9em;
- right: 10px;
- bottom: 5px;
-}
-
.task-show-section {
margin-top: 30px;
margin-bottom: 20px;
@@ -1472,6 +1490,10 @@ a.task-board-nobody {
font-size: 1.1em;
}
+.page-header li.dropit-trigger {
+ padding: 0;
+}
+
td li.dropit-trigger {
margin: 0;
}
diff --git a/assets/css/src/board.css b/assets/css/src/board.css
index 93b2bcb2..153f70d1 100644
--- a/assets/css/src/board.css
+++ b/assets/css/src/board.css
@@ -1,4 +1,8 @@
/* board filters */
+.board-filters {
+ font-size: 0.9em;
+}
+
a.filter-on {
font-weight: bold;
color: #333;
diff --git a/assets/css/src/dropdown.css b/assets/css/src/dropdown.css
index 2c6d32c8..2b9f9044 100644
--- a/assets/css/src/dropdown.css
+++ b/assets/css/src/dropdown.css
@@ -44,6 +44,10 @@
font-size: 1.1em;
}
+.page-header li.dropit-trigger {
+ padding: 0;
+}
+
td li.dropit-trigger {
margin: 0;
}
diff --git a/assets/css/src/task.css b/assets/css/src/task.css
index 81f281b2..1b7a4233 100644
--- a/assets/css/src/task.css
+++ b/assets/css/src/task.css
@@ -43,6 +43,7 @@ a.task-board-collapsed-title {
.task-board-title {
margin-top: 10px;
+ margin-bottom: 10px;
font-size: 1.1em;
}
@@ -109,35 +110,54 @@ a.task-board-nobody {
color: #000;
}
-.task-board-date-overdue {
+span.task-board-date-overdue {
color: #D90000;
+ opacity: 1.0;
}
/* task score */
.task-score {
font-weight: bold;
position: absolute;
+}
+
+.task-board .task-score {
font-size: 1.6em;
- right: 5px;
+ left: 2px;
+ bottom: 0;
+}
+
+.task-show-details .task-score {
bottom: 5px;
+ right: 5px;
+ font-size: 2em;
}
/* task age */
-.task-days-age {
+.task-board-days {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ text-align: right;
+ opacity: 0.5;
font-size: 0.8em;
- border: #888 1px solid;
- border-radius:2px;
+}
+
+.task-board-days:hover {
+ opacity: 1.0;
+}
+
+.task-days-age {
+ border: #666 1px solid;
padding: 1px 4px 1px 2px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.task-days-incolumn {
- font-size: 0.8em;
- border: #888 1px solid;
+ border: #666 1px solid;
border-left: none;
margin-left: -5px;
- border-radius:2px;
padding: 1px 2px 1px 4px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
@@ -164,12 +184,6 @@ a.task-board-nobody {
list-style-type: circle;
}
-.task-show-details .task-score {
- font-size: 1.9em;
- right: 10px;
- bottom: 5px;
-}
-
.task-show-section {
margin-top: 30px;
margin-bottom: 20px;
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 14:24:33 +0000