xoops-svn

[<dh...@us...>]

Revision: 9788
          http://xoops.svn.sourceforge.net/xoops/?rev=9788&view=rev
Author:   dhcst
Date:     2012-07-04 20:20:34 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
fix template for notify

Modified Paths:
--------------
    XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
    XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html
    XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html

Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html	2012-07-04 17:44:39 UTC (rev 9787)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_thread.html	2012-07-04 20:20:34 UTC (rev 9788)
@@ -19,55 +19,55 @@
 		<td width="20%" class="odd" rowspan="2" valign="top">
 			<{if $topic_post.poster.uid != 0}>  		
 				<div class="comUserRankText"><{$topic_post.poster.rank.title}><br /><{$topic_post.poster.rank.image}></div>
-					<{if $topic_post.poster.avatar != "blank.gif"}>
-						<br /><img class="comUserImg" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="" />
-					<{else}>
-						<br /><img class="comUserImg" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/anonym.png" alt="" />
-					<{/if}>
-					<br />		
-					<{if $infobox gt 0}>		
-						<div>
-							<img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="Benutzerinformationen" title="Benutzerinformationen" />
-						</div>
-						<div id="<{$topic_post.post_id}>"
+				<{if $topic_post.poster.avatar != "blank.gif"}>
+					<br /><img class="comUserImg" src="<{$xoops_upload_url}>/<{$topic_post.poster.avatar}>" alt="" />
+				<{else}>
+					<br /><img class="comUserImg" src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/anonym.png" alt="" />
+				<{/if}>
+				<br />		
+				<{if $infobox gt 0}>		
+					<div>
+						<img style="padding:2px;" onclick="ToggleBlockCategory('<{$topic_post.post_id}>', this, '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png', '<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/more.png')" src="<{$icon_path}>/more.png" alt="Benutzerinformationen" title="Benutzerinformationen" />
+					</div>
+					<div id="<{$topic_post.post_id}>"
 							<{if $infobox == 1}> style="display: none;"
 							<{else}> style="display:block;"
 							<{/if}>
-						>
-							<div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_JOINED}>:</span><br /><{$topic_post.poster.regdate}></div>
-							<{if $topic_post.poster.from}>
-								<div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_FROM}></span> <{$topic_post.poster.from}></div>
-							<{/if}>
-							<{if $topic_post.poster.groups}>
-								<div class="comUserStat"> <span class="comUserStatCaption"><{$smarty.const._MD_GROUP}></span>
-									<{foreachq item=group from=$topic_post.poster.groups}> <br /><{$group}><{/foreach}>
-								</div>
-							<{/if}>
-							<div class="comUserStat">
-								<span class="comUserStatCaption"><{$smarty.const._MD_POSTS}>:</span> 
-								<{if $topic_post.poster.posts gt 0}>
-									<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?uid=<{$topic_post.poster.uid}>" title="<{$smarty.const._ALL}>" target="_self"><{$topic_post.poster.posts}></a>
-								<{else}>
-									0
-								<{/if}>
-								<{if $topic_post.poster.digests gt 0}>
-									| <span class="comUserStatCaption"><{$smarty.const._MD_DIGESTS}>:</span> <{$topic_post.poster.digests}>
-								<{/if}>
+					>
+						<div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_JOINED}>:</span><br /><{$topic_post.poster.regdate}></div>
+						<{if $topic_post.poster.from}>
+							<div class="comUserStat"><span class="comUserStatCaption"><{$smarty.const._MD_FROM}></span> <{$topic_post.poster.from}></div>
+						<{/if}>
+						<{if $topic_post.poster.groups}>
+							<div class="comUserStat"> <span class="comUserStatCaption"><{$smarty.const._MD_GROUP}></span>
+								<{foreachq item=group from=$topic_post.poster.groups}> <br /><{$group}><{/foreach}>
 							</div>
-							<{if $topic_post.poster.level}>
-								<div class="comUserStat" align="left"><{$topic_post.poster.level}></div>
+						<{/if}>
+						<div class="comUserStat">
+							<span class="comUserStatCaption"><{$smarty.const._MD_POSTS}>:</span> 
+							<{if $topic_post.poster.posts gt 0}>
+								<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?uid=<{$topic_post.poster.uid}>" title="<{$smarty.const._ALL}>" target="_self"><{$topic_post.poster.posts}></a>
+							<{else}>
+								0
 							<{/if}>
-							<{if $topic_post.poster.status}>
-								<div class="comUserStatus"><{$topic_post.poster.status}></div>
+							<{if $topic_post.poster.digests gt 0}>
+								| <span class="comUserStatCaption"><{$smarty.const._MD_DIGESTS}>:</span> <{$topic_post.poster.digests}>
 							<{/if}>
 						</div>
