Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13275] branches/1.10/templates/styles/thenews
|
From: <chi...@us...> - 2008-06-18 07:33:38
|
Revision: 13275
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13275&view=rev
Author: chibaguy
Date: 2008-06-18 00:33:22 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
[FIX] Site-header and bottom-bar improvements.
Modified Paths:
--------------
branches/1.10/templates/styles/thenews/tiki-bot_bar.tpl
branches/1.10/templates/styles/thenews/tiki-site_header.tpl
branches/1.10/templates/styles/thenews/tiki-top_bar.tpl
Modified: branches/1.10/templates/styles/thenews/tiki-bot_bar.tpl
===================================================================
--- branches/1.10/templates/styles/thenews/tiki-bot_bar.tpl 2008-06-18 07:32:19 UTC (rev 13274)
+++ branches/1.10/templates/styles/thenews/tiki-bot_bar.tpl 2008-06-18 07:33:22 UTC (rev 13275)
@@ -1,9 +1,9 @@
+{if $prefs.feature_bot_logo eq 'y'}{eval var=$prefs.bot_logo_code}{/if}
{if ($prefs.feature_site_report eq 'y' && $tiki_p_site_report eq 'y')}
-<div id="site_report">
-<a href="tiki-tell_a_friend.php?report=y&url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Report to Webmaster{/tr}</a>
-</div>
+ <div id="site_report">
+ <a href="tiki-tell_a_friend.php?report=y&url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Report to Webmaster{/tr}</a>
+ </div>
{/if}
-{if $prefs.feature_bot_logo eq 'y'}{eval var=$prefs.bot_logo_code}{/if}
{if $prefs.feature_bot_bar_icons eq 'y'}
<div id="power" style="text-align: center">
<a href="http://tikiwiki.org/" title="Tikiwiki"><img style="border: 0; vertical-align: middle" alt="{tr}Powered by{/tr} Tikiwiki" src="img/tiki/tikibutton2.png" /></a>
Modified: branches/1.10/templates/styles/thenews/tiki-site_header.tpl
===================================================================
--- branches/1.10/templates/styles/thenews/tiki-site_header.tpl 2008-06-18 07:32:19 UTC (rev 13274)
+++ branches/1.10/templates/styles/thenews/tiki-site_header.tpl 2008-06-18 07:33:22 UTC (rev 13275)
@@ -1,51 +1,60 @@
{* $Id: tiki-site_header.tpl 12244 2008-03-30 13:32:53Z luciash $ *}
-{* Template for Tikiwiki site identity header *}{if $prefs.feature_sitemycode eq 'y' && ($prefs.sitemycode_publish eq 'y' or $tiki_p_admin eq 'y')}
- {eval var=$prefs.sitemycode}{* here will be parsed the custom site header code *}
+{* Custom code ... *}
+{if $prefs.feature_sitemycode eq 'y' && ($prefs.sitemycode_publish eq 'y' or $tiki_p_admin eq 'y')}
+ {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}{* ... and a banner *}
+ <div id="sitead" class="floatright">
+ {eval var=$prefs.sitead}
+ </div>
+ <div id="customcodewith_ad">
+ {eval var=$prefs.sitemycode}{* here will be parsed the 400px-wide custom site header code *}
+ </div>
+ {else}
+ <div id="customcode">
+ {eval var=$prefs.sitemycode}
+ </div>
+ {/if}
+{else}
+ {if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align neq 'center'}{* Site logo left or right, and sitead or not. *}
+ <div class="clearfix" id="sioptions">
+ {if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align eq 'left'}
+ {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
+ <div id="sitead" class="floatright">{eval var=$prefs.sitead}</div>
+ {/if}
+ <div id="sitelogo" class="floatleft" {if $prefs.sitelogo_bgcolor ne ''}style="background-color: {$prefs.sitelogo_bgcolor};"{/if}><a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a>
+ </div>
{/if}
-{* Site logo left or right, and sitead or not. *}
-{if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align neq 'center'}
-<div class="clearfix" id="sioptions">
- {if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align eq 'left'}
- {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
- <div id="sitead" class="floatright">{eval var=$prefs.sitead}</div>
+ {if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align eq 'right'}
+ {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
+ <div id="sitead" class="floatleft">{eval var=$prefs.sitead}</div>
+ {/if}
+ <div id="sitelogo" class="floatright"{if $prefs.sitelogo_bgcolor ne ''} style="background-color: {$prefs.sitelogo_bgcolor};" {/if}><a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a>
+ </div>
{/if}
- <div id="sitelogo" class="floatleft" {if $prefs.sitelogo_bgcolor ne ''}style="background-color: {$prefs.sitelogo_bgcolor};"{/if}>
- <a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a>
- </div>
+ </div>
{/if}
- {if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align eq 'right'}
+
+ {* Sitelogo centered, and sitead: to work in small vertical space, ad (halfbanner) is floated left; a second bannerzone is floated right. *}
+ {if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align eq 'center'}
+ <div class="clearfix" id="sioptionscentered">
{if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
- <div id="sitead" class="floatleft">{eval var=$prefs.sitead}</div>
+ <div id="bannertopright" class="floatright"><div style="width: 234px; height: 60px; background: yellow">banner zone='topright'</div></div>
+ <div id="sitead" class="floatleft" {*style="width: 300px"*}>{eval var=$prefs.sitead}</div>
{/if}
- <div id="sitelogo" class="floatright"{if $prefs.sitelogo_bgcolor ne ''} style="background-color: {$prefs.sitelogo_bgcolor};" {/if}>
- <a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a>
+ <div id="sitelogo"{if $prefs.sitelogo_bgcolor ne ''} style="background-color: {$prefs.sitelogo_bgcolor};" {/if}><a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a>
+ </div>
</div>
{/if}
-</div>
-{/if}
-{* Sitelogo centered, and sitead: to work in small vertical space, ad (halfbanner) is floated left; a second bannerzone is floated right. *}
-{if $prefs.feature_sitelogo eq 'y' and $prefs.sitelogo_align eq 'center'}
-<div class="clearfix" id="sioptionscentered">
- {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
- <div class="floatright"><div id="bannertopright">{banner zone='topright'}</div></div>{/if}
- {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
- <div id="sitead" class="floatleft" {*style="width: 300px"*}>{eval var=$prefs.sitead}</div>
+ {* No sitelogo but a sitead: ad is centered. *}
+ {if $prefs.feature_sitelogo eq 'n'}
+ {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
+ <div align="center">
+ {eval var=$prefs.sitead}</div>
{/if}
- <div id="sitelogo"{if $prefs.sitelogo_bgcolor ne ''} style="background-color: {$prefs.sitelogo_bgcolor};" {/if}><a href="./" title="{$prefs.sitelogo_title}"><img src="{$prefs.sitelogo_src}" alt="{$prefs.sitelogo_alt}" style="border: none" /></a>
- </div>
-</div>
-{/if}
-
-{* No sitelogo but a sitead: ad is centered. *}
-{if $prefs.feature_sitelogo eq 'n'}
- {if $prefs.feature_sitead eq 'y' && ($prefs.sitead_publish eq 'y' or $tiki_p_admin eq 'y')}
- <div align="center">
- {eval var=$prefs.sitead}</div>
{/if}
{/if}
{if $filegals_manager ne 'y' and $print_page ne 'y'}
-{if $prefs.feature_site_login eq 'y'}
+ {if $prefs.feature_site_login eq 'y'}
{include file="tiki-site_header_login.tpl"}
-{/if}
+ {/if}
{/if}
\ No newline at end of file
Modified: branches/1.10/templates/styles/thenews/tiki-top_bar.tpl
===================================================================
--- branches/1.10/templates/styles/thenews/tiki-top_bar.tpl 2008-06-18 07:32:19 UTC (rev 13274)
+++ branches/1.10/templates/styles/thenews/tiki-top_bar.tpl 2008-06-18 07:33:22 UTC (rev 13275)
@@ -1,6 +1,7 @@
{if $filegals_manager ne 'y' and $print_page ne 'y'}
{if $prefs.feature_sitesearch eq 'y' and $prefs.feature_search eq 'y' and $tiki_p_search eq 'y'}
- <div id="sitesearchbar"{if $prefs.feature_sitelogo neq 'y' and $prefs.feature_sitead neq 'y' and $prefs.feature_fullscreen eq 'y' and $filegals_manager ne 'y' and $print_page ne 'y'}{if $smarty.session.fullscreen neq 'y'}style="margin-right: 80px"{/if}{/if}>{if $prefs.feature_search_fulltext eq 'y'}
+ <div id="sitesearchbar"{if $prefs.feature_sitemycode neq 'y' and $prefs.feature_sitelogo neq 'y' and $prefs.feature_sitead neq 'y' and $prefs.feature_fullscreen eq 'y' and $filegals_manager ne 'y' and $print_page ne 'y'}{if $smarty.session.fullscreen neq 'y'}style="margin-right: 80px"{/if}{/if}>
+ {if $prefs.feature_search_fulltext eq 'y'}
{include file="tiki-searchresults.tpl"
searchNoResults="false"
searchStyle="menu"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|