summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BitSystem.php2
-rw-r--r--templates/footer.tpl9
-rw-r--r--templates/header.tpl47
-rw-r--r--templates/html.tpl (renamed from templates/bitweaver.tpl)57
4 files changed, 52 insertions, 63 deletions
diff --git a/BitSystem.php b/BitSystem.php
index 7f844f6..347fb02 100644
--- a/BitSystem.php
+++ b/BitSystem.php
@@ -462,7 +462,7 @@ class BitSystem extends BitSingleton {
// $gBitSmarty->assign( 'page', !empty( $_REQUEST['page'] ) ? $_REQUEST['page'] : NULL );
// Make sure that the gBitSystem symbol available to templates is correct and up-to-date.
$gBitSmarty->assign_by_ref('gBitSystem', $this);
- $gBitSmarty->display( 'bitpackage:kernel/bitweaver.tpl' );
+ $gBitSmarty->display( 'bitpackage:kernel/html.tpl' );
$this->postDisplay( $pMid );
}
diff --git a/templates/footer.tpl b/templates/footer.tpl
deleted file mode 100644
index 05b5e97..0000000
--- a/templates/footer.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{* $Header$ *}
-{strip}
- {* get custom footer files from individual packages *}
- {foreach from=$gBitThemes->mAuxFiles.templates.footer_inc item=file}
- {include file=$file}
- {/foreach}
- </body>
-</html>
-{/strip}
diff --git a/templates/header.tpl b/templates/header.tpl
deleted file mode 100644
index 4dc6ea8..0000000
--- a/templates/header.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{strip}
-<!DOCTYPE HTML>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$bitlanguage|default:'en'}" lang="{$bitlanguage|default:'en'}" {$htmlTagAttributes} {if $gBitLanguage->isLanguageRTL()}dir="rtl"{/if}>
-
-{if $gBitThemes->mDisplayMode}
- {assign var=displayClass value=$gBitThemes->mDisplayMode|cat:"mode"|cat:" "}
-{/if}
-
-{if $gQueryUser->mUserId}
- {assign var=userClass value="user"|cat:$gQueryUser->mUserId|cat:" "}
-{/if}
-
-{if $gContent->mContentId}
- {assign var=contentClass value="cid"|cat:$gContent->mContentId}
-{/if}
-
-
-<head>
- <title>{$browserTitle} - {$gBitSystem->getConfig('site_title')}</title>
-
- {if file_exists("`$smarty.const.CONFIG_THEME_PATH`header_theme_inc.tpl")}
- {include file="`$smarty.const.CONFIG_THEME_PATH`header_theme_inc.tpl"}
- {/if}
-
- {* get custom header files from individual packages *}
- {foreach from=$gBitThemes->mAuxFiles.templates.header_inc item=file}
- {include file=$file}
- {/foreach}
-</head>
-<body
- {if $gBitSystem->mOnload} onload="{foreach from=$gBitSystem->mOnload item=loadString}{$loadString}{/foreach}" {/if}
- {if $gBitSystem->mOnunload} onunload="{foreach from=$gBitSystem->mOnunload item=loadString}{$loadString}{/foreach}" {/if}
- id="{$smarty.const.ACTIVE_PACKAGE}" class="{$displayClass}{$userClass}{$contentClass}">
-
-{if $gBitSystem->mDebugHtml}
- <div id="bw_debughtml">
- <a href="#postdebug" onclick="document.getElementById('bw_debughtml').style.display='none';">Go to content</a><br />
- {$gBitSystem->mDebugHtml}
- </div>
- <a name="postdebug"></a>
-{/if}
-
-{if $gBitSystem->isFeatureActive( 'site_help_popup' )}
- {popup_init src="`$smarty.const.UTIL_PKG_URL`javascript/libs/overlib.js"}
-{/if}
-
-{/strip}
diff --git a/templates/bitweaver.tpl b/templates/html.tpl
index 410d4bc..b305fe9 100644
--- a/templates/bitweaver.tpl
+++ b/templates/html.tpl
@@ -1,6 +1,42 @@
-{include file="bitpackage:kernel/header.tpl"}
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$bitlanguage|default:'en'}" lang="{$bitlanguage|default:'en'}" {$htmlTagAttributes} {if $gBitLanguage->isLanguageRTL()}dir="rtl"{/if}>
+
+{if $gBitThemes->mDisplayMode}
+ {assign var=displayClass value=$gBitThemes->mDisplayMode|cat:"mode"|cat:" "}
+{/if}
+{if $gQueryUser->mUserId}
+ {assign var=userClass value="user"|cat:$gQueryUser->mUserId|cat:" "}
+{/if}
+{if $gContent->mContentId}
+ {assign var=contentClass value="cid"|cat:$gContent->mContentId}
+{/if}
+
+<head>
+ <title>{$browserTitle} - {$gBitSystem->getConfig('site_title')}</title>
+
+ {* if the theme has a header, it goes first *}
+ {if file_exists("`$smarty.const.CONFIG_THEME_PATH`html_head_inc.tpl")}
+ {include file="`$smarty.const.CONFIG_THEME_PATH`html_head_inc.tpl"}
+ {/if}
+
+ {**** get custom head files from individual packages ****}
+ {foreach from=$gBitThemes->mAuxFiles.templates.html_head_inc item=file}
+ {include file=$file}
+ {/foreach}
+</head>
+<body
+ {if $gBitSystem->mOnload} onload="{foreach from=$gBitSystem->mOnload item=loadString}{$loadString}{/foreach}" {/if}
+ {if $gBitSystem->mOnunload} onunload="{foreach from=$gBitSystem->mOnunload item=loadString}{$loadString}{/foreach}" {/if}
+ id="{$smarty.const.ACTIVE_PACKAGE}" class="{$displayClass}{$userClass}{$contentClass}">
+{if $gBitSystem->mDebugHtml}
+ <div id="bw_debughtml">
+ <a href="#postdebug" onclick="document.getElementById('bw_debughtml').style.display='none';">Go to content</a><br />
+ {$gBitSystem->mDebugHtml}
+ </div>
+ <a name="postdebug"></a>
+{/if}
+
{strip}
-{if $print_page ne "y"}
{if $gBitSystem->isFeatureActive( 'bidirectional_text' )}<div dir="rtl">{/if}
{if $gBitSystem->isFeatureActive( 'site_left_column' ) && $l_modules && !$gHideModules and $gBitSystem->isFeatureActive( 'site_right_column' ) && $r_modules && !$gHideModules
@@ -13,7 +49,8 @@
}{assign var=extraColumns value=0}{
/if}
- <header>
+ <header class="mainheader">
+ {**** Theme Layout Modules : TOP ****}
{if $gBitSystem->isFeatureActive( 'site_top_column' ) && $t_modules && !$gHideModules}
{section name=homeix loop=$t_modules}
{$t_modules[homeix].data}
@@ -26,6 +63,7 @@
{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='container' serviceHash=$gContent->mInfo}
<div id="wrapper" class="span{math equation="12-x*3" x=$extraColumns}">
+ {**** Theme Layout Modules : CENTER ****}
{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='wrapper' serviceHash=$gContent->mInfo}
<div id="content">
{include file="bitpackage:liberty/display_structure.tpl"}
@@ -35,12 +73,14 @@
</div><!-- end #wrapper -->
{if $gBitSystem->isFeatureActive( 'site_left_column' ) && $l_modules && !$gHideModules}
+ {**** Theme Layout Modules : NAVIGATION ****}
<nav id="navigation" class="span3">
{include file="bitpackage:kernel/bit_left.tpl"}
</nav><!-- end #navigation -->{* needed by output filters. *}
{/if}
{if $gBitSystem->isFeatureActive( 'site_right_column' ) && $r_modules && !$gHideModules}
+ {**** Theme Layout Modules : EXTRA ****}
<nav id="extra" class="span3">
{include file="bitpackage:kernel/bit_right.tpl"}
</nav><!-- end #extra -->{* needed by output filters. *}
@@ -48,15 +88,20 @@
<div>
</section>
- <footer>
+ <footer class="mainfooter">
+ {**** Theme Layout Modules : BOTTOM ****}
{if $gBitSystem->isFeatureActive( 'site_bottom_column' ) && $b_modules && !$gHideModules}
{section name=homeix loop=$b_modules}
{$b_modules[homeix].data}
{/section}
{/if}
+ {* get custom footer files from individual packages *}
+ {foreach from=$gBitThemes->mAuxFiles.templates.footer_inc item=file}
+ {include file=$file}
+ {/foreach}
</footer>
{if $gBitSystem->isFeatureActive( 'bidirectional_text' )}</div>{/if}
-{/if}
+ </body>
+</html>
{/strip}
-{include file="bitpackage:kernel/footer.tpl"}
generated by cgit v1.3 (git 2.53.0) at 2026-07-02 11:39:11 +0000