[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1549-gb8b2e4a

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Thu Mar 16 14:30:27 CET 2017


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  b8b2e4a457b6ceb458c3cc52793eaf5d5e67f437 (commit)
      from  7f201ea699890853351653dcf6f31d054196cdc2 (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=b8b2e4a457b6ceb458c3cc52793eaf5d5e67f437

commit b8b2e4a457b6ceb458c3cc52793eaf5d5e67f437
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Thu Mar 16 14:30:19 2017 +0100

    Use PNG

diff --git a/src/common/forum/AttachManager.class.php b/src/common/forum/AttachManager.class.php
index ed661cd..2b7e42f 100644
--- a/src/common/forum/AttachManager.class.php
+++ b/src/common/forum/AttachManager.class.php
@@ -134,7 +134,7 @@ class AttachManager extends FFError {
 		}
 		if ($attachid) {
 			$attach = "<br/>
-			<a href=\"javascript:manageattachments('".util_make_url("/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id$pend")."','no');\">" . html_image('ic/cfolder15.png', 15, 13) . db_result($res,0,'filename') . "</a>  (" . db_result($res,0,'counter') . ") downloads";
+			<a href=\"javascript:manageattachments('".util_make_url("/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id$pend")."','no');\">" . html_image('ic/attach.png', '', '') . db_result($res,0,'filename') . "</a>  (" . db_result($res,0,'counter') . ") downloads";
 			$attach_userid = db_result($res,0,'userid');
 
 			$f = $msg->getForum();
@@ -144,8 +144,8 @@ class AttachManager extends FFError {
 				if ( ((user_getid() == $attach_userid)
 				      || (forge_check_perm ('forum_admin', $f->Group->getID())))
 				     && (!$msg->isPending()) ) { //only permit the user who created the attach to delete it, or an admin
-					$attach .= "   <a href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes','no');\">" . html_image('ic/forum_edit.gif', 37, 15, array('alt'=>_("Edit"))) . "</a>";
-					$attach .= "     <a href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&delete=yes','yes');\">" .  html_image('ic/forum_delete.gif', 16, 18, array('alt'=>_("Delete"))) . "</a>";
+					$attach .= "   <a href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes','no');\">" . html_image('ic/attach_edit.png', '', '', array('alt'=>_("Edit"))) . "</a>";
+					$attach .= "     <a href=\"javascript:manageattachments('/forum/attachment.php?attachid=$attachid&group_id=$group_id&forum_id=$forum_id&delete=yes','yes');\">" .  html_image('ic/attach_delete.png', '', '', array('alt'=>_("Delete"))) . "</a>";
 				}
 			}
 		} else {
@@ -159,7 +159,7 @@ class AttachManager extends FFError {
 				if ( ((user_getid() == $msg->getPosterID())
 				      || (forge_check_perm ('forum_admin', $f->Group->getID())))
 				     && (!$msg->isPending()) ) { //only permit the user who created the message to insert an attach
-					$attach .= "   <a href=\"javascript:manageattachments('".util_make_url ("/forum/attachment.php?attachid=0&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes")."','no');\">" .  html_image('ic/forum_add.gif', 37, 15, array('alt'=>_("Add"))) . "</a>";
+					$attach .= "   <a href=\"javascript:manageattachments('".util_make_url ("/forum/attachment.php?attachid=0&group_id=$group_id&forum_id=$forum_id&msg_id=$msg_id&edit=yes")."','no');\">" .  html_image('ic/attach_add.png', '', '', array('alt'=>_("Add"))) . "</a>";
 				}
 			}
 		}
diff --git a/src/www/themes/funky-wOw/images/ic/attach.png b/src/www/themes/funky-wOw/images/ic/attach.png
new file mode 100644
index 0000000..13f4b4c
Binary files /dev/null and b/src/www/themes/funky-wOw/images/ic/attach.png differ
diff --git a/src/www/themes/funky-wOw/images/ic/attach_add.png b/src/www/themes/funky-wOw/images/ic/attach_add.png
new file mode 100644
index 0000000..79bb6b8
Binary files /dev/null and b/src/www/themes/funky-wOw/images/ic/attach_add.png differ
diff --git a/src/www/themes/funky-wOw/images/ic/attach_delete.png b/src/www/themes/funky-wOw/images/ic/attach_delete.png
new file mode 100644
index 0000000..923971f
Binary files /dev/null and b/src/www/themes/funky-wOw/images/ic/attach_delete.png differ
diff --git a/src/www/themes/funky-wOw/images/ic/attach_edit.png b/src/www/themes/funky-wOw/images/ic/attach_edit.png
new file mode 100644
index 0000000..889d458
Binary files /dev/null and b/src/www/themes/funky-wOw/images/ic/attach_edit.png differ
diff --git a/src/www/themes/funky/images/ic/attach.png b/src/www/themes/funky/images/ic/attach.png
new file mode 100644
index 0000000..13f4b4c
Binary files /dev/null and b/src/www/themes/funky/images/ic/attach.png differ
diff --git a/src/www/themes/funky/images/ic/attach_add.png b/src/www/themes/funky/images/ic/attach_add.png
new file mode 100644
index 0000000..79bb6b8
Binary files /dev/null and b/src/www/themes/funky/images/ic/attach_add.png differ
diff --git a/src/www/themes/funky/images/ic/attach_delete.png b/src/www/themes/funky/images/ic/attach_delete.png
new file mode 100644
index 0000000..923971f
Binary files /dev/null and b/src/www/themes/funky/images/ic/attach_delete.png differ
diff --git a/src/www/themes/funky/images/ic/attach_edit.png b/src/www/themes/funky/images/ic/attach_edit.png
new file mode 100644
index 0000000..889d458
Binary files /dev/null and b/src/www/themes/funky/images/ic/attach_edit.png differ

-----------------------------------------------------------------------

Summary of changes:
 src/common/forum/AttachManager.class.php             |   8 ++++----
 src/www/themes/funky-wOw/images/ic/attach.png        | Bin 0 -> 778 bytes
 src/www/themes/funky-wOw/images/ic/attach_add.png    | Bin 0 -> 905 bytes
 src/www/themes/funky-wOw/images/ic/attach_delete.png | Bin 0 -> 906 bytes
 src/www/themes/funky-wOw/images/ic/attach_edit.png   | Bin 0 -> 827 bytes
 src/www/themes/funky/images/ic/attach.png            | Bin 0 -> 778 bytes
 src/www/themes/funky/images/ic/attach_add.png        | Bin 0 -> 905 bytes
 src/www/themes/funky/images/ic/attach_delete.png     | Bin 0 -> 906 bytes
 src/www/themes/funky/images/ic/attach_edit.png       | Bin 0 -> 827 bytes
 9 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 src/www/themes/funky-wOw/images/ic/attach.png
 create mode 100644 src/www/themes/funky-wOw/images/ic/attach_add.png
 create mode 100644 src/www/themes/funky-wOw/images/ic/attach_delete.png
 create mode 100644 src/www/themes/funky-wOw/images/ic/attach_edit.png
 create mode 100644 src/www/themes/funky/images/ic/attach.png
 create mode 100644 src/www/themes/funky/images/ic/attach_add.png
 create mode 100644 src/www/themes/funky/images/ic/attach_delete.png
 create mode 100644 src/www/themes/funky/images/ic/attach_edit.png


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list