Changeset 395

Timestamp:

04/02/09 16:09:51 (12 months ago)

Author:

espaan

Message:

[BlankTheme] synced with News 2.4 (catimagepath, comments per article, enableajaxedit)

Location:

trunk/themes/blanktheme/templates/modules/News

Files:

• news_user_articlecontent.htm (modified) (2 diffs)
• news_user_article.htm (modified) (1 diff)
• news_user_index.htm (modified) (1 diff)

trunk/themes/blanktheme/templates/modules/News/news_user_articlecontent.htm

@@ -2 +2 @@
 <script type="text/javascript">/* <![CDATA[ */
 var bytesused = "<!--[pnml name=_NEWS_CHARSUSED]-->"
+var showpublicationoptions = '<!--[pnml name="_NEWS_PUBLICATIONSHOW"]-->';
+var hidepublicationoptions = '<!--[pnml name="_NEWS_PUBLICATIONHIDE"]-->';
 /* ]]> */</script>
 
@@ -7 +9 @@
 <h2 class="news_title"><!--[$info.title]--></h2>
 
-<!--[nocache]--><div id="news_editlinks"><!--[articleadminlinks sid=$info.sid]--></div>
-<div id="news_editlinks_ajax" class="hidelink"><!--[articleadminlinks sid=$info.sid page=$page type="ajax"]--></div><!--[/nocache]-->
+<!--[nocache]-->
+<div id="news_editlinks"><!--[articleadminlinks sid=$info.sid]--></div>
+<!--[if $enableajaxedit]-->
+<div id="news_editlinks_ajax" class="hidelink"><!--[articleadminlinks sid=$info.sid page=$page type="ajax"]--></div>
+<!--[/if]-->
+<!--[/nocache]-->
 
 <p class="news_meta"><!--[pnml name=_NEWS_POSTEDBYANDON username=$info.informant date=$info.briefdatetime]--></p>
 
-<!--[if $links.searchtopic neq '']-->
-<p id="news_topic" class="news_meta"><a href="<!--[$links.searchtopic]-->"><img src="images/topics/<!--[$info.topicimage]-->" alt="<!--[$info.topicname|pnvarprephtmldisplay]-->" title="<!--[$info.topicname|pnvarprephtmldisplay]-->" /></a></p>
+<!--[if $links.searchtopic neq '' AND $info.topicimage neq '']-->
+<!--[* from News 2.4 onwards catimagepath exists *]-->
+<!--[if $catimagepath eq '']--><!--[assign var='catimagepath' value='images/topics/']--><!--[/if]-->
+<p id="news_topic" class="news_meta"><a href="<!--[$links.searchtopic]-->"><img src="<!--[$catimagepath]--><!--[$info.topicimage]-->" alt="<!--[$info.topicname]-->" title="<!--[$info.topicname]-->" /></a></p>
 <!--[/if]-->
 

trunk/themes/blanktheme/templates/modules/News/news_user_article.htm

@@ -6 +6 @@
 <div id="news_modify">&nbsp;</div>
 
-<!--[* the next code is to display any hooks (e.g. comments, ratings) *]-->
+<!--[* the next code is to display any hooks (e.g. comments, ratings). All hooks are stored in $hooks and called individually. EZComments is not called when Commenting is not allowed *]-->
 <!--[pnmodurl modname=News func=display sid=$info.sid assign=returnurl]-->
-<!--[pnmodcallhooks hookobject=item hookaction=display hookid=$info.sid module=News returnurl=$returnurl]-->
+<!--[* pnmodcallhooks hookobject=item hookaction=display hookid=$info.sid module=News returnurl=$returnurl *]-->
+<!--[pnmodcallhooks hookobject='item' hookaction='display' hookid=$info.sid module='News' returnurl=$returnurl owneruid=$info.cr_uid implode=false]-->
+<!--[foreach from=$hooks key='hookname' item='hook']-->
+<!--[if $hookname neq 'EZComments' or $info.withcomm eq 0]-->
+<!--[$hook]-->
+<!--[/if]-->
+<!--[/foreach]-->

trunk/themes/blanktheme/templates/modules/News/news_user_index.htm

@@ -11 +11 @@
   <div class="news_categories">
         <!--[* <p class="diggers"><!--[diggers title=$info.title url=$url]--></p> *]-->
+    <!--[if !empty($info.categories)]-->
         <!--[pnml name='_NEWS_FILEDUNDER']-->: <!--[foreach from=$preformat.categories item='categorylink' name='articleCatsLoop']--><!--[$categorylink]--><!--[if $smarty.foreach.articleCatsLoop.last ne true]--> | <!--[/if]--><!--[/foreach]-->
+    <!--[/if]-->
   </div>
+  <!--[* $preformat.readmore]--> <!--[recommend modname='News' itemid=$info.sid]--> <!--[$preformat.print *]-->
 </div>