Merge branch 'develop'

Author: daun

Dashboard.module

@@ -490,13 +490,33 @@ class Dashboard extends Process implements Module
     /**
      * Render icon as markup.
      *
-     * @param string $icon
+     * @param string|array $icons Icon or icon array, in order of preference
      *
      * @return string Icon markup
      */
-    public function renderIcon($icon)
+    public function renderIcon($icons)
     {
-        return $icon ? wireIconMarkup($icon, 'fw') : '';
+        $class = '';
+
+        if (empty($icons)) {
+            $icons = [];
+        } elseif (is_string($icons)) {
+            $icons = [$icons];
+        }
+        if (is_array($icons)) {
+            $classes = array_map(function ($icon) {
+                if (strpos($icon, 'icon-') === 0) {
+                    $icon = str_replace('icon-', 'fa-', $icon);
+                }
+                if (strpos($icon, 'fa-') !== 0) {
+                    $icon = "fa-{$icon}";
+                }
+                return $icon;
+            }, $icons);
+            $class = implode(' ', $classes);
+        }
+
+        return "<i class='fa fa-fw {$class}'></i>";
     }
 
     /**

DashboardPanelCollection.module

@@ -455,7 +455,7 @@ class DashboardPanelCollection extends DashboardPanel
                 $links['edit'] = [
                     'href'     => $page->editUrl,
                     'label'    => $this->_('Edit'),
-                    'icon'     => 'pen-to-square',
+                    'icon'     => ['pen', 'pen-to-square'],
                     'mode'     => $this->editMode,
                     'reload'   => true,
                     'disabled' => !$page->editable,
@@ -474,7 +474,7 @@ class DashboardPanelCollection extends DashboardPanel
                 $links['trash'] = [
                     'href' => '#',
                     'label' => $this->_('Trash'),
-                    'icon' => 'trash-can',
+                    'icon' => ['trash', 'trash-can'],
                     // 'disabled' => $page->isTrash() || !$page->trashable,
                     'attributes' => [
                         'data-action'  => "[trash][{$page}]",