Changeset 23399

Timestamp:

Jun 20, 2013, 4:35:16 PM (11 years ago)

Author:

mistic100

Message:

feature:2832 Provide better integration of plugins adding a all new section
don't need for an extra file

Location:

trunk

Files:

• index.php (modified) (3 diffs)
• themes/default/template/common_page.tpl (deleted)
• themes/default/template/index.tpl (modified) (2 diffs)

trunk/index.php

@@ -120 +120 @@
 include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
 
+$template->set_filename('index', 'index.tpl');
 
 // +-----------------------------------------------------------------------+
@@ -128 +129 @@
   //----------------------------------------------------- template initialization
   $page['body_id'] = 'theCategoryPage';
-
-  $template->set_filename('index', 'index.tpl');
   
   if (isset($page['flat']) or isset($page['chronology_field']))
@@ -336 +335 @@
   }
 }
-// +-----------------------------------------------------------------------+
-// |  other pages (added by plugins)                                       |
-// +-----------------------------------------------------------------------+
-else
-{
-  $template->set_filename('index', 'common_page.tpl');
-}
 
 //------------------------------------------------------------ end

trunk/themes/default/template/index.tpl

@@ -94 +94 @@
                 </a>{/strip}</li>
 {/if}
-{if isset($PLUGIN_INDEX_BUTTONS)}{foreach from=$PLUGIN_INDEX_BUTTONS item=button}<li>{$button}</li>{/foreach}{/if}
+{if !empty($PLUGIN_INDEX_BUTTONS)}{foreach from=$PLUGIN_INDEX_BUTTONS item=button}<li>{$button}</li>{/foreach}{/if}
 {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
         </ul>
@@ -164 +164 @@
 {/if}
 
+{if !empty($CONTENT)}{$CONTENT}{/if}
+
 {if !empty($CATEGORIES)}{$CATEGORIES}{/if}
+
 {if !empty($cats_navbar)}
         {include file='navigation_bar.tpl'|@get_extent:'navbar' navbar=$cats_navbar}