[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[48280] branches/12.x

[<jon...@us...>]

Revision: 48280
          http://sourceforge.net/p/tikiwiki/code/48280
Author:   jonnybradley
Date:     2013-10-31 19:16:52 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
[FIX] articles: Show author if authorName is empty, position avatar next to the by-line and stop squashed layout when topic doesn't have an image

Modified Paths:
--------------
    branches/12.x/styles/layout/design.css
    branches/12.x/templates/article.tpl
    branches/12.x/templates/tiki-view_articles.tpl

Modified: branches/12.x/styles/layout/design.css
===================================================================
--- branches/12.x/styles/layout/design.css	2013-10-31 18:56:08 UTC (rev 48279)
+++ branches/12.x/styles/layout/design.css	2013-10-31 19:16:52 UTC (rev 48280)
@@ -1237,7 +1237,7 @@
 }
 
 .articletitle h2 {
-	margin: 0;
+	margin: 0 0 .3em;
 }
 
 img.topicimage,
@@ -1291,6 +1291,11 @@
 	white-space: nowrap;
 }
 
+.article .avatar {
+	float: left;
+	margin-right: 1em;
+}
+
 /* To keep language form and actions icons on one line */
 .article .actions form {
 	display: inline;

Modified: branches/12.x/templates/article.tpl
===================================================================
--- branches/12.x/templates/article.tpl	2013-10-31 18:56:08 UTC (rev 48279)
+++ branches/12.x/templates/article.tpl	2013-10-31 19:16:52 UTC (rev 48280)
@@ -83,7 +83,7 @@
 				{/if}
 				{if  $prefs.art_header_text_pos eq 'below' && $list_image_x > 0}
 					 </td></tr><tr><td valign="top">
-				{elseif $isfloat eq 'n'}
+				{elseif $isfloat eq 'n' and $topics[$topicId].image_size > 0}
 					</td>
 					<td valign="top" width="100%">
 				{/if}

Modified: branches/12.x/templates/tiki-view_articles.tpl
===================================================================
--- branches/12.x/templates/tiki-view_articles.tpl	2013-10-31 18:56:08 UTC (rev 48279)
+++ branches/12.x/templates/tiki-view_articles.tpl	2013-10-31 19:16:52 UTC (rev 48280)
@@ -33,8 +33,13 @@
 			</div>
 		{/if} 
 		<article class="article{if !empty($container_class)} {$container_class}{/if} article{$smarty.section.ix.index}">
+			{if ($listpages[ix].show_avatar eq 'y')}
+				<div class="avatar">
+					{$listpages[ix].author|avatarize}
+				</div>
+			{/if}
 			{if $listpages[ix].show_topline eq 'y' and $listpages[ix].topline}<div class="articletopline">{$listpages[ix].topline|escape}</div>{/if}
-			<header class="articletitle">
+			<header class="articletitle clearfix">
 				<h2>{object_link type=article id=$listpages[ix].articleId url=$smarty.capture.href title=$listpages[ix].title}</h2>
 				{if $listpages[ix].show_subtitle eq 'y' and $listpages[ix].subtitle}<div class="articlesubtitle">{$listpages[ix].subtitle|escape}</div>{/if}
 				{if ($listpages[ix].show_author eq 'y')
@@ -42,8 +47,12 @@
 				 or ($listpages[ix].show_expdate eq 'y')
 				 or ($listpages[ix].show_reads eq 'y')}	
 					<span class="titleb">
-						{if $listpages[ix].show_author eq 'y'}	
-							<span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape}&nbsp;- </span>
+						{if $listpages[ix].show_author eq 'y'}
+							{if $listpages[ix].authorName}
+								<span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape}&nbsp;- </span>
+							{else}
+								<span class="author">{tr}Author:{/tr} {$listpages[ix].author|escape}&nbsp;- </span>
+							{/if}
 						{/if}
 						{if $listpages[ix].show_pubdate eq 'y'}
 							<span class="pubdate">{tr}Published At:{/tr} {$listpages[ix].publishDate|tiki_short_datetime}&nbsp;- </span>
@@ -110,9 +119,6 @@
 									{/if}
 								{/if}
 							{/if}
-							{if ($listpages[ix].show_avatar eq 'y')}
-								{$listpages[ix].author|avatarize}
-							{/if}
 							{if $listpages[ix].isfloat eq 'n'}
 								</td><td  valign="top">
 							{/if}

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