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 d6deb5fdb9892b152e686e5631fc79a773ec2bc5 (commit)
from c8a546ecad6f381a1e49979836c5a9e120b73f07 (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=d6deb5fdb9892b152e686e5631fc79a773ec2bc5
commit d6deb5fdb9892b152e686e5631fc79a773ec2bc5
Author: Franck Villaume <[email protected]>
Date: Sun May 28 19:31:28 2017 +0200
clean-up, CSS, HTML helpers
diff --git a/src/common/include/user_profile.php
b/src/common/include/user_profile.php
index 7e1885d..14b6edb 100644
--- a/src/common/include/user_profile.php
+++ b/src/common/include/user_profile.php
@@ -55,7 +55,7 @@ function user_personal_information($user, $compact = false,
$title = false) {
$html .= '<tr>';
if($user_logo) {
- $html .= '<td width="150">'. $user_logo .'</td>';
+ $html .= '<td style="width: 150px;">'. $user_logo .'</td>';
}
else {
$html .= '<td></td>';
diff --git a/src/common/widget/Widget_TrackerContent.class.php
b/src/common/widget/Widget_TrackerContent.class.php
index b8de75d..ef0203e 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -618,7 +618,7 @@ EOS;
} else {
$cellContent = ' ';
}
- $cells[] = array($cellContent, 'width'
=> $extrafieldID[$keys[0]][0].'%', 'style' => 'vertical-align: top;');
+ $cells[] = array($cellContent, 'style'
=> 'vertical-align: top; width: '.$extrafieldID[$keys[0]][0].'%');
}
$return .= $HTML->multiTableRow(array(),
$cells);
$return .= $HTML->listTableBottom();
diff --git a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
index bfd661c..dc6438f 100644
--- a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
+++ b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
@@ -59,7 +59,7 @@ function globalsearch_admin_table_postadd () {
}
if (db_query_params ('INSERT INTO plugin_globalsearch_assoc_site
(title, link, onlysw, enabled, rank)
-VALUES ($1, $2, $3, $4, $5)',
+ VALUES ($1, $2, $3, $4, $5)',
array ($new_title,
$new_link,
$new_onlysw,
@@ -204,7 +204,7 @@ function globalsearch_admin_table_show () {
echo $HTML->multiTableRow(array(),$cell_data, TRUE);
echo '<tr>';
- echo '<td width="5%"></td>';
+ echo '<td style="width:5%;"></td>';
echo '<td><strong>'._('Forge ID').'</strong></td>';
echo '<td><strong>'._('Title').'</strong></td>';
echo '<td><strong>'._('Link').'</strong></td>';
diff --git a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
index dd24272..aca1751 100644
--- a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
+++ b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
@@ -3,7 +3,7 @@
* FusionForge Darcs plugin
*
* Copyright 2009, Roland Mas
- * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016-2017, Franck Villaume - TrivialDev
*
* This file is part of FusionForge.
*
@@ -96,6 +96,7 @@ over it to the project's administrator.");
}
function getInstructionForDarcs($project, $rw) {
+ global $HTML;
$repo_names = $this->getRepositories($project);
if (count($repo_names) > 0) {
$default_repo = "REPO";
@@ -113,22 +114,17 @@ over it to the project's administrator.");
$b .= '<p>'._('where REPO can be:
').implode(_(', '), $repo_names).'</p>';
}
} else if (is_dir($this->getRootRepositories($project))) {
- $b = '<p><em>'._('No repositories
defined.').'</em></p>';
+ $b = $HTML->information(_('No repositories defined.'));
} else {
- $b = '<p><em>'._('Repository not yet created, wait an
hour.').'</em></p>';
+ $b = $HTML->information(_('Repository not yet created,
wait an hour.'));
}
return $b;
}
function getInstructionsForAnon($project) {
- $b = '<h2>';
- $b .= _('Anonymous Darcs Access');
- $b .= '</h2>';
- $b .= '<p>';
- $b .= _('This project\'s Darcs repository can be checked out
through anonymous access with the following command.');
- $b .= '</p>';
+ $b = html_e('h2', array(), _('Anonymous Access'));
+ $b .= html_e('p', array(), _("This project's Darcs repository
can be checked out through anonymous access with the following command."));
$b .= $this->getInstructionForDarcs($project, false);
- $b .= '</p>';
return $b;
}
@@ -153,32 +149,25 @@ over it to the project's administrator.");
$b = '';
$filename =
$project->getUnixName().'-scm-latest.tar'.util_get_compressed_file_extension();
if
(file_exists(forge_get_config('scm_snapshots_path').'/'.$filename)) {
- $b .= '<p>[';
- $b .=
util_make_link("/snapshots.php?group_id=".$project->getID(),
- _('Download the nightly snapshot')
- );
- $b .= ']</p>';
+ $b .= html_e('p', array(),
'['.util_make_link("/snapshots.php?group_id=".$project->getID(), _('Download
the nightly snapshot')).']');
}
return $b;
}
function getBrowserLinkBlock($project) {
+ global $HTML;
$b = html_e('h2', array(), _('Darcs Repository Browser'));
- $b .= '<p>';
- $b .= sprintf(_("Browsing the %s tree gives you a view into the
current status of this project's code."), 'Darcs');
- $b .= ' ';
- $b .= _('You may also view the complete histories of any file
in the repository.');
- $b .= '</p>';
+ $b .= html_e('p', array(), _("Browsing the Darcs tree gives you
a view into the current status"
+ . " of this project's code. You
may also view the complete"
+ . " history of any file in the
repository."));
$repo_names = $this->getRepositories($project);
if (count($repo_names) > 0) {
foreach ($repo_names as $repo_name) {
- $b .= '<p>[';
- $b .=
util_make_link("/scm/browser.php?group_id=".$project->getID()."&repo_name=".$repo_name,
-
sprintf(_('Browse %s Repository'), 'Darcs') .' ' . $repo_name);
- $b .= ']</p>';
+ $b .= html_e('p', array(),
'['.util_make_link('/scm/browser.php?group_id='.$project->getID()."&repo_name=".$repo_name,
+
_('Browse Darcs repository').' '.$repo_name).']');
}
} else {
- $b .= '<p>'._('No repositories to browse').'</p>';
+ $b .= $HTML->information(_('No repositories to
browse'));
}
return $b;
}
@@ -192,30 +181,30 @@ over it to the project's administrator.");
if (db_numrows($result) > 0) {
$tableHeaders = array(
- _('Name'),
- _('Adds'),
- _('Updates')
- );
- $b .= $HTML->listTableTop($tableHeaders);
+ _('Name'),
+ _('Adds'),
+ _('Updates')
+ );
+ $b .= $HTML->listTableTop($tableHeaders, array(), '',
'repo-history');
$i = 0;
$total = array('adds' => 0, 'commits' => 0);
- while($data = db_fetch_array($result)) {
- $b .= '<tr>';
- $b .= '<td width="50%">';
- $b .= util_make_link_u($data['user_name'],
$data['user_id'], $data['realname']);
- $b .= '</td><td width="25%"
align="right">'.$data['adds']. '</td>'.
- '<td width="25%"
align="right">'.$data['commits'].'</td></tr>';
+ while ($data = db_fetch_array($result)) {
+ $cells = array();
+ $cells[] =
array(util_display_user($data['user_name'], $data['user_id'],
$data['realname']), 'class' => 'halfwidth');
+ $cells[] = array($data['adds'], 'class' =>
'onequarterwidth align-right');
+ $cells[] = array($data['commits'], 'class' =>
'onequarterwidth align-right');
+ $b .= $HTML->multiTableRow(array(), $cells);
$total['adds'] += $data['adds'];
$total['commits'] += $data['commits'];
$i++;
}
- $b .= '<tr>';
- $b .= '<td
width="50%"><strong>'._('Total').':</strong></td>'.
- '<td width="25%"
align="right"><strong>'.$total['adds']. '</strong></td>'.
- '<td width="25%"
align="right"><strong>'.$total['commits'].'</strong></td>';
- $b .= '</tr>';
+ $cells = array();
+ $cells[] = array(html_e('strong', array(),
_('Total')._(':')), 'class' => 'halfwidth');
+ $cells[] = array($total['adds'], 'class' =>
'onequarterwidth align-right');
+ $cells[] = array($total['commits'], 'class' =>
'onequarterwidth align-right');
+ $b .= $HTML->multiTableRow(array(), $cells);
$b .= $HTML->listTableBottom();
} else {
$b .= $HTML->information(_('No history yet'));
@@ -592,11 +581,11 @@ over it to the project's administrator.");
while ($res = db_fetch_array($result)) {
array_push($nm, $res['repo_name']);
}
- print '<p><strong>'._('Repository to be
created: ').'</strong>'.
+ print '<p><strong>'._('Repository to be
created')._(': ').'</strong>'.
implode(_(', '), $nm) . '</p>';
}
- print '<p><strong>'._('Create new
repository:').'</strong></p>';
+ print '<p><strong>'._('Create new repository')._(':
').'</strong></p>';
print '<p>'._('Repository name')._(': ');
print '<input type="string" name="scm_create_repo_name"
size=16 maxlength=128 /></p>';
print '<p>'._('Clone')._(': ').
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index d2bac7d..ebc8a3c 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -321,10 +321,9 @@ control over it to the project's administrator.");
function getBrowserLinkBlock($project) {
$b = html_e('h2', array(), _('Git Repository Browser'));
$b .= html_e('p', array(), _("Browsing the Git tree gives you a
view into the current status"
- . " of
this project's code. You may also view the complete"
- . "
history of any file in the repository."));
- $b .= html_e('p', array(),
'['.util_make_link('/scm/browser.php?group_id='.$project->getID(),
-
_('Browse main git repository')).']');
+ . " of this project's code. You
may also view the complete"
+ . " history of any file in the
repository."));
+ $b .= html_e('p', array(),
'['.util_make_link('/scm/browser.php?group_id='.$project->getID(), _('Browse
main git repository')).']');
# Extra repos
$result = db_query_params('SELECT repo_name FROM
scm_secondary_repos WHERE group_id=$1 AND next_action = $2 AND plugin_id=$3
ORDER BY repo_name',
diff --git a/src/plugins/taskboard/www/js/agile-board.js
b/src/plugins/taskboard/www/js/agile-board.js
index c956039..d20a511 100644
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@ -3,7 +3,7 @@
*
* Previous Copyright to FusionForge Team
* Copyright 2016, Stéphane-Eymeric Bredthauer - TrivialDev
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016-2017, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -169,7 +169,7 @@ function drawBoardProgress() {
}
var html = '<table>';
- html += '<tr><td width="' + parseInt( 100 / aPhases.length ) + '%"
style="padding: 0;">' + gMessages.progressByTasks + ':</td><td style="padding:
0;">';
+ html += '<tr><td style="padding: 0; width: '+ parseInt( 100 /
aPhases.length ) +'%">' + gMessages.progressByTasks + ':</td><td
style="padding: 0;">';
var buf = 0;
for( var j=start; j<aPhases.length; j++) {
@@ -198,7 +198,7 @@ function drawBoardProgress() {
var wt = parseInt( totalCostCompleted/totalCostEstimated * 100);
// show progress by cost
html += '<table>';
- html += '<tr><td width="' + parseInt( 100 / aPhases.length ) +
'%" style="padding: 0;">' + gMessages.progressByCost + ':</td><td
style="padding: 0;">';
+ html += '<tr><td style="padding: 0; width: '+ parseInt( 100 /
aPhases.length ) +'">' + gMessages.progressByCost + ':</td><td style="padding:
0;">';
html += '<div class="agile-board-progress-bar-done"
style="width: ' + wt + '%;" title="' + gMessages['completedCost'] + '">' +
totalCostCompleted + '</div>';
html += '<div class="agile-board-progress-bar-remains"
style="width: ' + ( 100 - wt ) + '%;" title="' + gMessages['remainingCost'] +
'">' + totalCostRemaining + '</div>';
html += '</td></tr><table>';
-----------------------------------------------------------------------
Summary of changes:
src/common/include/user_profile.php | 2 +-
src/common/widget/Widget_TrackerContent.class.php | 2 +-
.../common/globalsearch_edit_utils.php | 4 +-
src/plugins/scmdarcs/common/DarcsPlugin.class.php | 75 +++++++++-------------
src/plugins/scmgit/common/GitPlugin.class.php | 7 +-
src/plugins/taskboard/www/js/agile-board.js | 6 +-
6 files changed, 42 insertions(+), 54 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
