diff options
| author | Christian Fowler <cfowler2@wcpss.net> | 2013-04-07 20:55:44 -0400 |
|---|---|---|
| committer | Christian Fowler <cfowler2@wcpss.net> | 2013-04-07 20:55:44 -0400 |
| commit | e059691b7b9c6947a9f86eab49e4b40cdffea1a0 (patch) | |
| tree | b643e3d068fa9fd07512131cc9c1a8c908d7d366 | |
| parent | 30a6ea8f3a109c39f6af71813ee39f8c93c99b47 (diff) | |
| download | kernel-e059691b7b9c6947a9f86eab49e4b40cdffea1a0.tar.gz kernel-e059691b7b9c6947a9f86eab49e4b40cdffea1a0.tar.bz2 kernel-e059691b7b9c6947a9f86eab49e4b40cdffea1a0.zip | |
clean up menus
| -rw-r--r-- | admin/index.php | 6 | ||||
| -rw-r--r-- | templates/admin.tpl | 4 | ||||
| -rw-r--r-- | templates/menu_top_admin_inc.tpl | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/admin/index.php b/admin/index.php index 670a2e0..dff9054 100644 --- a/admin/index.php +++ b/admin/index.php @@ -24,7 +24,7 @@ if( !empty( $_REQUEST["page"] )) { if( preg_match( '/\.php/', $page )) { $adminPage = $page; } else { - $file = $page; // Default file name + $adminFile = $page; // Default file name switch( $page ) { // handle a few special cases for page requests case 'features': @@ -53,12 +53,12 @@ if( !empty( $_REQUEST["page"] )) { break; } - $adminPage = constant( strtoupper( $package ).'_PKG_PATH' ).'/admin/admin_'.$file.'_inc.php'; + $adminPage = constant( strtoupper( $package ).'_PKG_PATH' ).'/admin/admin_'.$adminFile.'_inc.php'; // gBitThemes->loadLayout uses this to determine the currently active package $gBitSystem->mActivePackage = $package; } $gBitSmarty->assign( 'package', $package ); - $gBitSmarty->assign( 'file', $file ); + $gBitSmarty->assign( 'adminFile', $adminFile ); $gBitSmarty->assign( 'page', $page ); $gBitSystem->setBrowserTitle( preg_replace( '/_/', ' ', $page )." Settings" ); diff --git a/templates/admin.tpl b/templates/admin.tpl index 86c5dcc..b3e4e91 100644 --- a/templates/admin.tpl +++ b/templates/admin.tpl @@ -20,8 +20,8 @@ {* The rest determines which page to include using "page" GET parameter. Default: list-sections Add a value in first check when you create a new admin page. *} <div class="body"> - {if $file } - {include file="bitpackage:$package/admin_`$file`.tpl"} + {if $adminFile } + {include file="bitpackage:$package/admin_`$adminFile`.tpl"} {else} {if $smarty.request.version_check} {if $version_info.error.number ne 0} diff --git a/templates/menu_top_admin_inc.tpl b/templates/menu_top_admin_inc.tpl index b00a24f..391a088 100644 --- a/templates/menu_top_admin_inc.tpl +++ b/templates/menu_top_admin_inc.tpl @@ -1,4 +1,4 @@ -<a tabindex="-1" accesskey="A" class="{if $smarty.const.ACTIVE_PACKAGE eq 'kernel'} active{/if}" href="{if $gBitUser->isAdmin()}{$smarty.const.KERNEL_PKG_URL}admin/index.php{else}#{/if}"> +{strip}<a tabindex="-1" accesskey="A" class="{if $smarty.const.ACTIVE_PACKAGE eq 'kernel'} active{/if}" href="{if $gBitUser->isAdmin()}{$smarty.const.KERNEL_PKG_URL}admin/index.php{else}#{/if}"> <i class="icon-cog"></i> {tr}Administration{/tr} </a> <ul class="dropdown-menu sub-menu pull-right"> @@ -13,4 +13,4 @@ {/if} {/foreach} </ul> - +{/strip} |