diff options
| author | spiderr <spider@viovio.com> | 2013-04-10 12:06:20 -0400 |
|---|---|---|
| committer | spiderr <spider@viovio.com> | 2013-04-10 12:06:20 -0400 |
| commit | dae501bbc67d1e826348538a2b0a678c81039215 (patch) | |
| tree | 4ee807dcadec2056ddf82288132e2aaf2e182838 | |
| parent | 8ede337d54c490380f1773cdd0ee32057199005a (diff) | |
| parent | d1388d6c0e3a1491e4b78ae13235b61732700743 (diff) | |
| download | kernel-dae501bbc67d1e826348538a2b0a678c81039215.tar.gz kernel-dae501bbc67d1e826348538a2b0a678c81039215.tar.bz2 kernel-dae501bbc67d1e826348538a2b0a678c81039215.zip | |
Merge branch 'master' of github.com:bitweaver/kernel
| -rw-r--r-- | setup_inc.php | 17 | ||||
| -rw-r--r-- | templates/html.tpl | 14 |
2 files changed, 17 insertions, 14 deletions
diff --git a/setup_inc.php b/setup_inc.php index 4124cf7..e7daccf 100644 --- a/setup_inc.php +++ b/setup_inc.php @@ -43,13 +43,16 @@ if( !empty( $_GET ) && is_array( $_GET ) && empty( $gNoToxify ) ) { } // Force a global ADODB db object so all classes share the same connection -switch( $gBitDbSystem ) { - case 'pear': - $dbClass = 'BitDbPear'; - break; - default: - $dbClass = 'BitDbAdodb'; - break; +$dbClass = 'BitDbAdodb'; +if( !empty( $gBitSystem ) ) { + switch( $gBitDbSystem ) { + case 'pear': + $dbClass = 'BitDbPear'; + break; + default: + $dbClass = 'BitDbAdodb'; + break; + } } // the installer and select admin pages required DataDict to verify package installation global $gForceAdodb; diff --git a/templates/html.tpl b/templates/html.tpl index 9ebb793..9b71003 100644 --- a/templates/html.tpl +++ b/templates/html.tpl @@ -58,6 +58,13 @@ <div class="row{$gBitSystem->getConfig('layout-maincontent')}"> {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='container' serviceHash=$gContent->mInfo} + {if $gBitSystem->isFeatureActive( 'site_left_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('l')} + {**** Theme Layout Modules : NAVIGATION ****} + <nav id="navigation" class="span3"> + {$gBitThemes->displayLayoutColumn('l')} + </nav><!-- end #navigation -->{* needed by output filters. *} + {/if} + <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} @@ -68,13 +75,6 @@ </div><!-- end #content -->{* needed by output filters. *} </div><!-- end #wrapper --> - {if $gBitSystem->isFeatureActive( 'site_left_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('l')} - {**** Theme Layout Modules : NAVIGATION ****} - <nav id="navigation" class="span3"> - {$gBitThemes->displayLayoutColumn('l')} - </nav><!-- end #navigation -->{* needed by output filters. *} - {/if} - {if $gBitSystem->isFeatureActive( 'site_right_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('r')} {**** Theme Layout Modules : EXTRA ****} <nav id="extra" class="span3"> |