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 8cc4487eb7bcff4ad36a886fbac67207f5a71705 (commit)
via 539480dba1f4349addda259c972b7f24b6841c9c (commit)
from d9cd8b320a7cbe6c8bb38ba6b801bdf4e3394063 (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=8cc4487eb7bcff4ad36a886fbac67207f5a71705
commit 8cc4487eb7bcff4ad36a886fbac67207f5a71705
Author: Franck Villaume <[email protected]>
Date: Wed Feb 22 21:01:09 2017 +0100
tabs vs. space
diff --git a/src/www/include/html.php b/src/www/include/html.php
index b61f982..c6feb97 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -867,19 +867,18 @@ function html_build_multiple_select_box($result, $name,
$checked_array, $size =
* @param bool $show_100 Whether or not to show the '100 row'
* @param string $text_100 What to call the '100 row' defaults to
none.
* @param bool $allowed
- * @param array $attrs Array of other attributes for this select element
+ * @param array $attrs Array of other attributes for this
select element
* @param array $opts_attrs
* @param array $attrs_100
* @param array $optgroup
* @return string
* @throws Exception
*/
-function html_build_multiple_select_box_from_arrays(
- $vals, $texts, $name, $checked_array = array(), $size = 8,
- $show_100 = true, $text_100 = 'none',
- $allowed = false, $attrs = array(),
- $opts_attrs = array(), $attrs_100 = array(),
- $optgroup = array()) {
+function html_build_multiple_select_box_from_arrays($vals, $texts, $name,
$checked_array = array(), $size = 8,
+ $show_100 = true, $text_100 =
'none',
+ $allowed = false, $attrs =
array(),
+ $opts_attrs = array(),
$attrs_100 = array(),
+ $optgroup = array()) {
$return = html_ao('select', array_merge($attrs, array('name' => $name,
'multiple' => 'multiple', 'size' => $size)));
if ($show_100) {
if ($text_100 == 'none') {
@@ -925,7 +924,7 @@ function html_build_multiple_select_box_from_arrays(
if ($withGroup && $vals[$i]!='100' &&
$optgroup[$i]!=$currentGroup) {
if ($currentGroup!='' && $groupOpen) {
$return .= html_ac(html_ap() - 1);
- $groupOpen = false; // @fixme see
$groupOpen below
+ $groupOpen = false;
}
$return .= html_ao('optgroup',
array('label'=>$optgroup[$i]));
$groupOpen = true;
@@ -950,7 +949,7 @@ function html_build_multiple_select_box_from_arrays(
* @param array $attrs Array of other attributes for
this element
* @return html code for checkbox control
*/
-function html_build_checkbox($name, $value, $checked, $attrs=array()) {
+function html_build_checkbox($name, $value, $checked, $attrs = array()) {
if ($value === false) {
$attrs = array_merge(array('id' => $name, 'name' => $name,
'type' => 'checkbox'), $attrs);
} else {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=539480dba1f4349addda259c972b7f24b6841c9c
commit 539480dba1f4349addda259c972b7f24b6841c9c
Author: Franck Villaume <[email protected]>
Date: Wed Feb 22 21:00:50 2017 +0100
add project name in table to help users to identify project
diff --git a/src/common/tracker/actions/ind.php
b/src/common/tracker/actions/ind.php
index d519a44..71aaab2 100644
--- a/src/common/tracker/actions/ind.php
+++ b/src/common/tracker/actions/ind.php
@@ -94,7 +94,7 @@ if (count($at_arr) < 1) {
if ($at_arr[$j]->Group->getID() !=
$group->getID()) {
$cells[] = array(sprintf(_('Child
project %s Tracker'),
util_make_link('/tracker/?group_id='.$at_arr[$j]->Group->getID(),
$at_arr[$j]->Group->getPublicName())), 'content' =>
$at_arr[$j]->Group->getID());
} else {
- $cells[] = array('', 'content' =>
$at_arr[$j]->Group->getID());
+ $cells[] = array(sprintf(_('Project %s
Tracker'), $at_arr[$j]->Group->getPublicName()), 'content' =>
$at_arr[$j]->Group->getID());
}
}
$cells[][] =
util_make_link('/tracker/?atid='.$at_arr[$j]->getID().'&group_id='.$at_arr[$j]->Group->getID().'&func=browse',
$HTML->getFollowPic().' '.$at_arr[$j]->getName());
diff --git a/src/www/forum/index.php b/src/www/forum/index.php
index aaa0d1d..2fecd50 100644
--- a/src/www/forum/index.php
+++ b/src/www/forum/index.php
@@ -115,7 +115,7 @@ if ($group_id) {
if ($farr[$j]->Group->getID() != $group_id) {
$cells[] = array(sprintf(_('Child
project %s Forum'),
util_make_link('/forum/?group_id='.$farr[$j]->Group->getID(),
$farr[$j]->Group->getPublicName())), 'content' => $farr[$j]->Group->getID());
} else {
- $cells[] = array('', 'content' =>
$farr[$j]->Group->getID());
+ $cells[] = array(sprintf(_('Project %s
Forum'), $at_arr[$j]->Group->getPublicName()), 'content' =>
$farr[$j]->Group->getID());
}
}
$cells[][] =
util_make_link('/forum/forum.php?forum_id='.$farr[$j]->getID().'&group_id='.$farr[$j]->Group->getID(),
$HTML->getForumPic().' '.$farr[$j]->getName());
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/ind.php | 2 +-
src/www/forum/index.php | 2 +-
src/www/include/html.php | 17 ++++++++---------
3 files changed, 10 insertions(+), 11 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
