This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via ba9a68beba4474790ec8109ae4c599678365dcdf (commit)
from 98027d4489a643f250958b37959c03e3f59a28c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ba9a68beba4474790ec8109ae4c599678365dcdf
commit ba9a68beba4474790ec8109ae4c599678365dcdf
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Mon Mar 5 12:47:55 2018 +0000
plugin taskboard: better display for task
diff --git a/src/plugins/taskboard/common/TaskBoard.class.php
b/src/plugins/taskboard/common/TaskBoard.class.php
index be80ea7..2c25c8b 100644
--- a/src/plugins/taskboard/common/TaskBoard.class.php
+++ b/src/plugins/taskboard/common/TaskBoard.class.php
@@ -631,7 +631,7 @@ class TaskBoard extends FFError {
$efd = $story ->getExtraFieldData();
$stories[$story->getID()]['order'] =
$efd[$user_stories_sort_extra_field_id];
} else {
- //sort by GF priority if another field for
sorting is not defined
+ //sort by FF priority if another field for
sorting is not defined
$stories[$story->getID()]['order'] =
$stories[$story->getID()]['priority'];
}
@@ -761,7 +761,7 @@ class TaskBoard extends FFError {
$ret['id'] = $task->getID();
$ret['title'] = $task->getSummary();
$ret['description'] = str_replace("\n", '<br>',
util_gen_cross_ref($task->getDetails(),$this->Group->getID()) );
- $ret['assigned_to'] = $task->getAssignedRealName();
+ $ret['assigned_to'] =
util_display_user($task->getAssignedUnixName(), $task->getAssignedTo(),
$task->getAssignedRealName());
$ret['priority'] = $task->getPriority();
foreach( $ef_mapping as $k => $f){
$ret[$k] = '';
@@ -779,14 +779,6 @@ class TaskBoard extends FFError {
$ret['url'] = $this->TrackersAdapter->getTaskUrl($task);
- $params = array('user_id' => $task->getAssignedTo(), 'size' =>
's', 'content' => '');
- plugin_hook_by_reference("user_logo", $params);
- if ($params['content']) {
- $ret['assigned_to_face'] = $params['content'];
- } else {
- $ret['assigned_to_face'] = '';
- }
-
return $ret;
}
diff --git a/src/plugins/taskboard/www/css/agile-board.css
b/src/plugins/taskboard/www/css/agile-board.css
index 05709c0..8280826 100644
--- a/src/plugins/taskboard/www/css/agile-board.css
+++ b/src/plugins/taskboard/www/css/agile-board.css
@@ -31,7 +31,7 @@
.agile-phase {
border: none;
- padding: 0;
+ padding: 5px;
margin: 0;
}
@@ -67,11 +67,10 @@
}
.agile-sticker-container {
- padding: 4%;
+ padding-top: 4%;
float: left;
margin-left: auto;
margin-right: auto;
- width: 92%;
}
.agile-sticker-container.filtred {
@@ -81,8 +80,6 @@
.agile-sticker {
font-size: 10px;
width: 100%;
- /* border: solid #CCCCCC 1px; */
- height: 80px;
box-shadow: 0 4px 8px rgba(0,0,0,0.5);
}
@@ -94,11 +91,11 @@
.agile-sticker-header {
background-color: #AAAAAA;
- padding: 2px;
+ padding: 1px;
}
.agile-sticker-footer {
- padding: 2px;
+ padding: 1px;
}
.agile-sticker-header a {
@@ -127,7 +124,6 @@
.agile-sticker-body {
position: relative;
padding: 2px;
- min-height: 41px;
width: 98%;
overflow: hidden;
}
diff --git a/src/plugins/taskboard/www/js/agile-board.js
b/src/plugins/taskboard/www/js/agile-board.js
index c3dd1a3..7d54a29 100644
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@ -243,9 +243,9 @@ function drawUserStories() {
for( var j=start; j<aPhases.length; j++) {
var ph=aPhases[j];
- var style = '';
+ var style = 'style="vertical-align: top;"';
if( ph.background ) {
- style = ' style="background-color:' +
ph.background + ';"';
+ style = ' style="background-color:' +
ph.background + '; vertical-align: top;"';
}
l_sHtml += '<td id="' + ph.id + '-' + us.id + '"
class="agile-phase agile-tasks agile-phase-' + ph.id + '"' + style + '>';
l_sHtml += "</td>\n";
@@ -434,9 +434,6 @@ function drawTasks( oUserStory, sPhaseId ) {
l_sHtml += '<div class="agile-sticker-body">';
l_sHtml += '<div class="agile-sticker-name">' +
tsk.title +'</div>';
l_sHtml += '<div class="agile-sticker-description">' +
tsk.description +'</div>';
- if( tsk.assigned_to_face ) {
- l_sHtml += '<div
class="agile-sticker-assignee-face">' + tsk.assigned_to_face + '</div>';
- }
l_sHtml += '</div>';
l_sHtml += '<div class="agile-sticker-footer">';
if( tsk.assigned_to != "Nobody" ) {
-----------------------------------------------------------------------
Summary of changes:
src/plugins/taskboard/common/TaskBoard.class.php | 12 ++----------
src/plugins/taskboard/www/css/agile-board.css | 12 ++++--------
src/plugins/taskboard/www/js/agile-board.js | 7 ++-----
3 files changed, 8 insertions(+), 23 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
