[Fusionforge-commits] FusionForge branch master updated. 6.0.4-963-g467d3d4

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Oct 2 13:51:00 CEST 2016


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  467d3d4fc2d6478b7be8c4fc5a80e8fba2e8013e (commit)
      from  26f955b91d242c37c1f8dfc198c47377e8e1ab9c (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=467d3d4fc2d6478b7be8c4fc5a80e8fba2e8013e

commit 467d3d4fc2d6478b7be8c4fc5a80e8fba2e8013e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Oct 2 13:50:40 2016 +0200

    headermenu plugin: fix validateOrder action (wrong function call), use theme icons

diff --git a/src/plugins/headermenu/action/validateOrder.php b/src/plugins/headermenu/action/validateOrder.php
index 1f257d7..cf1610b 100644
--- a/src/plugins/headermenu/action/validateOrder.php
+++ b/src/plugins/headermenu/action/validateOrder.php
@@ -2,7 +2,7 @@
 /**
  * headermenu plugin : validateOrder action
  *
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -28,7 +28,7 @@ $sysdebug_enable = false;
 
 $linksOrder = getStringFromRequest('linkorder');
 $returnValue = array();
-$returnValue['html'] = $HTML->error(_('Error in Link Order validation'));
+$returnValue['html'] = $HTML->error_msg(_('Error in Link Order validation'));
 
 if ($linksOrder && strlen($linksOrder)) {
 	$linksOrderArr = explode(',', $linksOrder);
diff --git a/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php b/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php
index d9a7680..e43992f 100644
--- a/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php
+++ b/src/plugins/headermenu/view/admin/viewGlobalConfiguration.php
@@ -77,8 +77,8 @@ if (sizeof($linksHeaderMenuArray)) {
 			$cells[][] = $HTML->getRemovePic('', '', array('alt'=>_('link is off'), 'title'=>_('link is off')));
 			$content = util_make_link($actionurl.'&action=updateLinkStatus&linkid='.$link['id_headermenu'].'&linkstatus=1', html_image('docman/reserve-document.png', 22, 22, array('alt' => _('Activate this link'))), array('title' => _('Activate this link')));
 		}
-		$content .= util_make_link($actionurl.'&view=updateLinkValue&linkid='.$link['id_headermenu'], html_image('docman/edit-file.png', 22, 22, array('alt' => _('Edit this link'))), array('title' => _('Edit this link')));
-		$content .= util_make_link($actionurl.'&action=deleteLink&linkid='.$link['id_headermenu'], $HTML->getDeletePic('', '', array('alt' => _('Delete this link'), 'title' => _('Delete this link'))));
+		$content .= util_make_link($actionurl.'&view=updateLinkValue&linkid='.$link['id_headermenu'], $HTML->getEditFilePic(_('Edit this link'), 'editlink'), array('title' => _('Edit this link')));
+		$content .= util_make_link($actionurl.'&action=deleteLink&linkid='.$link['id_headermenu'], $HTML->getDeletePic(_('Delete this link'), 'deletelink'), array('title' => _('Delete this link')));
 		$cells[][] = $content;
 		echo $HTML->multiTableRow(array('id' => $link['id_headermenu']), $cells);
 	}
@@ -111,8 +111,8 @@ if (sizeof($linksOuterMenuArray)) {
 			$cells[][] = $HTML->getRemovePic('', '', array('alt'=>_('link is off'), 'title'=>_('link is off')));
 			$content = util_make_link($actionurl.'&action=updateLinkStatus&linkid='.$link['id_headermenu'].'&linkstatus=1', html_image('docman/reserve-document.png', 22, 22, array('alt'=>_('Activate this link'))), array('title' => _('Activate this link')));
 		}
-		$content .= util_make_link($actionurl.'&view=updateLinkValue&linkid='.$link['id_headermenu'], html_image('docman/edit-file.png',22,22, array('alt'=>_('Edit this link'))), array('title' => _('Edit this link')));
-		$content .= util_make_link($actionurl.'&action=deleteLink&linkid='.$link['id_headermenu'], $HTML->getDeletePic('', '', array('alt' => _('Delete this link'), 'title' => _('Delete this link'))));
+		$content .= util_make_link($actionurl.'&view=updateLinkValue&linkid='.$link['id_headermenu'], $HTML->getEditFilePic(_('Edit this link'), 'editlink'), array('title' => _('Edit this link')));
+		$content .= util_make_link($actionurl.'&action=deleteLink&linkid='.$link['id_headermenu'], $HTML->getDeletePic(_('Delete this link'), 'deletelink'), array('title' => _('Delete this link')));
 		$cells[][] = $content;
 		echo $HTML->multiTableRow(array('id' => $link['id_headermenu']), $cells);
 	}
diff --git a/src/plugins/headermenu/view/admin/viewProjectConfiguration.php b/src/plugins/headermenu/view/admin/viewProjectConfiguration.php
index bf5ade5..b88a5ff 100644
--- a/src/plugins/headermenu/view/admin/viewProjectConfiguration.php
+++ b/src/plugins/headermenu/view/admin/viewProjectConfiguration.php
@@ -76,8 +76,8 @@ if (sizeof($linksArray)) {
 			$cells[][] = $HTML->getRemovePic('', '', array('alt'=>_('link is off'), 'title'=>_('link is off')));
 			$actionsLinks = util_make_link('/plugins/'.$headermenu->name.'?type=projectadmin&group_id='.$group_id.'&action=updateLinkStatus&linkid='.$link['id_headermenu'].'&linkstatus=1', html_image('docman/reserve-document.png', 22, 22, array('alt'=>_('Activate this link'))), array('title' => _('Activate this link')));
 		}
-		$actionsLinks .= util_make_link('/plugins/'.$headermenu->name.'?type=projectadmin&group_id='.$group_id.'&view=updateLinkValue&linkid='.$link['id_headermenu'], html_image('docman/edit-file.png',22,22, array('alt'=>_('Edit this link'))), array('title' => _('Edit this link')));
-		$actionsLinks .= util_make_link('/plugins/'.$headermenu->name.'?type=projectadmin&group_id='.$group_id.'&action=deleteLink&linkid='.$link['id_headermenu'], html_image('docman/trash-empty.png',22,22, array('alt'=>_('Delete this link'))), array('title' => _('Delete this link')));
+		$actionsLinks .= util_make_link('/plugins/'.$headermenu->name.'?type=projectadmin&group_id='.$group_id.'&view=updateLinkValue&linkid='.$link['id_headermenu'], $HTML->getEditFilePic(_('Edit this link'), 'editdocument'), array('title' => _('Edit this link')));
+		$actionsLinks .= util_make_link('/plugins/'.$headermenu->name.'?type=projectadmin&group_id='.$group_id.'&action=deleteLink&linkid='.$link['id_headermenu'], $HTML->getDeletePic(_('Delete this link'), 'trashdir'), array('title' => _('Delete this link')));
 		$cells[][] = $actionsLinks;
 		echo $HTML->multiTableRow(array('id' => $link['id_headermenu']), $cells);
 	}

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

Summary of changes:
 src/plugins/headermenu/action/validateOrder.php                | 4 ++--
 src/plugins/headermenu/view/admin/viewGlobalConfiguration.php  | 8 ++++----
 src/plugins/headermenu/view/admin/viewProjectConfiguration.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list