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, master has been updated
via 2bc498f457375f027173ff03119ee125fe5dfb48 (commit)
via 6bc2b95e2468d04e88a236105090d8abccca31a5 (commit)
via 17a73f26642dfe04ae0023682d15f6821db65bac (commit)
via 68fd3084e361c047acdc9104606692a3c97397be (commit)
from b781a020d053054620752fac45463553a907f5dd (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=2bc498f457375f027173ff03119ee125fe5dfb48
commit 2bc498f457375f027173ff03119ee125fe5dfb48
Author: Alain Peyrat <[email protected]>
Date: Sat Oct 3 10:09:00 2015 +0200
taskboard: fix typo.
diff --git a/src/plugins/taskboard/common/views/admin/columns.php
b/src/plugins/taskboard/common/views/admin/columns.php
index ce7c349..3dbeb97 100644
--- a/src/plugins/taskboard/common/views/admin/columns.php
+++ b/src/plugins/taskboard/common/views/admin/columns.php
@@ -72,7 +72,7 @@ if (count($taskboard->getUsedTrackersIds()) == 0) {
$cells[][] = html_e('input', array('type' => 'text', 'name' =>
'column_title', 'required' => 'required'));
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
- $cells[][] = html_e('strong', array(), _('Title backgound
color')._(':'));
+ $cells[][] = html_e('strong', array(), _('Title background
color')._(':'));
$cells[][] = $taskboard->colorBgChooser('title_bg_color');
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6bc2b95e2468d04e88a236105090d8abccca31a5
commit 6bc2b95e2468d04e88a236105090d8abccca31a5
Author: Alain Peyrat <[email protected]>
Date: Sat Oct 3 10:08:45 2015 +0200
taskbaord: Use [#NNN] for naming trackers
diff --git a/src/plugins/taskboard/www/js/agile-board.js
b/src/plugins/taskboard/www/js/agile-board.js
index fea0752..e76d4f6 100644
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@ -204,7 +204,7 @@ function drawUserStories() {
start=1;
l_sHtml += '<td class="agile-phase"><div
class="agile-sticker-container">';
l_sHtml += '<div class="agile-sticker
agile-sticker-user-story" id="user-story-' + us.id + '">';
- l_sHtml += '<div class="agile-sticker-header"><a
href="' + us.url + '" target="_blank">' + us.id + '</a>';
+ l_sHtml += '<div class="agile-sticker-header"><a
href="' + us.url + '" target="_blank">[#' + us.id + ']</a>';
l_sHtml += '<div style="float: right";>[<a href=""
class="agile-toolbar-add-task" user_story_id="' +us.id+
'">+</a>]</div></div>\n';
l_sHtml += '<div class="agile-sticker-body">' +
us.title + "</div>\n";
l_sHtml += "</div>\n";
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=17a73f26642dfe04ae0023682d15f6821db65bac
commit 17a73f26642dfe04ae0023682d15f6821db65bac
Author: Alain Peyrat <[email protected]>
Date: Sat Oct 3 10:08:05 2015 +0200
taskboard: Indent fixes
diff --git a/src/plugins/taskboard/common/TaskBoard.class.php
b/src/plugins/taskboard/common/TaskBoard.class.php
index d1c432d..37ae400 100644
--- a/src/plugins/taskboard/common/TaskBoard.class.php
+++ b/src/plugins/taskboard/common/TaskBoard.class.php
@@ -995,11 +995,11 @@ class TaskBoard extends Error {
*/
function getUnusedResolutions() {
static $resolutions = NULL;
-
+
if( !$resolutions ) {
$all_resolutions = $this->getAvailableResolutions();
$used_resolutions = $this->getUsedResolutions();
-
+
$resolutions = array();
if( $all_resolutions && count( $used_resolutions ) > 0
) {
$resolutions = array_diff( $all_resolutions,
$used_resolutions );
@@ -1008,7 +1008,6 @@ class TaskBoard extends Error {
}
}
-
return $resolutions;
}
}
diff --git a/src/plugins/taskboard/common/TaskBoardColumnSource.class.php
b/src/plugins/taskboard/common/TaskBoardColumnSource.class.php
index 4686189..08b44f5 100644
--- a/src/plugins/taskboard/common/TaskBoardColumnSource.class.php
+++ b/src/plugins/taskboard/common/TaskBoardColumnSource.class.php
@@ -248,19 +248,19 @@ class TaskBoardColumnSource extends Error {
if( $this->getAutoassign() ) {
$assigned_to = user_getid();
}
-
+
$remaining_cost = NULL;
if( $this->getTaskboard()->getRemainingCostField() ) {
// set 0 to remainin cost if target column is a last one
$target_column = taskboard_column_get_object(
$this->getTargetColumnID() );
-
+
$columns = $this->getTaskboard()->getColumns();
if( $target_column->getOrder() == count($columns) ) {
- // final column, so set remaining cost to 0
+ // final column, so set remaining cost to 0
$remaining_cost = 0;
}
- }
+ }
$msg = $this->getTaskboard()->TrackersAdapter->updateTask(
$task, $assigned_to, $this->getTargetResolution(), NULL, NULL, $remaining_cost
);
if($msg) {
diff --git a/src/plugins/taskboard/common/TaskBoardRelease.class.php
b/src/plugins/taskboard/common/TaskBoardRelease.class.php
index 03d65de..e1994bd 100644
--- a/src/plugins/taskboard/common/TaskBoardRelease.class.php
+++ b/src/plugins/taskboard/common/TaskBoardRelease.class.php
@@ -275,17 +275,17 @@ class TaskBoardRelease extends Error {
if( $tsk['phase_id'] ==
$columns[$i]->getID() ) {
if( $i + 1 == $_columns_num ) {
// last column, so -
completed task
-
$ret['completed_tasks']++;
+
$ret['completed_tasks']++;
} else {
// incomplete task, so
incomplete US
$completed_us = false;
}
$ret['tasks']++;
-
+
if(
$tsk['estimated_dev_effort'] ) {
$ret['completed_man_days'] += ( (float) $tsk['estimated_dev_effort'] - (float)
$tsk['remaining_dev_effort'] );
}
-
+
if(
$tsk['estimated_dev_effort'] ) {
$ret['man_days'] +=
(float) $tsk['estimated_dev_effort'];
}
diff --git a/src/plugins/taskboard/www/js/agile-board.js
b/src/plugins/taskboard/www/js/agile-board.js
index 789d837..fea0752 100644
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@ -143,7 +143,7 @@ function drawBoardProgress() {
if(
aUserStories[i].tasks[t].estimated_dev_effort ) {
totalCostEstimated +=
parseFloat( aUserStories[i].tasks[t].estimated_dev_effort );
}
-
+
if(
aUserStories[i].tasks[t].remaining_dev_effort ) {
totalCostRemaining +=
parseFloat( aUserStories[i].tasks[t].remaining_dev_effort );
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=68fd3084e361c047acdc9104606692a3c97397be
commit 68fd3084e361c047acdc9104606692a3c97397be
Author: Alain Peyrat <[email protected]>
Date: Sat Oct 3 10:07:39 2015 +0200
taskboard: Add information on costs and integration with avatar plugin in
cards
diff --git a/src/plugins/taskboard/common/TaskBoard.class.php
b/src/plugins/taskboard/common/TaskBoard.class.php
index de4cf0f..d1c432d 100644
--- a/src/plugins/taskboard/common/TaskBoard.class.php
+++ b/src/plugins/taskboard/common/TaskBoard.class.php
@@ -724,6 +724,14 @@ class TaskBoard extends Error {
$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 b776e70..56c799d 100644
--- a/src/plugins/taskboard/www/css/agile-board.css
+++ b/src/plugins/taskboard/www/css/agile-board.css
@@ -11,9 +11,9 @@
}
.agile-board-progress-bar, .agile-board-progress-bar-done,
.agile-board-progress-bar-remains {
- float : left;
- text-align: center;
- padding: 2px 0;
+ float : left;
+ text-align: center;
+ padding: 2px 0;
}
.agile-board-progress-bar-done {
@@ -65,7 +65,7 @@
font-size: 10px;
width: 100%;
/* border: solid #CCCCCC 1px; */
- height: 130px;
+ height: 80px;
-moz-box-shadow: 0 4px 8px rgba(0,0,0,0.5);
-webkit-box-shadow: 0 4px 8px rgba(0,0,0,0.5);
box-shadow: 0 4px 8px rgba(0,0,0,0.5);
@@ -85,12 +85,33 @@
}
.agile-sticker-body {
+ position: relative;
padding: 2px;
- height: 108px;
+ height: 58px;
width: 98%;
overflow: hidden;
}
+.agile-sticker-assignee-face {
+ position: absolute;
+ top: 0;
+ right: 0;
+}
+
+.agile-sticker-assignee {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ text-align: left;
+}
+
+.agile-sticker-effort {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ text-align: right;
+}
+
.agile-sticker-user-story {
background-color: #FFFF99;
}
diff --git a/src/plugins/taskboard/www/js/agile-board.js
b/src/plugins/taskboard/www/js/agile-board.js
index 7c14ffa..789d837 100644
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@ -389,10 +389,20 @@ function drawTasks( oUserStory, sPhaseId ) {
l_sHtml += '<div class="agile-sticker-container">';
l_sHtml += '<div class="agile-sticker
agile-sticker-task agile-sticker-task-' + tsk.user_story + '" id="task-' +
tsk.id + '" >';
l_sHtml += '<div class="agile-sticker-header"
style="background-color: ' + tsk.background + ';">';
- l_sHtml += '<a href="' + tsk.url + '"
target="_blank">' + tsk.id + '</a>';
+ l_sHtml += '<a href="' + tsk.url + '"
target="_blank">[#' + tsk.id + ']</a>';
l_sHtml += "</div>\n";
- l_sHtml += '<div class="agile-sticker-body">' +
tsk.title + '</div>';
- l_sHtml += "</div></div>\n";
+ l_sHtml += '<div class="agile-sticker-body">' +
tsk.title;
+ if( tsk.assigned_to_face ) {
+ l_sHtml += '<div
class="agile-sticker-assignee-face">' + tsk.assigned_to_face + '</div>';
+ }
+ if( tsk.assigned_to != "Nobody" ) {
+ l_sHtml += '<div
class="agile-sticker-assignee">Assigned: ' + tsk.assigned_to + '</div>';
+ }
+ if( tsk.estimated_dev_effort ) {
+ l_sHtml += '<div class="agile-sticker-effort">'
+ tsk.remaining_dev_effort + '/' + tsk.estimated_dev_effort + '</div>';
+ }
+ l_sHtml += '</div>';
+ l_sHtml += "</div></div>\n";
}
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/taskboard/common/TaskBoard.class.php | 13 ++++++---
.../common/TaskBoardColumnSource.class.php | 8 +++---
.../taskboard/common/TaskBoardRelease.class.php | 6 ++---
.../taskboard/common/views/admin/columns.php | 2 +-
src/plugins/taskboard/www/css/agile-board.css | 31 ++++++++++++++++++----
src/plugins/taskboard/www/js/agile-board.js | 20 ++++++++++----
6 files changed, 59 insertions(+), 21 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
