Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feature:2832 Provide better integration of plugins adding a all new s…
…ection

don't need for an extra file

git-svn-id: http://piwigo.org/svn/trunk@23399 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
mistic100 committed Jun 20, 2013
1 parent 2d15ba1 commit 863bce7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 72 deletions.
10 changes: 1 addition & 9 deletions index.php
Expand Up @@ -119,6 +119,7 @@
//-------------------------------------------------------------- menubar
include( PHPWG_ROOT_PATH.'include/menubar.inc.php');

$template->set_filename('index', 'index.tpl');

// +-----------------------------------------------------------------------+
// | index page (categories, thumbnails, search, calendar, random, etc.) |
Expand All @@ -127,8 +128,6 @@
{
//----------------------------------------------------- template initialization
$page['body_id'] = 'theCategoryPage';

$template->set_filename('index', 'index.tpl');

if (isset($page['flat']) or isset($page['chronology_field']))
{
Expand Down Expand Up @@ -335,13 +334,6 @@
}
}
}
// +-----------------------------------------------------------------------+
// | other pages (added by plugins) |
// +-----------------------------------------------------------------------+
else
{
$template->set_filename('index', 'common_page.tpl');
}

//------------------------------------------------------------ end
include(PHPWG_ROOT_PATH.'include/page_header.php');
Expand Down
62 changes: 0 additions & 62 deletions themes/default/template/common_page.tpl

This file was deleted.

5 changes: 4 additions & 1 deletion themes/default/template/index.tpl
Expand Up @@ -93,7 +93,7 @@
<span class="pwg-icon pwg-icon-camera-calendar">&nbsp;</span><span class="pwg-button-text">{'Calendar'|@translate}</span>
</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>

Expand Down Expand Up @@ -163,7 +163,10 @@ jQuery("#calendarViewSwitchBox").on("mouseleave", function() {
</div>
{/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}
{/if}
Expand Down

0 comments on commit 863bce7

Please sign in to comment.