-					<{/if}>
-				<{else}>
-					<div class="comUserRankText"><{$anonymous_prefix}><{$topic_post.poster.name}></div>
+						<{if $topic_post.poster.level}>
+							<div class="comUserStat" align="left"><{$topic_post.poster.level}></div>
+						<{/if}>
+						<{if $topic_post.poster.status}>
+							<div class="comUserStatus"><{$topic_post.poster.status}></div>
+						<{/if}>
+					</div>
 				<{/if}>
-			</td>	
+			<{else}>
+				<div class="comUserRankText"><{$anonymous_prefix}><{$topic_post.poster.name}></div>
+			<{/if}>
+		</td>	
 
-			<td colspan="2" class="even">
+		<td colspan="2" class="even">
 		<{else}>
 			<td colspan="3" class="even">
 		<{/if}>
@@ -114,9 +114,11 @@
 			<table style="border: 0; padding: 0; margin: 0">
 				<tr>
 					<td style="text-align:left;">
-						<{foreachq item=btn from=$topic_post.thread_action}> 
-							<a href="<{$btn.link}>&amp;post_id=<{$topic_post.post_id}>" title="<{$btn.name}>" <{if $btn.target}>target="<{$btn.target}>"<{/if}>> <{$btn.image}></a> 
-						<{/foreach}>
+						<{if $topic_post.thread_action}>
+							<{foreachq item=btn from=$topic_post.thread_action}> 
+								<a href="<{$btn.link}>&amp;post_id=<{$topic_post.post_id}>" title="<{$btn.name}>" <{if $btn.target}>target="<{$btn.target}>"<{/if}>> <{$btn.image}></a> 
+							<{/foreach}>
+						<{/if}>
 					</td>
 					<td style="text-align: right;">
 						<{if $mode gt 1}>
@@ -125,7 +127,11 @@
 							<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/action.post.php?post_id=<{$topic_post.post_id}>&amp;op=split&amp;mode=3" target="_self" title="<{$smarty.const._MD_SPLIT_ALL}>"><{$smarty.const._MD_SPLIT_ALL}></a> | 
 							<input type="checkbox" name="post_id[]" id="post_id[<{$topic_post.post_id}>]" value="<{$topic_post.post_id}>" />
 						<{else}>
-							<{foreachq item=btn from=$topic_post.thread_buttons}> <a href="<{$btn.link}>&amp;post_id=<{$topic_post.post_id}>" title="<{$btn.name}>"> <{$btn.image}></a> <{/foreach}>
+							<{if $topic_post.thread_buttons}>
+								<{foreachq item=btn from=$topic_post.thread_buttons}> 
+									<a href="<{$btn.link}>&amp;post_id=<{$topic_post.post_id}>" title="<{$btn.name}>"> <{$btn.image}></a> 
+								<{/foreach}>
+							<{/if}>
 						<{/if}>
 						<a href="#threadtop" title="<{$smarty.const._MD_TOP}>"> <{$p_up}></a>
 					</td>

Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html	2012-07-04 17:44:39 UTC (rev 9787)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewpost.html	2012-07-04 20:20:34 UTC (rev 9788)
@@ -136,5 +136,5 @@
 	<br />
 	<{includeq file="db:newbb_online.html"}>
 <{/if}>
-
+<{includeq file='db:newbb_notification_select.html'}>
 <!-- end module contents -->
\ No newline at end of file

Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html	2012-07-04 17:44:39 UTC (rev 9787)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html	2012-07-04 20:20:34 UTC (rev 9788)
@@ -49,30 +49,29 @@
 <{/if}>
 
 <{if $viewer_level gt 1}>
