[xwiki-notifications] r5198 - xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8

[Ludovic Dubost]

Author: ludovic
Date: 2007-10-02 02:29:49 +0200 (Tue, 02 Oct 2007)
New Revision: 5198

Modified:
   
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/assethistory.vm
   
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
Log:
CURRIKI-947 Need date format of mm/dd/yy on comments page.
CURRIKI-982 Fixed CBOE appearing in view mode

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/assethistory.vm
===================================================================
--- 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/assethistory.vm 
    2007-10-01 17:04:30 UTC (rev 5197)
+++ 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/assethistory.vm 
    2007-10-02 00:29:49 UTC (rev 5198)
@@ -30,7 +30,7 @@
           <td>&ndash;</td>
 #else
           <td>$xwiki.getLocalUserName($newdoc.author)</td>
-          <td>$xwiki.formatDate($newdoc.date, "dd/MM/yyyy hh:mm")</td>
+          <td>$xwiki.formatDate($newdoc.date, "MM/dd/yy hh:mm")</td>
 #end
 #if($xwiki.hasEditComment())
           <td>$!{newdoc.comment}</td>

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
===================================================================
--- 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
   2007-10-01 17:04:30 UTC (rev 5197)
+++ 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/commentsinline.vm
   2007-10-02 00:29:49 UTC (rev 5198)
@@ -64,7 +64,7 @@
 </div>
 #set($date = $!comment.getProperty("date").value)
       <div class="commentheader"><span 
class="commentauthor">$!xwiki.getUserName($doc.display('author','view',$comment))</span>
-#if($date!="") <span 
class="commentdate">$xwiki.formateDate($date,"MM/dd/yyyy")</span>#end
+#if($date!="") <span 
class="commentdate">$xwiki.formatDate($date,"MM/dd/yy")</span>#end
 #set($delredir = $doc.getURL("view", "viewer=comments"))
 ## #if($hasedit) <span class="commentdelete"><a class="commentremove" 
href="$doc.getURL("objectremove" , 
"classname=XWiki.XWikiComments&amp;classid=${comment.number}&amp;xredirect=${delredir}")"
 ##    onclick="return 
confirm('$msg.get("confirmcommentremove")')">$msg.get("removethiscomment")</a></span>#end
 ## endif hasedit

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-01 17:04:30 UTC (rev 5197)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-02 00:29:49 UTC (rev 5198)
@@ -1146,9 +1146,9 @@
    #if(($assetPage == "PAGEBREAK")||($assetPage == ""))
  <hr >
    #else
-    #set($ok = $asset.use("XWiki.TextAssetClass"))
-    #set($type = $asset.getValue("type"))
-    #if("$type"=="2"))
+    #set($embeddedDoc = $xwiki.getDocument($assetPage))
+    #set($objTxt = $embeddedDoc.getObject("XWiki.TextAssetClass"))
+    #if($objTxt.type==2)
 ## We are not showing direction block assets
     #elseif(!$xwiki.hasAccessLevel("view", $context.user, $assetPage))
 ## We are not showing protected assets

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications