Commit 580b3362 authored by Jonny Bradley's avatar Jonny Bradley

[KIL] modules revamp: removing leftover top and "bot" bar prefs

parent 3c0d4c05
......@@ -1133,11 +1133,6 @@ function prefs_feature_list() {
'type' => 'flag',
'warning' => tra('Obsolete in tiki7'),
),
'feature_top_bar' => array(
'name' => tra('Top Bar'),
'type' => 'flag',
'warning' => tra('Obsolete in tiki7'),
),
'feature_left_column' => array(
'name' => tra('Left column'),
'type' => 'list',
......@@ -1205,11 +1200,6 @@ function prefs_feature_list() {
'size' => '6',
'filter' => 'rawhtml_unsafe',
),
'feature_bot_bar' => array(
'name' => tra('Bottom bar'),
'type' => 'flag',
'warning' => tra('Obsolete in tiki7'),
),
'feature_site_report' => array(
'name' => tra('Webmaster Report'),
'type' => 'flag',
......
......@@ -1383,8 +1383,6 @@ function get_default_prefs() {
// layout
'feature_left_column' => 'y',
'feature_right_column' => 'y',
'feature_top_bar' => 'y',
'feature_bot_bar' => 'y',
'maxRecords' => 25,
'maxArticles' => 10,
'maxVersions' => 0,
......
......@@ -9,11 +9,6 @@
{/if}
<div id="tiki-main">
{if $prefs.feature_top_bar eq 'y'}
<div id="tiki-top">
{include file='tiki-top_bar.tpl'}
</div>
{/if}
<div id="tiki-mid">
<table border="0" cellpadding="0" cellspacing="0" id="tikimidtbl">
<tr>
......@@ -52,11 +47,6 @@
</tr>
</table>
</div>
{if $prefs.feature_bot_bar eq 'y'}
<div id="tiki-bot">
{* modules revamp: TODO include file='tiki-bot_bar.tpl' *}
</div>
{/if}
</div>
{if $prefs.feature_bidi eq 'y'}
</td></tr></table>
......
......@@ -166,7 +166,7 @@
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.middle_shadow_end}</div>{/if}
</div>{* end .middle_outer *}
{if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}
{if $prefs.module_zones_bottom eq 'fixed' or ($prefs.module_zones_bottom ne 'n' && $bottom_modules|@count > 0)}{* previously if $prefs.feature_bot_bar eq 'y' *}
{if $prefs.module_zones_bottom eq 'fixed' or ($prefs.module_zones_bottom ne 'n' && $bottom_modules|@count > 0)}
{if $prefs.feature_layoutshadows eq 'y'}<div id="footer-shadow">{eval var=$prefs.footer_shadow_start}{/if}
<footer id="footer" data-role="footer" data-theme="{$prefs.mobile_theme_footer}">
<div class="footer_liner">
......
......@@ -103,9 +103,7 @@
{preference name=sitesubtitle}
</fieldset>
</div>
{preference name=feature_top_bar}
{preference name=module_zones_top}
{preference name=module_zones_topbar}
{preference name=module_zones_pagetop}
......@@ -116,10 +114,6 @@
{preference name=feature_endbody_code}
{preference name=feature_bot_bar}
<div class="adminoptionboxchild" id="feature_bot_bar_childcontainer">
</div>
<div class="adminoptionbox">
<fieldset>
<legend>{tr}Site Report Bar{/tr}</legend>
......
......@@ -156,7 +156,7 @@
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.middle_shadow_end}</div>{/if}
</div>{* end .middle_outer *}
{if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}
{if $prefs.module_zones_bottom eq 'fixed' or ($prefs.module_zones_bottom ne 'n' && $bottom_modules|@count > 0)}{* previously if $prefs.feature_bot_bar eq 'y' *}
{if $prefs.module_zones_bottom eq 'fixed' or ($prefs.module_zones_bottom ne 'n' && $bottom_modules|@count > 0)}
{if $prefs.feature_layoutshadows eq 'y'}<div id="footer-shadow">{eval var=$prefs.footer_shadow_start}{/if}
<footer id="footer">
<div class="footer_liner">
......
......@@ -188,10 +188,8 @@ if ($prefs['feature_theme_control'] == 'y') {
}
// now set it if needed
if ($popup) {
$prefs['feature_top_bar'] = 'n';
$prefs['feature_left_column'] = 'n';
$prefs['feature_right_column'] = 'n';
$prefs['feature_bot_bar'] = 'n';
}
ask_ticket('browse-image');
//add a hit
......
......@@ -10,11 +10,7 @@ if (strpos($_SERVER["SCRIPT_NAME"], basename(__FILE__)) !== false) {
header("location: index.php");
exit;
}
$section_top_bar = $section . '_top_bar';
$section_bot_bar = $section . '_bot_bar';
$section_left_column = $section . '_left_column';
$section_right_column = $section . '_right_column';
$smarty->assign('feature_top_bar', $$section_top_bar);
$smarty->assign('feature_bot_bar', $$section_bot_bar);
$smarty->assign('feature_left_column', $$section_left_column);
$smarty->assign('feature_right_column', $$section_right_column);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment