fixed an issue with the templating engine

Author: ChristopherDay

modules/installed/moduleManager/moduleManager.admin.php

@@ -124,6 +124,13 @@ private function viewInstall($moduleName) {
 
                     $info = $this->getInfo($moduleFolder . "module.json", $moduleName, "modules/installing/");
                 } 
+
+
+                $info["bundleInfo"] = "";
+
+                foreach ($info["modules"] as $value) {
+                    $info["bundleInfo"] .= $this->page->buildElement("mInfo", $value);
+                }
 
 
                 $this->html .= $this->page->buildElement("moduleOverview", $info);

modules/installed/moduleManager/moduleManager.tpl.php

@@ -76,9 +76,8 @@ class moduleManagerTemplate extends template {
                                         </td>
                                         <td></td>
                                     </tr>
-                                {#each modules}
-                                    {>mInfo}
-                                {/each}
+
+                                    <{bundleInfo}>
                             </tbody>
                         </table>
                     {/if}
@@ -145,47 +144,59 @@ class moduleManagerTemplate extends template {
             <tr>
                 <td>{name}</td>
                 <td class="text-center">
-                    {#unless installed}
-                        {#if extracted}
-                            <i class="glyphicon text-success glyphicon-ok"></i>
-                        {/if}
-                        {#unless extracted}
-                            <i class="glyphicon text-danger glyphicon-remove"></i>
-                        {/unless}
-                    {/unless}
+                    {>mInfoExtractedIcon}
                 </td>
                 <td class="text-center">
-                    {#if installed}
-                        <i class="glyphicon text-success glyphicon-ok"></i>
-                    {/if}
-                    {#unless installed}
-                        <i class="glyphicon text-danger glyphicon-remove"></i>
-                    {/unless}
+                    {>mInfoInstalledIcon}
                 </td>
                 <td class="text-center">
-                    {#unless installed}
-                        {#unless extracted}
-                            <a href="?page=admin&module=moduleManager&action=install&view={id}&extract={name}">
-                                Extract
-                            </a>
-                        {/unless}
-                    {/unless}
-                    {#if extracted}
-                        {#unless installed}
-                            <a href="?page=admin&module=moduleManager&action=install&view={id}&installBundleModule={name}">
-                                Install
-                            </a>
-                        {/unless}
-                    {/if}
-                    {#if installed}
-                        <a href="?page=admin&module=moduleManager&action=install&view={id}&deactivateBundleModule={name}">
-                            De-Activate
-                        </a>
-                    {/if}
+                    {>mInfoActions}
                 </td>
             </tr>
         ';
 
+        public $mInfoActions = '
+            {#unless installed}
+                {#unless extracted}
+                    <a href="?page=admin&module=moduleManager&action=install&view={id}&extract={name}">
+                        Extract
+                    </a>
+                {/unless}
+            {/unless}
+            {#if extracted}
+                {#unless installed}
+                    <a href="?page=admin&module=moduleManager&action=install&view={id}&installBundleModule={name}">
+                        Install
+                    </a>
+                {/unless}
+            {/if}
+            {#if installed}
+                <a href="?page=admin&module=moduleManager&action=install&view={id}&deactivateBundleModule={name}">
+                    De-Activate
+                </a>
+            {/if}
+        ';
+
+        public $mInfoInstalledIcon = '
+            {#if installed}
+                <i class="glyphicon text-success glyphicon-ok"></i>
+            {/if}
+            {#unless installed}
+                <i class="glyphicon text-danger glyphicon-remove"></i>
+            {/unless}
+        ';
+
+        public $mInfoExtractedIcon = '
+            {#unless installed}
+                {#if extracted}
+                    <i class="glyphicon text-success glyphicon-ok"></i>
+                {/if}
+                {#unless extracted}
+                    <i class="glyphicon text-danger glyphicon-remove"></i>
+                {/unless}
+            {/unless}
+        ';
+
         public $moduleList = '
 
             <table class="table table-condensed table-responsive table-striped table-bordered">