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 010e73c070fb84b7dae4d0838cebf152b69f7650 (commit)
via 58b3449e1fd6973a4d9b5454046934205e011976 (commit)
from 96d21eddf637c2c1a6cbfeb7566200cf8981a477 (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=010e73c070fb84b7dae4d0838cebf152b69f7650
commit 010e73c070fb84b7dae4d0838cebf152b69f7650
Author: Franck Villaume <[email protected]>
Date: Sun Oct 2 15:22:03 2016 +0200
Rely on getDeletePic theme function
diff --git a/src/common/tracker/views/form-customizelist.php
b/src/common/tracker/views/form-customizelist.php
index a47d178..49db547 100644
--- a/src/common/tracker/views/form-customizelist.php
+++ b/src/common/tracker/views/form-customizelist.php
@@ -5,7 +5,7 @@
* Copyright 2010, FusionForge Team
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* Copyright 2012, Thorsten “mirabilos” Glaser <[email protected]>
- * Copyright 2015, Franck Villaume - TrivialDev
+ * Copyright 2015-2016, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -79,7 +79,7 @@ foreach ($fields as $f => $name) {
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&updownorder_field=1&new_pos='.(($pos
== count($browse_fields) - 1)? $pos + 1 : $pos + 2),
html_image('ic/btn_down.png', 19, 18, array('alt' => _('Down')))).
'</td>'."\n".
'<td class="align-center">'.
-
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&delete_field=1',
html_image('ic/trash.png','','',array('alt' => _('Delete')))).
+
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&id='.$f.'&customize_list=1&post_changes=1&delete_field=1',
$HTML->getDeletePic(_('Remove this field'), 'trashfield')).
'</td>'."\n".
'</tr>'."\n";
}
diff --git a/src/common/widget/Widget_MyProjects.class.php
b/src/common/widget/Widget_MyProjects.class.php
index b1da6b2..692fd87 100644
--- a/src/common/widget/Widget_MyProjects.class.php
+++ b/src/common/widget/Widget_MyProjects.class.php
@@ -3,7 +3,7 @@
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
* Copyright 2010, Franck Villaume - Capgemini
* Copyright 2013, French Ministry of National Education
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -83,8 +83,7 @@ class Widget_MyProjects extends Widget {
}
if (!$isadmin) {
$html_my_projects .= '</td>'.
-
'<td>'.util_make_link('/my/rmproject.php?group_id='.$g->getID(),
- '<img
src="'.$HTML->imgroot.'ic/trash.png" alt="'._('Leave project').'" height="16"
width="16" />',
+
'<td>'.util_make_link('/my/rmproject.php?group_id='.$g->getID(),
$HTML->getDeletePic(_('Leave project'), _('Leave project')),
array('onClick' => 'return confirm("'._("Quit this project?").'")')).
'</td></tr>';
} else {
diff --git a/src/plugins/forumml/www/scripts/cc_attach_js.php
b/src/plugins/forumml/www/scripts/cc_attach_js.php
index ef0c3ab..429dca1 100644
--- a/src/plugins/forumml/www/scripts/cc_attach_js.php
+++ b/src/plugins/forumml/www/scripts/cc_attach_js.php
@@ -26,6 +26,9 @@
header("content-type: application/x-javascript");
require_once 'env.inc.php';
require_once 'pre.php';
+
+global $HTML;
+
?>
function addHeader(cc,file,header_type)
@@ -45,7 +48,7 @@ function addHeader(cc,file,header_type)
+cc
+"'size=41></td><td align=center><a
href=\"javascript:;\" onclick=\"removeHeader(\'"
+divIdName
- +"\')\"><img border='0' src=\"<?php
echo getImage("ic/trash.png"); ?>\"></a></td></tr></table>";
+ +"\')\"><?php echo
$HTML->getDeletePic('', ''); ?></a></td></tr></table>";
} else {
newdiv.innerHTML += "<table><tr><td width='65'
align='right'><b><i><?php echo _('Attach:') ?> </i></b></td><td align=center
width=350><input name='files["
+num
@@ -53,7 +56,7 @@ function addHeader(cc,file,header_type)
+file
+"'size=30></td><td align=center><a
href=\"javascript:;\" onclick=\"removeHeader(\'"
+divIdName
- +"\')\"><img border='0' src=\"<?php
echo getImage("ic/trash.png"); ?>\"></a></td></tr></table>";
+ +"\')\"><?php echo
$HTML->getDeletePic('', ''); ?></a></td></tr></table>";
}
ni.appendChild(newdiv);
}
diff --git a/src/plugins/mailman/include/mailmanPlugin.class.php
b/src/plugins/mailman/include/mailmanPlugin.class.php
index 2cfc60a..72e69c7 100644
--- a/src/plugins/mailman/include/mailmanPlugin.class.php
+++ b/src/plugins/mailman/include/mailmanPlugin.class.php
@@ -178,7 +178,7 @@ class mailmanPlugin extends Plugin {
}
echo '
<tr
'.$HTML->boxGetAltRowStyle(0).'>
- <td
class="align-center">'.util_make_link('/plugins/mailman/index.php?group_id='.$group->getID().'&action=unsubscribe&id='.$l->getID(),'<img
src="'.$HTML->imgroot.'/ic/trash.png" height="16" width="16" '.'alt="" />').
+ <td
class="align-center">'.util_make_link('/plugins/mailman/index.php?group_id='.$group->getID().'&action=unsubscribe&id='.$l->getID(),
$HTML->getDeletePic(_('Unsubscribe from this mailing-list.'),
_('Unsubscribe'))).
'</td>
<td
style="width:99%">'.util_make_link('/plugins/mailman/index.php?group_id='.$group->getID().'&action=options&id='.$l->getID(),$l->getName()).'</td></tr>';
$last_group= $group->getID();
diff --git a/src/www/snippet/add_snippet_to_package.php
b/src/www/snippet/add_snippet_to_package.php
index 6fd610a..be5c6b2 100644
--- a/src/www/snippet/add_snippet_to_package.php
+++ b/src/www/snippet/add_snippet_to_package.php
@@ -190,7 +190,7 @@ for ($i=0; $i<$combolistrows; $i++)
echo '
<tr '. $HTML->boxGetAltRowStyle($i) .'><td
class="align-center">'.
util_make_link('/snippet/delete.php?type=frompackage&snippet_version_id='.db_result($result,$i,'snippet_version_id').'&snippet_package_version_id='.$snippet_package_version_id,
- html_image("ic/trash.png", 16,
16)).'</td><td style="width:99%">'.
+ $HTML->getDeletePic(_('Remove
this snippet version'), _('Delete'))).'</td><td style="width:99%">'.
db_result($result,$i,'name').'
'.db_result($result,$i,'version')."</td></tr>";
$last_group=db_result($result,$i,'group_id');
diff --git a/src/www/snippet/detail.php b/src/www/snippet/detail.php
index d7c0441..6c760aa 100644
--- a/src/www/snippet/detail.php
+++ b/src/www/snippet/detail.php
@@ -4,7 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2013, French Ministry of National Education
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -83,7 +83,7 @@ if ($type=='snippet') {
util_make_link('/snippet/download.php?type=snippet&id='.db_result($result,$i,'snippet_version_id'),
'<strong>'. db_result($result,$i,'version').'</strong>').'</td><td>'.
date(_('Y-m-d
H:i'),db_result($result,$i,'post_date')).'</td><td>'.
util_make_link_u(db_result($result, $i,
'user_name'), db_result($result, $i, 'user_id'), db_result($result, $i,
'realname')).'</td>'.
- '<td
class="align-center">'.util_make_link('/snippet/delete.php?type=snippet&snippet_version_id='.db_result($result,$i,'snippet_version_id'),
html_image("ic/trash.png", 16, 16)).'</td></tr>';
+ '<td
class="align-center">'.util_make_link('/snippet/delete.php?type=snippet&snippet_version_id='.db_result($result,$i,'snippet_version_id'),
$HTML->getDeletePic(_('Delete this version'), _('Delete'))).'</td></tr>';
if ($i != ($rows - 1)) {
echo '
@@ -145,13 +145,13 @@ if ($type=='snippet') {
echo $HTML->error_msg(_('Error: no versions found'));
} else {
echo '
- <h3>' ._('Versions Of This Package:').'</h3>
+ <h3>' ._('Versions Of This Package')._(':').'</h3>
<p>';
$title_arr=array();
$title_arr[]= _('Package Version');
$title_arr[]= _('Date Posted');
$title_arr[]= _('Author');
- $title_arr[]= _('Edit/Del');
+ $title_arr[]= _('Actions');
echo $HTML->listTableTop ($title_arr);
@@ -170,7 +170,7 @@ if ($type=='snippet') {
'<td class="align-center">'.
util_make_link('/snippet/add_snippet_to_package.php?snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
html_image("ic/pencil.png", 20, 25)).
' '.
-
util_make_link('/snippet/delete.php?type=package&snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
html_image("ic/trash.png", 16, 16)).'</td></tr>';
+
util_make_link('/snippet/delete.php?type=package&snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
$HTML->getDeletePic(_('Delete this snippet'), _('Delete'))).'</td></tr>';
}
echo $HTML->listTableBottom();
diff --git a/src/www/themes/funky-wOw/images/ic/trash.png
b/src/www/themes/funky-wOw/images/ic/trash.png
deleted file mode 100644
index af10be0..0000000
Binary files a/src/www/themes/funky-wOw/images/ic/trash.png and /dev/null differ
diff --git a/src/www/themes/funky/images/ic/trash.png
b/src/www/themes/funky/images/ic/trash.png
deleted file mode 100644
index af10be0..0000000
Binary files a/src/www/themes/funky/images/ic/trash.png and /dev/null differ
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=58b3449e1fd6973a4d9b5454046934205e011976
commit 58b3449e1fd6973a4d9b5454046934205e011976
Author: Franck Villaume <[email protected]>
Date: Sun Oct 2 14:53:02 2016 +0200
remove unused icon
diff --git a/src/www/themes/funky-wOw/images/ic/adddoc12.png
b/src/www/themes/funky-wOw/images/ic/adddoc12.png
deleted file mode 100644
index cb7b09d..0000000
Binary files a/src/www/themes/funky-wOw/images/ic/adddoc12.png and /dev/null
differ
diff --git a/src/www/themes/funky/images/ic/adddoc12.png
b/src/www/themes/funky/images/ic/adddoc12.png
deleted file mode 100644
index cb7b09d..0000000
Binary files a/src/www/themes/funky/images/ic/adddoc12.png and /dev/null differ
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/views/form-customizelist.php | 4 ++--
src/common/widget/Widget_MyProjects.class.php | 5 ++---
src/plugins/forumml/www/scripts/cc_attach_js.php | 7 +++++--
src/plugins/mailman/include/mailmanPlugin.class.php | 2 +-
src/www/snippet/add_snippet_to_package.php | 2 +-
src/www/snippet/detail.php | 10 +++++-----
src/www/themes/funky-wOw/images/ic/adddoc12.png | Bin 424 -> 0 bytes
src/www/themes/funky-wOw/images/ic/trash.png | Bin 778 -> 0 bytes
src/www/themes/funky/images/ic/adddoc12.png | Bin 424 -> 0 bytes
src/www/themes/funky/images/ic/trash.png | Bin 778 -> 0 bytes
10 files changed, 16 insertions(+), 14 deletions(-)
delete mode 100644 src/www/themes/funky-wOw/images/ic/adddoc12.png
delete mode 100644 src/www/themes/funky-wOw/images/ic/trash.png
delete mode 100644 src/www/themes/funky/images/ic/adddoc12.png
delete mode 100644 src/www/themes/funky/images/ic/trash.png
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
