From 1ced8f3266bdfd49e55045037f1e0fb4bf7b4214 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 19 Sep 2018 16:59:20 -0400
Subject: [PATCH] Add empty components and smarter component inclusion

---
 models/admin/newDashboard/index.php             |  1 -
 .../newDashboard/components/entityAmount.html   |  0
 views/admin/newDashboard/components/list.html   |  0
 .../newDashboard/components/quickLinks.html     |  6 +++---
 .../{widgetSearch.html => textSearch.html}      |  0
 views/admin/newDashboard/summaryWidget.html     | 17 +++++++----------
 6 files changed, 10 insertions(+), 14 deletions(-)
 create mode 100644 views/admin/newDashboard/components/entityAmount.html
 create mode 100644 views/admin/newDashboard/components/list.html
 rename views/admin/newDashboard/components/{widgetSearch.html => textSearch.html} (100%)

diff --git a/models/admin/newDashboard/index.php b/models/admin/newDashboard/index.php
index 12f8be2e..b351c7da 100644
--- a/models/admin/newDashboard/index.php
+++ b/models/admin/newDashboard/index.php
@@ -197,7 +197,6 @@ class GlmMembersAdmin_newDashboard_index extends GlmDataMembers
                 $addons[$a['slug']]['slug'] = $a['slug'];
                 $addons[$a['slug']]['index'] = $a['index'];
                 $addons[$a['slug']]['widgetData'] = apply_filters($a['slug'] . "-dashboard-widget", "");
-                echo $addons[$a['slug']]['widgetData']['widgetName'];
                 
             } else {
                 echo "<br>" . $a['slug'] .  " has no filter called " . $a['slug'] . "-dashboard-widget";
diff --git a/views/admin/newDashboard/components/entityAmount.html b/views/admin/newDashboard/components/entityAmount.html
new file mode 100644
index 00000000..e69de29b
diff --git a/views/admin/newDashboard/components/list.html b/views/admin/newDashboard/components/list.html
new file mode 100644
index 00000000..e69de29b
diff --git a/views/admin/newDashboard/components/quickLinks.html b/views/admin/newDashboard/components/quickLinks.html
index cf2eb00f..55a0c535 100644
--- a/views/admin/newDashboard/components/quickLinks.html
+++ b/views/admin/newDashboard/components/quickLinks.html
@@ -1,9 +1,9 @@
 <div id="{$addon.slug}-dashboard-widget-quick-links" class="dashboard-widget-quick-links quicklinks row">
     <div class="s12 col">
         {foreach $widgetField.quickLinks as $linkName => $linkData name=quickLinks}
-            <a class="{$linkName}-quick-link {if $linkData.classes}{$linkData.classes}{/if}" 
-                style="{if $linkData.styles}{$linkData.styles}{/if}" 
-                href="{if $linkData.url}{$linkData.url}{else}#{/if}">
+            <a class="{$linkName}-quick-link {if isset($linkData.classes)}{$linkData.classes}{/if}" 
+                style="{if isset($linkData.styles)}{$linkData.styles}{/if}" 
+                href="{if isset($linkData.url)}{$linkData.url}{else}#{/if}">
                 {if $linkData.content}{$linkData.content}{/if}
             </a>
             {if not $smarty.foreach.quickLinks.last}&nbsp;|&nbsp;{/if}
diff --git a/views/admin/newDashboard/components/widgetSearch.html b/views/admin/newDashboard/components/textSearch.html
similarity index 100%
rename from views/admin/newDashboard/components/widgetSearch.html
rename to views/admin/newDashboard/components/textSearch.html
diff --git a/views/admin/newDashboard/summaryWidget.html b/views/admin/newDashboard/summaryWidget.html
index 86b2ef76..b4aaea72 100644
--- a/views/admin/newDashboard/summaryWidget.html
+++ b/views/admin/newDashboard/summaryWidget.html
@@ -3,18 +3,15 @@
         <div class="summary-widget-handle collapsible-header"><pre> {$addon.widgetData.title}</pre></div>
         <div class="summary-widget-body collapsible-body">
             {foreach $addon.widgetData as $widgetField}
-                {if $widgetField.type == 'buttons'}
-                    {include file='../newDashboard/components/buttons.html'}
-                {/if}
-
-                {if $widgetField.type == 'quickLinks'}
-                    {include file='../newDashboard/components/quickLinks.html'}
-                {/if}
+                
+                {if isset($widgetField.component)}
+                                    
+                    {*if file_exists("./components/$widgetField.component.html") // wouldn't it be great if this worked?*}
 
-                <pre>{*$widgetField|@print_r*}</pre>
+                        {* This will throw a serious error if the file does not exist *}
+                        {include file="./components/{$widgetField.component}.html"}
 
-                {if $widgetField.type == 'textsearch'}
-                    {include file='../newDashboard/components/widgetSearch.html'}
+                    {*/if*}
                 {/if}
             {/foreach}
             <div class="results-number">
-- 
2.17.1