[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[27459] branches/3.0/templates

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

Revision: 27459
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27459&view=rev
Author:   pkdille
Date:     2010-06-01 22:10:56 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
[QT] Quality Team Backport

r26408 | xavidp | 2010-04-01 10:56:53 +0200 (Thu, 01 Apr 2010) | 1 line
[FIX][bp/r26405]Avoid showing article-topic image when user selected "use own image" and no image uploaded to tiki, to allow the use case of that user providing the image from a different source through the img tag in the heading and/or body of the article. Show article-topic name instead with a link to show all articles of this same topic.

Modified Paths:
--------------
    branches/3.0/templates/tiki-read_article.tpl
    branches/3.0/templates/tiki-view_articles.tpl

Modified: branches/3.0/templates/tiki-read_article.tpl
===================================================================
--- branches/3.0/templates/tiki-read_article.tpl	2010-06-01 22:10:13 UTC (rev 27458)
+++ branches/3.0/templates/tiki-read_article.tpl	2010-06-01 22:10:56 UTC (rev 27459)
@@ -82,12 +82,16 @@
 						{if $hasImage eq 'y'}
 							<a href="#" title="{if $show_image_caption and $image_caption}{$image_caption}{else}{tr}Article image{/tr}{/if}"><img {if $isfloat eq 'y'}style="margin-right:4px;float:left;"{else}class="articleimage"{/if} alt="{if $show_image_caption and $image_caption}{$image_caption}{else}{tr}Article image{/tr}{/if}" src="article_image.php?image_type=article&amp;id={$articleId}"{if $image_x > 0} width="{$image_x}"{/if}{if $image_y > 0 } height="{$image_y}"{/if} /></a>
 						{else}
-							<img {if $isfloat eq 'y'}style="margin-right:4px;float:left;"{else}class="articleimage"{/if} alt="{tr}Topic image{/tr}" src="article_image.php?image_type=topic&amp;id={$topicId}" />
+							{section name=user loop=$topics}
+								<a class="link" href="tiki-view_articles.php?topic={$topics[user].topicId}" title="{tr}List all articles of this same topic{/tr}">{$topics[user].name|escape}</a>
+							{sectionelse}
+							    {* no topic = do nothing *}
+							{/section}
 						{/if}
 					{else}
 						{section name=it loop=$topics}
 							{if ($topics[it].topicId eq $topicId) and ($topics[it].image_size > 0)}
-								<img {if $isfloat eq 'y'}style="margin-right:4px;float:left;"{else}class="articleimage"{/if} alt="{$topicName}" src="article_image.php?image_type=topic&amp;id={$topicId}" />
+								<a class="link" href="tiki-view_articles.php?topic={$topics[it].topicId}" title="{tr}List all articles of this same topic{/tr}"><img {if $isfloat eq 'y'}style="margin-right:4px;float:left;"{else}class="articleimage"{/if} alt="{$topicName}" src="article_image.php?image_type=topic&amp;id={$topicId}" /></a>
 							{/if}
 						{/section}
 					{/if}

Modified: branches/3.0/templates/tiki-view_articles.tpl
===================================================================
--- branches/3.0/templates/tiki-view_articles.tpl	2010-06-01 22:10:13 UTC (rev 27458)
+++ branches/3.0/templates/tiki-view_articles.tpl	2010-06-01 22:10:56 UTC (rev 27459)
@@ -57,10 +57,7 @@
 alt="{if $listpages[ix].show_image_caption and $listpages[ix].image_caption}{$listpages[ix].image_caption}{else}{$listpages[ix].topicName}{/if}" src="article_image.php?image_type=article&amp;id={$listpages[ix].articleId}"
 {if $listpages[ix].image_x > 0} width="{$listpages[ix].image_x}"{/if}{if $listpages[ix].image_y > 0 } height="{$listpages[ix].image_y}"{/if} /></a>
 {else}
-<a href="$listpages[ix].articleId|sefurl:article}" title="{if $listpages[ix].show_image_caption and
-$listpages[ix].image_caption}{$listpages[ix].image_caption}{else}{$listpages[ix].topicName}{/if}"><img 
-{if $listpages[ix].isfloat eq 'y'}style="margin-right:4px;float:left;"{else}class="articleimage"{/if} 
-alt="{if $listpages[ix].show_image_caption and $listpages[ix].image_caption}{$listpages[ix].image_caption}{else}{$listpages[ix].topicName}{/if}" src="article_image.php?image_type=topic&amp;id={$listpages[ix].topicId}" /></a>
+{* Intentionally left blank to allow user add an image from somewhere else through the img tag and no other extra image *}
 {/if}
 {else}
 {section name=it loop=$topics}


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