[Tikiwiki-cvs] tiki/templates/styles/codex tiki.tpl,1.12,1.13

[<ny...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates/styles/codex
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13540/templates/styles/codex

Modified Files:
	tiki.tpl 
Log Message:
[ENH] prefs: Manage preferences in an array stored in session

The impact is :
  * accelerate each page load when using sessions (prefs are not set again and again + no need to ask again for prefs in database)
  * reduce memory used by tikiwiki (the prefs array is assigned to smarty as a reference and not a copy)
  * get rid of two useless "foreach" on prefs (default values are directly defined in prefs array and are overrided by values from database)
  * reduce the risk of accidentally overrided var in smarty

Be warned that :
  * now, preferences need to be called through the $prefs smarty variable (e.g. $prefs.feature_wiki)
  * prefs are not anymore in tiki-setup.php, but in a specific file in lib/setup/prefs.php (this is the first commit of tiki-setup.php cleaning).



Index: tiki.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/styles/codex/tiki.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tiki.tpl	4 Dec 2006 09:11:44 -0000	1.12
+++ tiki.tpl	4 Oct 2007 22:17:48 -0000	1.13
@@ -2,8 +2,8 @@
 {* Index we display a wiki page here *}
 {if $feature_bidi eq 'y'}<table dir="rtl" ><tr><td>{/if}
 <div id="tiki-main">
-{if $feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}
-{if $feature_top_bar eq 'y'}
+{if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}
+{if $prefs.feature_top_bar eq 'y'}
 <div id="tiki-top">
 {include file="tiki-top_bar.tpl"}
 </div>
@@ -11,16 +11,16 @@
 <table  border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td id="page11"><img src="styles/codex/page_0.gif" width="34" height="31" alt="" border="0" /></td>
-		{if $feature_left_column ne 'n'}
+		{if $prefs.feature_left_column ne 'n'}
 		<td id="page12"><img src="styles/codex/page_0.gif" width="158" height="31" alt="" border="0" /></td>
 		{/if}
 		<td id="page13"><img src="styles/codex/page_0.gif" width="7" height="31" alt="" border="0" /></td>
-		<td id="page14"  {if $feature_right_column ne 'n'}colspan="2"{/if}><img src="styles/codex/page_0.gif" width="50" height="31" alt="" border="0" /></td>
+		<td id="page14"  {if $prefs.feature_right_column ne 'n'}colspan="2"{/if}><img src="styles/codex/page_0.gif" width="50" height="31" alt="" border="0" /></td>
 		<td id="page15"><img src="styles/codex/page_0.gif" width="38" height="31" alt="" border="0" /></td>
 	</tr>
 	<tr>
 		<td id="page21"><img src="styles/codex/page_0.gif" width="34" height="1" alt="" border="0" /></td>
-		{if $feature_left_column ne 'n'}
+		{if $prefs.feature_left_column ne 'n'}
 		<td id="page22">
 			{section name=homeix loop=$left_modules}
 			{$left_modules[homeix].data}
@@ -33,9 +33,9 @@
 			<div id="tiki-center">
 			{$mid_data}
 			</div>
-			{if $feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}
+			{if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}
 		</td>			
-		{if $feature_right_column ne 'n'}
+		{if $prefs.feature_right_column ne 'n'}
 		<td id="rightcolumn">
 			{section name=homeix loop=$right_modules}
 			{$right_modules[homeix].data}
@@ -46,15 +46,15 @@
 	</tr>
 	<tr>
 		<td id="page31"><img src="styles/codex/page_0.gif" width="34" height="41" alt="" border="0" /></td>
-		{if $feature_left_column ne 'n'}
+		{if $prefs.feature_left_column ne 'n'}
 		<td align="center" id="page32"><img src="styles/codex/page_3_2a.png" width="158" height="41" alt="" border="0" /></td>
 		{/if}
 		<td id="page33"><img src="styles/codex/page_0.gif" width="7" height="41" alt="" border="0" /></td>
-		<td id="page34"  {if $feature_right_column ne 'n'}colspan="2"{/if}><img src="styles/codex/page_0.gif" width="50" height="41" alt="" border="0" /></td>
+		<td id="page34"  {if $prefs.feature_right_column ne 'n'}colspan="2"{/if}><img src="styles/codex/page_0.gif" width="50" height="41" alt="" border="0" /></td>
 		<td id="page35"><img src="styles/codex/page_0.gif" width="38" height="41" alt="" border="0" /></td>
 	</tr>
 </table>
-{if $feature_bot_bar eq 'y'}
+{if $prefs.feature_bot_bar eq 'y'}
 <div id="tiki-bot">
 {include file="tiki-bot_bar.tpl"}
 </div>