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 56a21f28408cbe6be75ba1f2033f056fec8bc3e4 (commit)
from a86c47decaa8898661e85a3fe8f365979ecfde53 (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=56a21f28408cbe6be75ba1f2033f056fec8bc3e4
commit 56a21f28408cbe6be75ba1f2033f056fec8bc3e4
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Fri May 21 16:21:59 2021 +0200
fixes in snippet: remove wrong & unused var. fix user display. fix use HTML
helper for icon
diff --git a/src/www/snippet/add_snippet_to_package.php
b/src/www/snippet/add_snippet_to_package.php
index 85cc142..2a54e93 100644
--- a/src/www/snippet/add_snippet_to_package.php
+++ b/src/www/snippet/add_snippet_to_package.php
@@ -192,7 +192,6 @@ for ($i=0; $i<$combolistrows; $i++)
$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');
}
echo $HTML->listTableBottom();
echo $HTML->boxBottom();
diff --git a/src/www/snippet/addversion.php b/src/www/snippet/addversion.php
index 9a1f621..c4491fb 100644
--- a/src/www/snippet/addversion.php
+++ b/src/www/snippet/addversion.php
@@ -212,7 +212,7 @@ function show_add_snippet_box() {
<?php echo _('If a new window opened, use it to add snippets to your package.
If a new window did not open, use the following link to add to your package
BEFORE you leave this page.'); ?>
</p>
<p>
-<?php echo util_make_url
('/snippet/add_snippet_to_package.php?snippet_package_version_id='.$snippet_package_version_id,_('Add
snippets to package'),array('target'=>'_blank')); ?></p>
+<?php echo
util_make_link('/snippet/add_snippet_to_package.php?snippet_package_version_id='.$snippet_package_version_id,
_('Add snippets to package') , array('target'=>'_blank')); ?></p>
<p><?php echo _('<strong>Browse the library</strong> to find the snippets you
want to add, then add them using the new window link shown above.'); ?></p>
<p>
diff --git a/src/www/snippet/detail.php b/src/www/snippet/detail.php
index ddb8f7f..d731f31 100644
--- a/src/www/snippet/detail.php
+++ b/src/www/snippet/detail.php
@@ -65,7 +65,7 @@ if ($type=='snippet') {
$title_arr[] = _('Download Version');
$title_arr[] = _('Date Posted');
$title_arr[] = _('Author');
- $title_arr[] = _('Delete');
+ $title_arr[] = _('Actions');
echo $HTML->listTableTop($title_arr);
@@ -80,7 +80,7 @@ if ($type=='snippet') {
'</td><td>'.
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>'.
+ util_display_user(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->getDeletePic(_('Delete this version'), _('Delete'))).'</td></tr>';
if ($i != ($rows - 1)) {
@@ -158,11 +158,11 @@ EOS;
echo '
<h3>' ._('Versions Of This Package')._(':').'</h3>
<p>';
- $title_arr=array();
- $title_arr[]= _('Package Version');
- $title_arr[]= _('Date Posted');
- $title_arr[]= _('Author');
- $title_arr[]= _('Actions');
+ $title_arr = array();
+ $title_arr[] = _('Package Version');
+ $title_arr[] = _('Date Posted');
+ $title_arr[] = _('Author');
+ $title_arr[] = _('Actions');
echo $HTML->listTableTop($title_arr);
@@ -177,10 +177,9 @@ EOS;
<tr><td>'.
util_make_link('/snippet/detail.php?type=packagever&id='.db_result($result,$i,'snippet_package_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>'.
+ util_display_user(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/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/add_snippet_to_package.php?snippet_package_version_id='.db_result($result,$i,'snippet_package_version_id'),
$HTML->getEditFilePic(_('Edit this snippet'), _('Edit'))).
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>';
}
-----------------------------------------------------------------------
Summary of changes:
src/www/snippet/add_snippet_to_package.php | 1 -
src/www/snippet/addversion.php | 2 +-
src/www/snippet/detail.php | 19 +++++++++----------
3 files changed, 10 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
