Author: vmassol
Date: 2007-12-07 09:16:14 +0100 (Fri, 07 Dec 2007)
New Revision: 6324
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/Dashboard
Log:
XE-157: Add links to Blog post titles when displayed in a blog list
XE-158: Add title and introduction to the Dashboard page
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
2007-12-06 18:13:06 UTC (rev 6323)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
2007-12-07 08:16:14 UTC (rev 6324)
@@ -77,7 +77,7 @@
#set ($cdate = $creationDate)
#end
<div class="hentry">
-<h4 class="heading-1-1-1 entry-title">$bentrydoc.display("title","view",
$bentryobj)</h4>
+<a href="$bentrydoc.getURL()"><h4 class="heading-1-1-1
entry-title">$bentrydoc.display("title","view",
$bentryobj)</h4></a>
<div class="article_content entry-summary">
#set($content = $bentrydoc.display("extract", "view", $bentryobj))
#if($content=="")
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/Dashboard
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/Dashboard
2007-12-06 18:13:06 UTC (rev 6323)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Main/Dashboard
2007-12-07 08:16:14 UTC (rev 6324)
@@ -53,79 +53,83 @@
<tags/>
</property>
</object>
-<content><div>
- <div id="webhomeblogdisplay" style="float:left; width: 50%;">
- <div style="padding-right:20px;">
- <h2 class="heading-1-1-1">Blog <a
href="$xwiki.getURL("Main.BlogRss", "view", "xpage=rdf")" style=""><img
src="$xwiki.getSkinFile("icons/black-rss.png")" alt="rss
icon"/></a></h2>
- #set($nbstart = $request.nbstart)
- #set($category = "")
- #set($nbitems = "5")
- #includeMacros("Blog.Macros")
- </div>
- </div>
- <div id="webhomeNewsdisplay" style="float:left; width: 50%;">
- <div style="padding-left: 20px;">
- <h2 class="heading-1-1-1">Recent changes <a
href="$xwiki.getURL("Main.WebRss", "view", "xpage=rdf")" style=""><img
src="$xwiki.getSkinFile("icons/black-rss.png")" alt="rss
icon"/></a></h2>
+<content>1 News
+
+Find below all the recent news from the site blog and from the list of pages
that have been changed recently.
+
+<div>
+ <div id="webhomeblogdisplay" style="float:left; width: 50%;">
+ <div style="padding-right:20px;">
+ <h2 class="heading-1-1-1">Blog <a
href="$xwiki.getURL("Main.BlogRss", "view", "xpage=rdf")" style=""><img
src="$xwiki.getSkinFile("icons/black-rss.png")" alt="rss
icon"/></a></h2>
+ #set($nbstart = $request.nbstart)
+ #set($category = "")
+ #set($nbitems = "3")
+ #includeMacros("Blog.Macros")
+ </div>
+ </div>
+ <div id="webhomeNewsdisplay" style="float:left; width: 50%;">
+ <div style="padding-left: 20px;">
+ <h2 class="heading-1-1-1">Recent changes <a
href="$xwiki.getURL("Main.WebRss", "view", "xpage=rdf")" style=""><img
src="$xwiki.getSkinFile("icons/black-rss.png")" alt="rss
icon"/></a></h2>
#if(!$xwiki.hasMinorEdit() || $request.getParameter("showminor"))
#set ($sql = "where 1=1 order by doc.date desc")
#else
#set ($sql = ", XWikiRCSNodeInfo as ni where doc.id=ni.id.docId and
ni.id.version2=1 group by doc.web, doc.name order by max(ni.date) desc")
#end
- #set($showdata = 1)
- #if(!$nb)
- #set($nb = 30)
- #end
- #set($formatDate = "yyyy MMMM dd, HH:mm")
- #set ($list = $xwiki.searchDocuments($sql , $nb , 0))
- <ul>
- #foreach ($item in $list)
- #set($troubi ="non")
- #if ($xwiki.hasAccessLevel("view", $context.user,
"${context.database}:${item}"))
- #set($bentrydoc = $xwiki.getDocument($item))
- #set($cclass =
$xwiki.getDocument("XWiki.XWikiComments").getxWikiClass())
- #set($comment = $cclass.newObject())
- #if($xwiki.getWebPreferenceAsInt("commentsorder",1)==0)
- #set($comments = $bentrydoc.getComments())
- #else
- #set($comments = $bentrydoc.getComments(false))
- #end
- #set($createur = $xwiki.getUserName($bentrydoc.author))
- <li>
- #if($comments.size()>0)
- #set($i = 0)
- #set($cobj = $comments.get($i))
- #set($comment = $bentrydoc.display("comment", "view", $cobj))
- #set($date = $cobj.getXWikiObject().get("date").value)
- #if($date)
- #set($date2 = $!xwiki.formatDate($date,"yyyy MM dd
HH:mm:ss"))
- #end
- #if($bentrydoc)
- #set($date1 = $!xwiki.formatDate($!bentrydoc.date,"yyyy MM
dd HH:mm:ss") )
- #end
- #if($date1.equals($date2) )
- [$bentrydoc.name>${bentrydoc.web}.$bentrydoc.name]
<em>- 1 new comment</em>
- #set($troubi ="oui")
- #set($desc = $cobj.getXWikiObject().get("comment").value)
- #else
- [$bentrydoc.name in
$bentrydoc.web>${bentrydoc.web}.$bentrydoc.name]
- #end
- #else
- #set($comment = "")
- [$bentrydoc.name in
$bentrydoc.web>${bentrydoc.web}.$bentrydoc.name.replaceAll("@","%40")]
- #end
- $xwiki.formatDate($bentrydoc.date,"yyyy MMM dd") at
$xwiki.formatDate($bentrydoc.date,"HH:mm")
- #if($troubi =="oui")
- #set($createur = $xwiki.getUserName($cobj.author))
- #end
- #if ($createur == "XWikiGuest")
- Guest
- #else
- $createur
- #end
- </li>
- #end
- #end
- </ul>
+ #set($showdata = 1)
+ #if(!$nb)
+ #set($nb = 30)
+ #end
+ #set($formatDate = "yyyy MMMM dd, HH:mm")
+ #set ($list = $xwiki.searchDocuments($sql , $nb , 0))
+ <ul>
+ #foreach ($item in $list)
+ #set($troubi ="non")
+ #if ($xwiki.hasAccessLevel("view", $context.user,
"${context.database}:${item}"))
+ #set($bentrydoc = $xwiki.getDocument($item))
+ #set($cclass =
$xwiki.getDocument("XWiki.XWikiComments").getxWikiClass())
+ #set($comment = $cclass.newObject())
+ #if($xwiki.getWebPreferenceAsInt("commentsorder",1)==0)
+ #set($comments = $bentrydoc.getComments())
+ #else
+ #set($comments = $bentrydoc.getComments(false))
+ #end
+ #set($createur = $xwiki.getUserName($bentrydoc.author))
+ <li>
+ #if($comments.size()>0)
+ #set($i = 0)
+ #set($cobj = $comments.get($i))
+ #set($comment = $bentrydoc.display("comment", "view", $cobj))
+ #set($date = $cobj.getXWikiObject().get("date").value)
+ #if($date)
+ #set($date2 = $!xwiki.formatDate($date,"yyyy MM dd
HH:mm:ss"))
+ #end
+ #if($bentrydoc)
+ #set($date1 = $!xwiki.formatDate($!bentrydoc.date,"yyyy MM
dd HH:mm:ss") )
+ #end
+ #if($date1.equals($date2) )
+ [$bentrydoc.name>${bentrydoc.web}.$bentrydoc.name]
<em>- 1 new comment</em>
+ #set($troubi ="oui")
+ #set($desc = $cobj.getXWikiObject().get("comment").value)
+ #else
+ [$bentrydoc.name in
$bentrydoc.web>${bentrydoc.web}.$bentrydoc.name]
+ #end
+ #else
+ #set($comment = "")
+ [$bentrydoc.name in
$bentrydoc.web>${bentrydoc.web}.$bentrydoc.name.replaceAll("@","%40")]
+ #end
+ $xwiki.formatDate($bentrydoc.date,"yyyy MMM dd") at
$xwiki.formatDate($bentrydoc.date,"HH:mm")
+ #if($troubi =="oui")
+ #set($createur = $xwiki.getUserName($cobj.author))
+ #end
+ #if ($createur == "XWikiGuest")
+ Guest
+ #else
+ $createur
+ #end
+ </li>
+ #end
+ #end
+ </ul>
#if($xwiki.hasMinorEdit())
#if($request.getParameter("showminor"))
<a href="$xwiki.getURL($tdoc.getFullName(), "view", "")">Hide
minor edits</a>
@@ -133,8 +137,8 @@
<a href="$xwiki.getURL($tdoc.getFullName(), "view",
"showminor")">Show minor edits</a>
#end
#end
- </div>
- </div>
- <div style="clear:both; margin-bottom: 40px;"><!--
--></div>
-</div>
+ </div>
+ </div>
+ <div style="clear:both; margin-bottom: 40px;"><!--
--></div>
+</div>
</content></xwikidoc>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
