Commit 1c52feff authored by Robert Lyon's avatar Robert Lyon
Browse files

Move the Journal entry's date to below title (Bug 661602)



This way it's consistent with the "External feed" block, where
we also put the date below the title of the feed entry.

Also split up the 'posted by' and 'comments', placing the comments
last in the list.

Also have the posted date at top of the Content -> Journal page

Change-Id: I25a7f62f4ba91c66e198333546dbe471c222246c
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent cab737d3
......@@ -22,10 +22,10 @@
{foreach from=$results item=post}
<div class="post">
<h3 class="title"><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$view}">{$post->title}</a></h3>
<div class="postdetails">{$post->postedbyon}</div>
<div class="detail">{$post->description|clean_html|safe}</div>
<div class="tags">{str tag=tags}: {list_tags owner=$post->owner tags=$post->taglist}</div>
<div class="postdetails">{$post->postedbyon}
{if $post->allowcomments} | <a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$view}">{str tag=Comments section=artefact.comment} ({$post->commentcount})</a>{/if}</div>
{if $post->allowcomments}<div class="postdetails"><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$view}">{str tag=Comments section=artefact.comment} ({$post->commentcount})</a></div>{/if}
</div>
{/foreach}
</div>
......
......@@ -26,6 +26,9 @@
</span>
</div>
<h2>{$post->title}</h2>
<div id="postdetails_{$post->id}" class="postdetails postdate">
{str tag=postedon section=artefact.blog} {$post->ctime}
</div>
<div id="postdescription_{$post->id}" class="postdescription">
{$post->description|clean_html|safe}
</div>
......@@ -55,8 +58,5 @@
</table>
</div>
{/if}
<div id="postdetails_{$post->id}" class="postdetails">
{str tag=postedon section=artefact.blog} {$post->ctime}
</div>
</div>
{/foreach}
......@@ -3,6 +3,7 @@
*}
<div id="blogpost">
{if $artefacttitle}<h3 class="title">{$artefacttitle|safe}</h3>{/if}
<div class="postdetails">{$postedbyon}</div>
{$artefactdescription|clean_html|safe}
{if isset($attachments)}
{if $artefact->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}</div>{/if}
......@@ -31,12 +32,10 @@
</tbody>
</table>
{/if}
<div class="postdetails">{$postedbyon}
{if isset($commentcount) && $artefact->get('allowcomments')} | <a href="{$artefacturl}">{str tag=Comments section=artefact.comment} ({$commentcount})</a>{/if}
</div>
{if $license}
<div class="postlicense">
{$license|safe}
</div>
{/if}
{if isset($commentcount) && $artefact->get('allowcomments')}<div class="postdetails"><a href="{$artefacturl}">{str tag=Comments section=artefact.comment} ({$commentcount})</a></div>{/if}
</div>
{foreach from=$posts item=post}
<div class="post">
<h3 class="title"><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$options.viewid}">{$post->title}</a></h3>
<div class="postdetails">{$post->postedby}</div>
<div>{$post->description|clean_html|safe}
{if $post->tags}
<div class="tags">{str tag=tags}: {list_tags owner=$post->owner tags=$post->tags}</div>
......@@ -34,8 +35,6 @@
</tbody>
</table>
{/if}
<div class="postdetails">{$post->postedby}
{if $options.viewid && $post->allowcomments} | <a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$options.viewid}">{str tag=Comments section=artefact.comment} ({$post->commentcount})</a>{/if}
</div>
{if $options.viewid && $post->allowcomments}<div class="postdetails"><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$options.viewid}">{str tag=Comments section=artefact.comment} ({$post->commentcount})</a></div>{/if}
</div>
{/foreach}
......@@ -15,9 +15,9 @@
{$entry->title}
{if $entry->link}</a>{/if}
</h3>
<span class="postdetails">
<div class="postdetails">
{if $entry->pubdate}{str tag=publishedon section=blocktype.externalfeed arg1=$entry->pubdate}{/if}
</span>
</div>
<div class="feedcontent">{$entry->description|clean_html|safe}</div>
{/foreach}
{else}
......
......@@ -2278,8 +2278,10 @@ tr#unzip_artefact_submit_container td {
#postlist .draft .poststatus {
color: #DA7373;
}
#postlist .postdescription {
#postlist .postdate {
border-top: 1px dotted #D1D1D1;
}
#postlist .postdescription {
padding: 5px 0;
}
#postlist .published {
......
......@@ -812,8 +812,11 @@ nav#collection-nav ul li {
padding-bottom: 5px;
border-bottom: 1px dotted #D1D1D1;
}
#blocktype_externalfeed_entries .postdetails {
margin: 3px 0;
}
#blocktype_externalfeed_entries .title {
margin: 10px 0;
margin: 13px 0 3px 0;
}
#blocktype_externalfeed_entries ol,
#blocktype_externalfeed_entries ul {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment