From 785f7831a09f0612bd3ec5f85ff41b3fdbcff0be Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 23 Jul 2020 20:46:27 -0400
Subject: [PATCH] dev/core#1899 specify display mode for action links with
icons
---
CRM/Contribute/BAO/Contribution.php | 3 ++-
CRM/Core/Action.php | 34 +++++++++++++++++++++++------
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 655a9c63ac4..9d11cb0c9ae 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -1311,7 +1311,8 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution {
FALSE,
'Payment.edit.action',
'Payment',
- $resultDAO->id
+ $resultDAO->id,
+ 'icon'
);
}
diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php
index f1475076020..2211d6cdb6e 100644
--- a/CRM/Core/Action.php
+++ b/CRM/Core/Action.php
@@ -178,6 +178,12 @@ class CRM_Core_Action {
* @param null $op
* @param null $objectName
* @param int $objectId
+ * @param string $iconMode
+ * - `text`: even if `icon` is set for a link, display the `name`
+ * - `icon`: display only the `icon` for each link if it's available, and
+ * don't tuck anything under "more >"
+ * - `both`: if `icon` is available, display it next to the `name` for each
+ * link
*
* @return string
* the html string
@@ -190,7 +196,8 @@ class CRM_Core_Action {
$enclosedAllInSingleUL = FALSE,
$op = NULL,
$objectName = NULL,
- $objectId = NULL
+ $objectId = NULL,
+ $iconMode = 'text'
) {
if (empty($links)) {
return NULL;
@@ -243,11 +250,22 @@ class CRM_Core_Action {
if (strpos($urlPath, '/delete') || strpos($urlPath, 'action=delete')) {
$classes .= " small-popup";
}
+
+ $linkContent = $link['name'];
+ if (!empty($link['icon'])) {
+ if ($iconMode == 'icon') {
+ $linkContent = CRM_Core_Page::crmIcon($link['icon'], $link['name'], TRUE, ['title' => '']);
+ }
+ elseif ($iconMode == 'both') {
+ $linkContent = CRM_Core_Page::crmIcon($link['icon']) . ' ' . $linkContent;
+ }
+ }
+
$url[] = sprintf('<a href="%s" class="%s" %s' . $extra . '>%s</a>',
$urlPath,
$classes,
!empty($link['title']) ? "title='{$link['title']}' " : '',
- empty($link['icon']) ? $link['name'] : CRM_Core_Page::crmIcon($link['icon'], $link['name'], TRUE, ['title' => ''])
+ $linkContent
);
}
}
@@ -261,11 +279,13 @@ class CRM_Core_Action {
}
else {
$extra = '';
- $extraLinks = array_splice($url, 2);
- if (count($extraLinks) > 1) {
- $mainLinks = array_slice($url, 0, 2);
- CRM_Utils_String::append($extra, '</li><li>', $extraLinks);
- $extra = "{$extraULName}<ul class='panel'><li>{$extra}</li></ul>";
+ if ($iconMode != 'icon') {
+ $extraLinks = array_splice($url, 2);
+ if (count($extraLinks) > 1) {
+ $mainLinks = array_slice($url, 0, 2);
+ CRM_Utils_String::append($extra, '</li><li>', $extraLinks);
+ $extra = "{$extraULName}<ul class='panel'><li>{$extra}</li></ul>";
+ }
}
$resultLinks = '';
CRM_Utils_String::append($resultLinks, '', $mainLinks);
--
GitLab