[xoops-svn] SF.net SVN: xoops-svn:[12030] XoopsModules/weblog/trunk/weblog/templates/ weblog_details.html

[<des...@us...>]

Revision: 12030
          http://sourceforge.net/p/xoops/svn/12030
Author:   designburo
Date:     2013-09-12 20:30:39 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
Updated template to match entries template

Modified Paths:
--------------
    XoopsModules/weblog/trunk/weblog/templates/weblog_details.html

Modified: XoopsModules/weblog/trunk/weblog/templates/weblog_details.html
===================================================================
--- XoopsModules/weblog/trunk/weblog/templates/weblog_details.html	2013-09-12 20:24:48 UTC (rev 12029)
+++ XoopsModules/weblog/trunk/weblog/templates/weblog_details.html	2013-09-12 20:30:39 UTC (rev 12030)
@@ -1,3 +1,113 @@
+<<<<<<< .mine
+<div id="blog">
+	<div class="page">
+		<span class="title"><{$page_title}></span> - <span class="subtitle"><{$page_subtitle}></span>
+		<{if $rss_show eq 1}>
+			<div class="rss">
+				<a href="<{$rss_feeder}>"><img src="images/rss.gif" border="0" ></a>
+				<a href="<{$rdf_feeder}>"><img src="images/rdf.gif" border="0" ></a>
+				<span><{$lang_rss}></span>
+			</div>
+		<{/if}>
+	</div>
+	
+	<{$rdf_desc}>
+	<div class="blogDate">
+		<{$created_date}>
+	</div>
+	<div class="blogEntry">
+	
+	<div class="blogContents">
+			<span>
+				<div class="blogTitle">
+					<h2><{$title}></h2>
+				</div>
+			</span>
+			<{$contents}>
+		</div>
+		<div class="authorInfo">
+			<{if $use_avatar == 1}>
+				<img class="avatar" src="<{$avatar_img}>"><BR />
+			<{/if}>
+			@ <{$created_time}><BR />
+			<{$lang_author}>: <a href="<{$profileUri}>"><{$uname}></a><BR />
+			<a href="<{$weblog_topurl}>"><{$lang_category}></a>:</b> <{$category}>		
+		</div>
+		<div class="blogFooter">
+		<{if $is_private eq 1}>
+			<b><i><{$private}>:</i></b>
+			<{/if}>
+			<{$read_users_blog}>
+			<{if $provide_edit_link eq 1}>
+				&bull; <a href="post.php?blog_id=<{$blog_id}>&edit=1"><{$lang_edit}></a>
+			<{/if}>
+			 &bull; <{$lang_comments}> (<{$comments_num}>)
+			 &bull; <{$lang_trackbacks}> (<{$trackbacks}>)
+			 &bull; <{$lang_reads}> (<{$reads}>)
+			 <div class="blogindicate">
+				<{if $prev_blogentry}><a href="<{$prev_blogentry}>"><{$prev}></a><{/if}> | 
+				<{if $next_blogentry}><a href="<{$next_blogentry}>"><{$next}></a><{/if}>
+			</div>
+<!-- Trackbacks -->
+	<a name="trackback"></a>
+	<div class="blogTrackbackAnounce"><{$lang_trackback_anounce}>: <{$weblog_trackback_url}></div>
+<!--	<div class="blogShowTrackbackURL"><{$weblog_trackback_url}></div> -->
+	
+	<{if $trackback_transmit}>
+	<div class="blogTrackbackTransmit"><{$lang_trackback_transmit}></div>
+	<{foreach from=$trackback_transmit item=trackback}>
+		<{if $trackback.title}><span class="blogTrackbackTitle"><a href="<{$trackback.link}>" target="_blank"><{$trackback.title}></a></span><{/if}>
+		<{if $trackback.description}><div class="blogTrackbackDescription"><{$trackback.description}><a href="<{$trackback.link}>" target="_blank">...more</a></div><{/if}>
+		<{if $trackback.blog_name}><div class="blogTrackbackBlogname">&nbsp;--&nbsp;<a href="<{$trackback.link}>"><{$trackback.blog_name}></a>&nbsp;--&nbsp;</div><{/if}>
+		<div class="blogTrackbackURL"><a href="<{$trackback.tb_url}>" target="_blank"><{$trackback.tb_url}></a></div>
+		<div class="blogTrackbackCreated"><{$trackback.trackback_created}></div>
+	<{/foreach}>
+	<{/if}>
+	
+	<{if $trackback_recieved}>
+	<div class="blogTrackbackRecieved"><{$lang_trackback_recieved}></div>
+	<{foreach from=$trackback_recieved item=trackback}>
+		<{if $trackback.title}><div class="blogTrackbackTitle"><a href="<{$trackback.tb_url}>" target="_blank"><{$trackback.title}></a></div><{/if}>
+		<{if $trackback.description}><div class="blogTrackbackDescription"><{$trackback.description}><a href="<{$trackback.tb_url}>" target="_blank">...more</a></div><{/if}>
+		<{if $trackback.blog_name}><div class="blogTrackbackBlogname">&nbsp;--&nbsp;<a href="<{$trackback.tb_url}>" target="_blank"><{$trackback.blog_name}></a>&nbsp;--&nbsp;</div><{/if}><div class="blogTrackbackCreated"><{$trackback.trackback_created}></div>
+	<{/foreach}>
+	<{/if}>
+	
+		</div>
+	</div>
+	
+	<!--  printer and friend icons -->
+	<div style="padding: 5px; text-align: right;
+	margin-right:3px;">
+	<a href="<{$print_link}>"><img
+	src="images/print.gif" border="0"
+	alt="<{$lang_printerpage}>" /></a> <a target="_top"
+	href="<{$mail_link}>"><img src="images/friend.gif"
+	border="0" alt="<{$lang_sendstory}>" /></a>
+	</div>
+	
+	
+	<!-- Comments -->
+	<a name="comment"></a>
+	<div style="text-align: center; padding: 3px; margin: 3px;">
+	<{$commentsnav}>
+	<{$lang_notice}>
+	</div>
+	
+	<div style="margin: 3px; padding: 3px;">
+	<!-- start comments loop -->
+	<{if $comment_mode == "flat"}>
+	  <{include file="db:system_comments_flat.html"}>
+	<{elseif $comment_mode == "thread"}>
+	  <{include file="db:system_comments_thread.html"}>
+	<{elseif $comment_mode == "nest"}>
+	  <{include file="db:system_comments_nest.html"}>
+	<{/if}>
+	<!-- end comments loop -->
+	</div>
+	
+	<{include file='db:system_notification_select.html'}>
+=======
 <table cellspacing="0" width="100%">
   <tr>
     <td><b><{$page_title}> - <{$page_subtitle}></b><hr></td>
@@ -104,3 +214,4 @@
 </div>
 
 <{include file='db:system_notification_select.html'}>
+>>>>>>> .r12029