-<div style="float: right; text-align:right;" id="admin">
-    <{if $mode gt 1}>
-        <form name="form_posts_admin" action="topicmanager.php" method="POST" onsubmit="javascript: if(window.document.forum_posts_admin.op.value &lt; 1){return false;}">
-            <{$smarty.const._ALL}>: <input type="checkbox" name="post_check" id="post_check" value="1" onclick="xoopsCheckAll('form_posts_admin', 'post_check');" /> 
-            <select name="mode">
-                <option value="0"><{$smarty.const._SELECT}></option>
-                <option value="delete"><{$smarty.const._DELETE}></option>
-                <{if $status eq "pending"}>
-                    <option value="approve"><{$smarty.const._MD_APPROVE}></option>
-                <{elseif $status eq "deleted"}>
-                    <option value="restore"><{$smarty.const._MD_RESTORE}></option>
-				<{/if}>
-            </select>
-            <input type="hidden" name="topic_id" value="<{$topic_id}>" /> 
-            <input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /> | 
-            <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
-		
-    <{else}>
-        <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&amp;status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> | 
-        <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&amp;status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> | 
-        <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&amp;status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a>
-    <{/if}>
-</div>
-<br />  
+	<div style="float: right; text-align:right;" id="admin">
+		<{if $mode gt 1}>
+			<form name="form_posts_admin" action="topicmanager.php" method="POST" onsubmit="javascript: if(window.document.forum_posts_admin.op.value &lt; 1){return false;}">
+				<{$smarty.const._ALL}>: <input type="checkbox" name="post_check" id="post_check" value="1" onclick="xoopsCheckAll('form_posts_admin', 'post_check');" /> 
+				<select name="mode">
+					<option value="0"><{$smarty.const._SELECT}></option>
+					<option value="delete"><{$smarty.const._DELETE}></option>
+					<{if $status eq "pending"}>
+						<option value="approve"><{$smarty.const._MD_APPROVE}></option>
+					<{elseif $status eq "deleted"}>
+						<option value="restore"><{$smarty.const._MD_RESTORE}></option>
+					<{/if}>
+				</select>
+				<input type="hidden" name="topic_id" value="<{$topic_id}>" /> 
+				<input type="submit" name="submit" value="<{$smarty.const._SUBMIT}>" /> | 
+				<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>" target="_self" title="<{$smarty.const._MD_TYPE_VIEW}>"><{$smarty.const._MD_TYPE_VIEW}></a>
+		<{else}>
+			<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&amp;status=active#admin" target="_self" title="<{$smarty.const._MD_TYPE_ADMIN}>"><{$smarty.const._MD_TYPE_ADMIN}></a> | 
+			<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&amp;status=pending#admin" target="_self" title="<{$smarty.const._MD_TYPE_PENDING}>"><{$smarty.const._MD_TYPE_PENDING}></a> | 
+			<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?topic_id=<{$topic_id}>&amp;status=deleted#admin" target="_self" title="<{$smarty.const._MD_TYPE_DELETED}>"><{$smarty.const._MD_TYPE_DELETED}></a>
+		<{/if}>
+	</div>
+	<br />  
 <{/if}>
 <div class="clear"></div>
 <br />
@@ -148,6 +147,7 @@
 <div class="clear"></div>
 <br />
 <br />
+
 <{if $viewer_level gt 1 && $topic_status == 1}>
     <div class="resultMsg"><{$smarty.const._MD_TOPICLOCK}></div>
     <br />
@@ -215,26 +215,28 @@
     <br />
     <br />
 <{/if}>
+
 <div>
-<div style="float: left; text-align: left;">
-<{foreachq item=perm from=$permission_table}>
-<div><{$perm}></div>
-<{/foreach}>
+	<div style="float: left; text-align: left;">
+		<{foreachq item=perm from=$permission_table}>
+			<div><{$perm}></div>
+		<{/foreach}>
+	</div>
+
+	<div style="float: right; text-align: right;">
+		<form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="get">
+			<input name="term" id="term" type="text" size="15" />
+			<input type="hidden" name="forum" id="forum" value="<{$forum_id}>" />
+			<input type="hidden" name="sortby" id="sortby" value="p.post_time desc" />
+			<input type="hidden" name="since" id="since" value="<{$forum_since}>" />
+			<input type="hidden" name="action" id="action" value="yes" />
+			<input type="hidden" name="searchin" id="searchin" value="both" />
+			<input type="submit" class="formButton" value="<{$smarty.const._MD_SEARCH}>" /><br />
+			[<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a>]
+		</form><br />
+		<{$forum_jumpbox}>
+	</div>
 </div>
-<div style="float: right; text-align: right;">
-<form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="get">
-<input name="term" id="term" type="text" size="15" />
-<input type="hidden" name="forum" id="forum" value="<{$forum_id}>" />
-<input type="hidden" name="sortby" id="sortby" value="p.post_time desc" />
-<input type="hidden" name="since" id="since" value="<{$forum_since}>" />
-<input type="hidden" name="action" id="action" value="yes" />
-<input type="hidden" name="searchin" id="searchin" value="both" />
-<input type="submit" class="formButton" value="<{$smarty.const._MD_SEARCH}>" /><br />
-[<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a>]
-</form><br />
-<{$forum_jumpbox}>
-</div>
-</div>
 <div class="clear"></div>
 <br />
 

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