Index: resources/icons/xwiki/attach_add.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: resources\icons\xwiki\attach_add.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: templates/macros.vm
===================================================================
--- templates/macros.vm (revision 30618)
+++ templates/macros.vm (working copy)
@@ -1086,7 +1086,14 @@
###
#macro(xwikitopmenuentrystart $actionurl $linktext $id $class)
#end
- #if($tagcloud || $hasTopFilters)
+ #if($tagcloud || $hasTopFilters)
#end
@@ -1634,7 +1653,7 @@
## - If defined the displayName passed as a column option wins
## - If not, and if a i18n prefix has been passed, we use the localization tool with the prefix + the column name
## - Finally, we fall back on the column name
- #if("$!colprop.displayName" != '')
+ #if("$!colprop.displayName" != '')
#set($displayName = $colprop.displayName)
#elseif($transprefix != '')
#set($displayName = $msg.get("${transprefix}${colname}"))
@@ -1726,7 +1745,7 @@
#if($hasPageSize && "$!pageSizeBounds" != ''),"pageSizeBounds" : $pageSizeBounds#end
});
#else
- $jsName = new XWiki.widgets.LiveTable("$dataurl", "${divid}", #livetablecallback($divid $collist $colprops $transprefix), {
+ $jsName = new XWiki.widgets.LiveTable("$dataurl", "${divid}", #livetablecallback($divid $collist $colprops $transprefix), {
"maxPages":$maxPages
,"limit":$count
#if($hasTopFilters),"filterNodes" : [$("${divid}").down(".xwiki-livetable-display-filters"), $('${divid}-topfilters')]#end