[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki: [13443] branches/1.10

[<pk...@us...>]

Revision: 13443
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13443&view=rev
Author:   pkdille
Date:     2008-07-05 23:07:33 -0700 (Sat, 05 Jul 2008)

Log Message:
-----------
[MOD] page-bar: delete an <hr> tag over page-bar and change it to a border. It will be easier to customize for look and feel. Also, avoid the adding of editdate section when this section is empty

Modified Paths:
--------------
    branches/1.10/styles/transitions/1.9to1.10.css
    branches/1.10/templates/tiki-page_bar.tpl
    branches/1.10/templates/tiki-show_page.tpl

Modified: branches/1.10/styles/transitions/1.9to1.10.css
===================================================================
--- branches/1.10/styles/transitions/1.9to1.10.css	2008-07-05 16:40:22 UTC (rev 13442)
+++ branches/1.10/styles/transitions/1.9to1.10.css	2008-07-06 06:07:33 UTC (rev 13443)
@@ -500,3 +500,9 @@
 .comment .rbox-data, .tip .rbox-data, .rbox-data.tip {}
 
 /* end rbox */
+
+div #page-bar
+{
+  border-top: 1px solid;
+  padding-top: 5px;
+}

Modified: branches/1.10/templates/tiki-page_bar.tpl
===================================================================
--- branches/1.10/templates/tiki-page_bar.tpl	2008-07-05 16:40:22 UTC (rev 13442)
+++ branches/1.10/templates/tiki-page_bar.tpl	2008-07-06 06:07:33 UTC (rev 13443)
@@ -1,6 +1,5 @@
 {* $Id$ *}
 {strip}
-<hr/>
 
 <div class="clearfix" id="page-bar">
 {if $edit_page eq 'y'}

Modified: branches/1.10/templates/tiki-show_page.tpl
===================================================================
--- branches/1.10/templates/tiki-show_page.tpl	2008-07-05 16:40:22 UTC (rev 13442)
+++ branches/1.10/templates/tiki-show_page.tpl	2008-07-06 06:07:33 UTC (rev 13443)
@@ -52,7 +52,7 @@
 	{/if}
 	{if $editable and ($tiki_p_edit eq 'y' or $page|lower eq 'sandbox') and $beingEdited ne 'y' or $canEditStaging eq 'y'}
 				<a title="{tr}Edit{/tr}" {ajax_href template="tiki-editpage.tpl" htmlelement="tiki-center"}tiki-editpage.php?page={if $needsStaging eq 'y'}{$stagingPageName|escape:"url"}{else}{$page|escape:"url"}{/if}{if !empty($page_ref_id) and $needsStaging neq 'y'}&amp;page_ref_id={$page_ref_id}{/if}{/ajax_href}>{icon _id='page_edit'}</a>
-	{/if}       
+	{/if}
 	{if $prefs.feature_morcego eq 'y' && $prefs.wiki_feature_3d eq 'y'}
 				<a title="{tr}3d browser{/tr}" href="javascript:wiki3d_open('{$page|escape}',{$prefs.wiki_3d_width}, {$prefs.wiki_3d_height})">{icon _id='wiki3d' alt="{tr}3d browser{/tr}"}</a>
 	{/if}
@@ -264,8 +264,9 @@
 </div> {* End of main wiki page *}
 
 {if $has_footnote eq 'y'}<div class="wikitext" id="wikifootnote">{$footnote}</div>{/if}
-
-<p class="editdate"> {* begining editdate *}
+{if $wiki_authors_style neq 'none' || $prefs.wiki_feature_copyrights eq 'y'|| $print_page eq 'y'}
+  <p class="editdate"> {* begining editdate *}
+{/if}
 {if isset($wiki_authors_style) && $wiki_authors_style eq 'business'}
   {tr}Last edited by{/tr} {$lastUser|userlink}
   {section name=author loop=$contributors}
@@ -276,7 +277,7 @@
     {/if}
    {/if}
    {$contributors[author]|userlink}
-  {/section}.<br />                                         
+  {/section}.<br />
   {tr}Page last modified on{/tr} {$lastModif|tiki_long_datetime}. {if $prefs.wiki_show_version eq 'y'}({tr}Version{/tr} {$lastVersion}){/if}
 {elseif isset($wiki_authors_style) && $wiki_authors_style eq 'collaborative'}
 <br />
@@ -297,7 +298,7 @@
   {tr}Last Modification{/tr}: {$lastModif|tiki_long_datetime} {tr}by{/tr} {$lastUser|userlink}. {if $prefs.wiki_show_version eq 'y'}({tr}Version{/tr} {$lastVersion}){/if}
 {/if}
 
-{if $prefs.wiki_feature_copyrights  eq 'y' and $prefs.wikiLicensePage}
+{if $prefs.wiki_feature_copyrights eq 'y' and $prefs.wikiLicensePage}
   {if $prefs.wikiLicensePage == $page}
     {if $tiki_p_edit_copyrights eq 'y'}
       <br />
@@ -314,7 +315,9 @@
     {tr}The original document is available at{/tr} <a href="{$base_url}tiki-index.php?page={$page|escape:"url"}">{$base_url}tiki-index.php?page={$page|escape:"url"}</a>
 {/if}
 
-</p> {* end editdate *}
+{if $wiki_authors_style neq 'none' || $prefs.wiki_feature_copyrights eq 'y'|| $print_page eq 'y'}
+  </p> {* end editdate *}
+{/if}
 
 {if $is_categorized eq 'y' and $prefs.feature_categories eq 'y' and $prefs.feature_categoryobjects eq 'y' and $tiki_p_view_categories eq 'y'}
 {$display_catobjects}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.