From: <chi...@us...> - 2009-10-13 09:18:29
|
Revision: 22290 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22290&view=rev Author: chibaguy Date: 2009-10-13 09:18:21 +0000 (Tue, 13 Oct 2009) Log Message: ----------- [FIX] Update misc. details to level of current trunk tiki.tpl. Modified Paths: -------------- users/chibaguy/trunk_themes/themes/andreas08/templates/tiki.tpl users/chibaguy/trunk_themes/themes/candiiclouds/templates/tiki.tpl users/chibaguy/trunk_themes/themes/darkshine/templates/tiki.tpl users/chibaguy/trunk_themes/themes/eatlon/templates/tiki.tpl users/chibaguy/trunk_themes/themes/faulkner/templates/tiki.tpl users/chibaguy/trunk_themes/themes/judy/templates/tiki.tpl users/chibaguy/trunk_themes/themes/kubrick/templates/tiki.tpl users/chibaguy/trunk_themes/themes/litejazz/templates/tiki.tpl users/chibaguy/trunk_themes/themes/milkyway/templates/tiki.tpl users/chibaguy/trunk_themes/themes/planetfall/templates/tiki.tpl users/chibaguy/trunk_themes/themes/tikipedia/templates/tiki.tpl users/chibaguy/trunk_themes/themes/twist/templates/tiki.tpl Modified: users/chibaguy/trunk_themes/themes/andreas08/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/andreas08/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/andreas08/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -3,26 +3,29 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" cellpadding="0" cellspacing="0" id="main"> @@ -32,7 +35,7 @@ <div class="clearfix" id="header"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </td> @@ -56,10 +59,10 @@ {if $prefs.feature_left_column eq 'user' or $prefs.feature_right_column eq 'user'} <div id="showhide_columns"> {if $prefs.feature_left_column eq 'user' && $left_modules|@count > 0 && $show_columns.left_modules ne 'n'} - <div style="text-align:left;float:left;"><a class="flip" href="javascript:flip('leftcolumn','table-cell');">{icon _name=oleftcol _id="oleftcol" class="colflip" alt="[{tr}Show/Hide Left Menus{/tr}]"}</a></div> + <div style="text-align:left;float:left;"><a class="flip" href="javascript:flip('leftcolumn','table-cell');">{icon _id=ofolder name="leftcolumnicn" class="colflip" alt="+/-"} {tr}Show/Hide Left Menus{/tr} </a></div> {/if} {if $prefs.feature_right_column eq 'user'&& $right_modules|@count > 0 && $show_columns.right_modules ne 'n'} - <div style="text-align:right;float:right;"><a class="flip" href="javascript:flip('rightcolumn','table-cell');">{icon _name=orightcol _id="orightcol" class="colflip" alt="[{tr}Show/Hide Right Menus{/tr}]"}</a></div> + <div style="text-align:right;float:right;"><a class="flip" href="javascript:flip('rightcolumn','table-cell');"> {tr}Show/Hide Right Menus{/tr} {icon _id=ofolder name="rightcolumnicn" class="colflip" alt="+/-"}</a></div> {/if} <br clear="all" /> </div> @@ -69,6 +72,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> Modified: users/chibaguy/trunk_themes/themes/candiiclouds/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/candiiclouds/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/candiiclouds/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,29 +1,31 @@ -{* $Id$ *} -<!DOCTYPE html +{* $Id$ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" cellpadding="0" cellspacing="0" id="main"> @@ -33,7 +35,7 @@ <div class="clearfix" id="header"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </td> @@ -70,6 +72,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -93,7 +98,7 @@ <td colspan="3{* change to 5 if the 2 border tds are used *}" id="footer" colspan="3"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -101,7 +106,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/darkshine/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/darkshine/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/darkshine/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,29 +1,31 @@ -{* $Id$ *} -<!DOCTYPE html +{* $Id$ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" cellpadding="0" cellspacing="0" id="main"> @@ -32,7 +34,7 @@ <td colspan="5{* changed from 3 since the 2 border tds are used *}" id="main-header"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </td> <td rowspan="3" id="rightmargin"> </td> @@ -68,6 +70,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -91,7 +96,7 @@ <td colspan="5{* changed from 3 since the 2 border tds are used *}" id="footer"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -99,7 +104,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/eatlon/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/eatlon/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/eatlon/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,29 +1,31 @@ -{* $Id$ *} -<!DOCTYPE html +{* $Id$ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" cellpadding="0" cellspacing="0" id="main"> @@ -33,7 +35,7 @@ <div class="clearfix" id="header"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </td> @@ -70,6 +72,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -93,7 +98,7 @@ <td colspan="3{* change to 5 if the 2 border tds are used *}" id="footer" colspan="3"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -101,7 +106,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/faulkner/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/faulkner/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/faulkner/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,5 +1,4 @@ -{* $Id$ *} -<!DOCTYPE html +{* $Id$ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> @@ -10,20 +9,23 @@ <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" cellpadding="0" cellspacing="0" id="main"> @@ -33,7 +35,7 @@ <div class="clearfix" id="header"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </td> @@ -76,6 +78,9 @@ </div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -100,7 +105,7 @@ <td colspan="3{* change to 5 if the 2 border tds are used *}" id="footer" colspan="3"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -108,7 +113,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/judy/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/judy/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/judy/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> @@ -13,18 +13,20 @@ {if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> - {else} <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} + {else} + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_layoutshadows eq 'y'}<div id="main-shadow">{$prefs.main_shadow_start}{/if}<div id="main"> @@ -32,7 +34,7 @@ {if $prefs.feature_layoutshadows eq 'y'}<div id="header-shadow">{$prefs.header_shadow_start}{/if}<div class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> {* Site header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div>{if $prefs.feature_layoutshadows eq 'y'}{$prefs.header_shadow_end}</div>{/if} {/if} @@ -71,9 +73,13 @@ </div> {/if} - {if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{$prefs.center_shadow_start}{/if}<div id="tiki-center" {*id needed for ajax editpage link*} class="clearfix content"> -{$mid_data} -{show_help} + {if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{$prefs.center_shadow_start}{/if} + <div id="tiki-center" {*id needed for ajax editpage link*} class="clearfix content"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} + {$mid_data} + {show_help} </div>{if $prefs.feature_layoutshadows eq 'y'}{$prefs.center_shadow_end}</div>{/if} {* Start bottom of extra divs for Garland-style center *} @@ -119,7 +125,7 @@ {if $prefs.feature_layoutshadows eq 'y'}<div id="footer-shadow">{$prefs.footer_shadow_start}{/if}<div id="footer"> <div class="footerbgtrap"> <div class="content"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </div>{* -- END of footer -- *}{if $prefs.feature_layoutshadows eq 'y'}{$prefs.footer_shadow_end}</div>{/if} @@ -128,7 +134,7 @@ </div>{* -- END of main -- *}{if $prefs.feature_layoutshadows eq 'y'}{$prefs.main_shadow_end}</div>{/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/kubrick/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/kubrick/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/kubrick/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,29 +1,31 @@ -{* $Id$ *} -<!DOCTYPE html +{* $Id$ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <br style="clear:both; height: 1px" /> @@ -37,7 +39,7 @@ <div class="clearfix" id="wrapper2"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </div> @@ -77,6 +79,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -100,7 +105,7 @@ <td colspan="5" id="footer" colspan="5"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -112,10 +117,10 @@ {tr}Powered by{/tr} <a href="http://info.tikiwiki.org" title="© 2002–{$smarty.now|date_format:"%Y"} {tr}The TikiWiki Community{/tr}">{tr}TikiWiki CMS/Groupware{/tr}</a> {if $prefs.feature_topbar_version eq 'y'} v{$tiki_version} {if $tiki_uses_cvs eq 'y'} (CVS){/if} -{$tiki_star}- {/if} {/if} <div id="credits"> - {include file="credits.tpl"} + {include file='credits.tpl'} </div> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/litejazz/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/litejazz/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/litejazz/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,29 +1,31 @@ -{* $Id$ *} -<!DOCTYPE html +{* $Id$ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" cellpadding="0" cellspacing="0" id="main"> @@ -33,7 +35,7 @@ <div class="clearfix" id="header"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </td> @@ -70,6 +72,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -93,7 +98,7 @@ <td colspan="3{* change to 5 if the 2 border tds are used *}" id="footer" colspan="3"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -101,7 +106,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/milkyway/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/milkyway/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/milkyway/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -3,26 +3,29 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> - <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> + <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} -{include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" height="100%" cellpadding="0" cellspacing="0" id="main"> @@ -32,14 +35,14 @@ <div class="wrapper"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </div> {if $prefs.feature_top_bar eq 'y'} <div class="clearfix" id="tiki-top"> <div class="wrapper"> - {include file="tiki-top_bar.tpl"} + {include file='tiki-top_bar.tpl} </div> </div> {/if} @@ -91,6 +94,9 @@ </div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -116,7 +122,7 @@ <td colspan="5" id="footer"> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -124,7 +130,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/planetfall/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/planetfall/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/planetfall/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,29 +1,31 @@ -{* $Id: tiki.tpl 12618 2008-04-21 05:43:35Z chibaguy $ *} -<!DOCTYPE html +{* $Id: tiki.tpl 12618 2008-04-21 05:43:35Z chibaguy $ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} <table width="100%" cellpadding="0" cellspacing="0" id="main"> @@ -34,7 +36,7 @@ <div class="clearfix" id="header"> {* Site identity header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div> </td> @@ -62,6 +64,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -94,7 +99,7 @@ <td id="footer" colspan="3"> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -102,7 +107,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/tikipedia/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/tikipedia/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/tikipedia/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,10 +1,9 @@ -{* $Id: tiki.tpl 12618 2008-04-21 05:43:35Z chibaguy $ *}<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html +{* $Id: tiki.tpl 12618 2008-04-21 05:43:35Z chibaguy $ *}<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> @@ -14,18 +13,20 @@ {if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> - {else} <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} + {else} + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} {if $prefs.feature_layoutshadows eq 'y'}<div id="main-shadow">{$prefs.main_shadow_start}{/if}<div id="main"> @@ -33,7 +34,7 @@ {if $prefs.feature_layoutshadows eq 'y'}<div id="header-shadow">{$prefs.header_shadow_start}{/if}<div class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> {* Site header section *} <div class="clearfix" id="siteheader"> - {include file="tiki-site_header.tpl"} + {include file='tiki-site_header.tpl'} </div> </div>{if $prefs.feature_layoutshadows eq 'y'}{$prefs.header_shadow_end}</div>{/if} {/if} @@ -43,7 +44,7 @@ <div id="col1" class="{if $prefs.feature_left_column ne 'n' && $left_modules|@count > 0 && $show_columns.left_modules ne 'n'}marginleft{/if}{if $prefs.feature_right_column ne 'n' && $right_modules|@count > 0 && $show_columns.right_modules ne 'n'} marginright{/if}"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> {* Moved here from tiki-show_page.tpl start *} {if $page && $print_page ne 'y' && $history ne 'y'} - {include file=tiki-page_bar.tpl} + {include file='tiki-page_bar.tpl'} {/if} <br style="height: 1px; clear: both" /> {* Moved here from tiki-show_page.tpl end *} @@ -72,8 +73,11 @@ {/if} {if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{$prefs.center_shadow_start}{/if}<div id="tiki-center" {*id needed for ajax editpage link*} class="clearfix content"> -{$mid_data} -{show_help} + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} + {$mid_data} + {show_help} </div>{if $prefs.feature_layoutshadows eq 'y'}{$prefs.center_shadow_end}</div>{/if} </div> </div> @@ -113,7 +117,7 @@ {if $prefs.feature_layoutshadows eq 'y'}<div id="footer-shadow">{$prefs.footer_shadow_start}{/if}<div id="footer"> <div class="footerbgtrap"> <div class="content"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </div>{* -- END of footer -- *}{if $prefs.feature_layoutshadows eq 'y'}{$prefs.footer_shadow_end}</div>{/if} @@ -122,7 +126,7 @@ </div>{* -- END of main -- *}{if $prefs.feature_layoutshadows eq 'y'}{$prefs.main_shadow_end}</div>{/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} Modified: users/chibaguy/trunk_themes/themes/twist/templates/tiki.tpl =================================================================== --- users/chibaguy/trunk_themes/themes/twist/templates/tiki.tpl 2009-10-13 09:06:49 UTC (rev 22289) +++ users/chibaguy/trunk_themes/themes/twist/templates/tiki.tpl 2009-10-13 09:18:21 UTC (rev 22290) @@ -1,30 +1,34 @@ -{* $Id$ *} -<!DOCTYPE html +{* $Id$ *}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"> <head> -{include file="header.tpl"} +{include file='header.tpl'} </head> <body{if isset($section) and $section eq 'wiki page' and $prefs.user_dbl eq 'y' and $dblclickedit eq 'y' and $tiki_p_edit eq 'y'} ondblclick="location.href='tiki-editpage.php?page={$page|escape:"url"}';"{/if} onload="{if $prefs.feature_tabs eq 'y'}tikitabs({if $cookietab neq ''}{$cookietab}{else}1{/if},50);{/if}{if $msgError} javascript:location.hash='msgError'{/if}"{if $section or $smarty.session.fullscreen eq 'y'} class="{if $section}tiki_{$section|replace:' ':'_'}{/if}{if $smarty.session.fullscreen eq 'y'} fullscreen{/if}"{/if}> <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> </ul> -{if $prefs.feature_community_mouseover eq 'y'}{popup_init src="lib/overlib.js"}{/if} + +{if $prefs.feature_community_mouseover eq 'y'} {popup_init src="lib/overlib.js"}{/if} + {if $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'} - {if $smarty.session.fullscreen eq 'y'} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=n" class="menulink" id="fullscreenbutton">{icon _id=application_put alt="{tr}Cancel Fullscreen{/tr}"}</a> + {if $smarty.session.fullscreen eq 'n'} + {self_link fullscreen="y" _class="fullscreenbutton" _ajax='n' _icon=application_get _title="{tr}Fullscreen{/tr}"}{/self_link} {else} - <a href="{$smarty.server.SCRIPT_NAME}{if $fsquery}?{$fsquery|escape:"url":"UTF-8"}&{else}?{/if}fullscreen=y" class="menulink" id="fullscreenbutton">{icon _id=application_get alt="{tr}Fullscreen{/tr}"}</a> + {self_link fullscreen="n" _class="fullscreenbutton" _ajax='n' _icon=application_put _title="{tr}Cancel Fullscreen{/tr}"}{/self_link} {/if} {/if} + {* TikiTest ToolBar *} {if $prefs.feature_tikitests eq 'y' and $tikitest_state neq 0} - {include file="tiki-tests_topbar.tpl"} + {include file='tiki-tests_topbar.tpl'} {/if} + {if $prefs.feature_ajax eq 'y'} - {include file="tiki-ajax_header.tpl"} + {include file='tiki-ajax_header.tpl'} {/if} + {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} {* optional ad (banner) in Twist moved from tiki-site_header.tpl to here to display above table, header div. *} {if $prefs.feature_sitead eq 'y' and $print_page ne 'y'} @@ -80,6 +84,9 @@ <div class="tellafriend"><a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a></div> {/if} <div id="tiki-center"> + {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} + {eval var=$prefs.feature_custom_center_column_header} + {/if} {$mid_data} {show_help} </div> @@ -103,7 +110,7 @@ <td colspan="3{* change to 5 if the 2 border tds are used *}" id="footer" colspan="3"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="wrapper"> <div class="content"> - {include file="tiki-bot_bar.tpl"} + {include file='tiki-bot_bar.tpl'} </div> </div> </td> @@ -111,7 +118,7 @@ {/if} </table> {/if} -{include file="footer.tpl"} +{include file='footer.tpl'} {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} {eval var=$prefs.feature_endbody_code} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |