Author: sdumitriu
Date: 2008-02-13 16:19:23 +0100 (Wed, 13 Feb 2008)
New Revision: 7583
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/commentsinline.vm
Log:
XWIKI-2114: Upgrade the default templates
Deleted:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/commentsinline.vm
===================================================================
---
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/commentsinline.vm
2008-02-13 15:06:07 UTC (rev 7582)
+++
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/commentsinline.vm
2008-02-13 15:19:23 UTC (rev 7583)
@@ -1,63 +0,0 @@
-###
-### List document comments
-###
-### TODO: web service?
-###
-#if($xwiki.getWebPreferenceAsInt("commentsorder",1)==1)
-#set($comments = $doc.getComments())
-#else
-#set($comments = $doc.getComments(false))
-#end
- <div id="commentscontent" class="xwikiintracontent">
-#if($inline && ($inline == true)) <div class="xwikititlewrapper"
onclick="toggleClass($('comments'), 'hidden');
toggleClass($('commentscontent'), 'exp')"><h3
class="xwikiintratitle">$msg.get("comments")<span class="hidden">:</span> <span
class="commentsno"><span>$comments.size()</span></span></h3></div>#end
- <div id="comments">
-#if($comments.size()>0)
-#foreach($comment in $comments)
-#if($velocityCount > 1) <hr class="commentspacer"/>
-#end
- <div id="xwikicomment_${velocityCount}" class="xwikicomment
#if($velocityCount % 2 == 1) odd #else even #end">
-## <div class="commentavatar">#useravatar($comment.author)</div>
- <div class="commentheader"><span
class="commentauthor">$!xwiki.getLocalUserName($doc.display('author','view',
$comment))</span>
-## #set($date = $doc.display("date","view",$comment))
-#set($date = $comment.getProperty("date").value)
-#if($date)
- | <span class="commentdate">$xwiki.formatDate($date, "dd.MM.yyyy")
$msg.get("at") $xwiki.formatDate($date, "hh:mm a")</span>
-#end
-#if($hasedit) <span class="commentdelete"><a class="commentremove"
href="$doc.getURL("objectremove" ,
"classname=XWiki.XWikiComments&classid=${comment.number}&xredirect=${request.getRequestURL()}")"
- onclick="return
confirm('$msg.get("confirmcommentremove")')">[$msg.get("removethiscomment")]</a></span>#end
- </div>
- <div
class="commentcontent">$doc.getRenderedContent($doc.display("comment","view",$comment))
</div>
- </div>
-#end
-#else
-$msg.get("nocomments")
-#end
-#if($xwiki.hasAccessLevel("comment"))
-#set($cclass = $xwiki.getDocument("XWiki.XWikiComments").getxWikiClass())
-#set($comment = $cclass.newObject())
- <form action="$doc.getURL("commentadd")" method="post">
- <fieldset class="expanded" id="commentform">
- <legend onclick="toggleForm(this.form)">$msg.get("addcomment")<span
class="expands">...</span></legend>
- <input type="hidden" name="xredirect" value="${doc.getURL("view")}" />
- <input type="hidden" name="XWiki.XWikiComments_author"
value="$context.user"/>
- <input type="hidden" name="XWiki.XWikiComments_date" value=""/>
- <div><textarea id='XWiki.XWikiComments_comment' rows='5' cols="80"
name='XWiki.XWikiComments_comment' style="width: 100%;"></textarea></div>
- <div>
- <span class="buttonwrapper"><input type="submit"
value="$msg.get("addcomment")" class="button"/></span>
- <span class="buttonwrapper"><input type="reset"
value="$msg.get("cancel")" onclick="hideForm(this.form);"
class="button"/></span>
- </div>
- </fieldset>
- </form>
-#end
- </div> ## comments
- </div> ## commentscontent
-#if($inline && ($inline == true))
- <script type="text/javascript">
-//<![CDATA[
-if(document.getElementById("commentform")) {
- document.getElementById("commentform").className = "collapsed";
-}
-document.getElementById("comments").className += " hidden";
-//]]>
- </script>
-#end
\ No newline at end of file
Copied:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
(from rev 7582,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/commentsinline.vm)
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
(rev 0)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
2008-02-13 15:19:23 UTC (rev 7583)
@@ -0,0 +1,63 @@
+###
+### List document comments
+###
+### TODO: web service?
+###
+#if($xwiki.getWebPreferenceAsInt("commentsorder",1)==1)
+#set($comments = $doc.getComments())
+#else
+#set($comments = $doc.getComments(false))
+#end
+ <div id="commentscontent" class="xwikiintracontent">
+#if($inline && ($inline == true)) <div class="xwikititlewrapper"
onclick="toggleClass($('comments'), 'hidden');
toggleClass($('commentscontent'), 'exp')"><h3
class="xwikiintratitle">$msg.get("comments")<span class="hidden">:</span> <span
class="commentsno"><span>$comments.size()</span></span></h3></div>#end
+ <div id="comments">
+#if($comments.size()>0)
+#foreach($comment in $comments)
+#if($velocityCount > 1) <hr class="commentspacer"/>
+#end
+ <div id="xwikicomment_${velocityCount}" class="xwikicomment
#if($velocityCount % 2 == 1) odd #else even #end">
+## <div class="commentavatar">#useravatar($comment.author)</div>
+ <div class="commentheader"><span
class="commentauthor">$!xwiki.getLocalUserName($doc.display('author','view',
$comment))</span>
+## #set($date = $doc.display("date","view",$comment))
+#set($date = $comment.getProperty("date").value)
+#if($date)
+ | <span class="commentdate">$xwiki.formatDate($date, "dd.MM.yyyy")
$msg.get("at") $xwiki.formatDate($date, "hh:mm a")</span>
+#end
+#if($hasedit) <span class="commentdelete"><a class="commentremove"
href="$doc.getURL("objectremove" ,
"classname=XWiki.XWikiComments&classid=${comment.number}&xredirect=${request.getRequestURL()}")"
+ onclick="return
confirm('$msg.get("confirmcommentremove")')">[$msg.get("removethiscomment")]</a></span>#end
+ </div>
+ <div
class="commentcontent">$doc.getRenderedContent($doc.display("comment","view",$comment))
</div>
+ </div>
+#end
+#else
+$msg.get("nocomments")
+#end
+#if($xwiki.hasAccessLevel("comment"))
+#set($cclass = $xwiki.getDocument("XWiki.XWikiComments").getxWikiClass())
+#set($comment = $cclass.newObject())
+ <form action="$doc.getURL("commentadd")" method="post">
+ <fieldset class="expanded" id="commentform">
+ <legend onclick="toggleForm(this.form)">$msg.get("addcomment")<span
class="expands">...</span></legend>
+ <input type="hidden" name="xredirect" value="${doc.getURL("view")}" />
+ <input type="hidden" name="XWiki.XWikiComments_author"
value="$context.user"/>
+ <input type="hidden" name="XWiki.XWikiComments_date" value=""/>
+ <div><textarea id='XWiki.XWikiComments_comment' rows='5' cols="80"
name='XWiki.XWikiComments_comment' style="width: 100%;"></textarea></div>
+ <div>
+ <span class="buttonwrapper"><input type="submit"
value="$msg.get("addcomment")" class="button"/></span>
+ <span class="buttonwrapper"><input type="reset"
value="$msg.get("cancel")" onclick="hideForm(this.form);"
class="button"/></span>
+ </div>
+ </fieldset>
+ </form>
+#end
+ </div> ## comments
+ </div> ## commentscontent
+#if($inline && ($inline == true))
+ <script type="text/javascript">
+//<![CDATA[
+if(document.getElementById("commentform")) {
+ document.getElementById("commentform").className = "collapsed";
+}
+document.getElementById("comments").className += " hidden";
+//]]>
+ </script>
+#end
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
