Author: tmortagne Date: 2007-10-05 17:31:12 +0200 (Fri, 05 Oct 2007) New Revision: 5303
Removed: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget Log: Merge "WikiCode.Macros" and "WikiCode.WidgetMaros" Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget 2007-10-05 15:31:12 UTC (rev 5303) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1190974436000</creationDate> -<date>1191509752000</date> -<contentUpdateDate>1191509752000</contentUpdateDate> -<version>1.42</version> +<date>1191596262000</date> +<contentUpdateDate>1191596262000</contentUpdateDate> +<version>1.43</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -53,8 +53,7 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.WidgetMacros") -#includeMacros("WikiCode.Macros") +<content>#includeMacros("WikiCode.Macros") #set($WikiManager = $xwiki.wikimanager) #set($Exception = $WikiManager.DefaultException) Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros 2007-10-05 15:31:12 UTC (rev 5303) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191493346000</creationDate> -<date>1191506483000</date> -<contentUpdateDate>1191506483000</contentUpdateDate> -<version>1.38</version> +<date>1191596123000</date> +<contentUpdateDate>1191596123000</contentUpdateDate> +<version>1.51</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -53,7 +53,19 @@ <tags/> </property> </object> -<content>#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist $asc) +<content>#macro(widgetbegin $title $rss) +<h2 class="heading-1-1-1"> $title + #if($rss && $rss != "") + <a href="$xwiki.getURL($rss, "view", "xpage=rdf")" style=""><img src="$xwiki.getSkinFile("icons/black-rss-mini.png")"></a> + #end +</h2> +#end + +#macro(widgetend ) +<!-- --> +#end + +#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist $asc) #set($sorteddocumentlist = []) #if($documentlist.size() >0) @@ -72,5 +84,37 @@ #set($added = $sorteddocumentlist.add($doc0)) #end #end +#end + +#macro(addlastwikimodifications $documentlist $wikiname $usermodifications $usermodificationswiki $nb) + #set($currentwiki = $context.database) + #if($wikiname) + $context.setDatabase($wikiname) + #else + #set($wikiname = $context.Database) + #end + + #set($sql = "where 1=1") + #if($usermodifications) + #if($context.database != $usermodificationswiki) + #set($sql = "${sql} and doc.author='${usermodificationswiki}:${usermodifications}'") + #else + #set($sql = "${sql} and doc.author='${usermodifications}'") + #end + #end + #set($sql = "${sql} order by doc.date desc") + + #set ($list = $xwiki.searchDocuments($sql , $nb , 0)) + + #foreach($docname in $list) + #if ($xwiki.hasAccessLevel("view", $context.user, "${context.database}:${docname}")) + #set($item = $xwiki.getDocument($docname)) + #set($added = $documentlist.add($item)) + #end + #end + + #if($context.database != $currentwiki) + $context.setDatabase($currentwiki) + #end #end</content> </xwikidoc> Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2007-10-05 15:31:12 UTC (rev 5303) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1190979406000</creationDate> -<date>1191517249000</date> -<contentUpdateDate>1191517249000</contentUpdateDate> -<version>1.51</version> +<date>1191596429000</date> +<contentUpdateDate>1191596429000</contentUpdateDate> +<version>1.52</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -53,7 +53,7 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.WidgetMacros") +<content>#includeMacros("WikiCode.Macros") #set($WikiManager = $xwiki.wikimanager) #set($Exception = $WikiManager.DefaultException) Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2007-10-05 15:31:12 UTC (rev 5303) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1190983998000</creationDate> -<date>1191517229000</date> -<contentUpdateDate>1191517229000</contentUpdateDate> -<version>1.9</version> +<date>1191596471000</date> +<contentUpdateDate>1191596471000</contentUpdateDate> +<version>1.10</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -53,7 +53,7 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.WidgetMacros") +<content>#includeMacros("WikiCode.Macros") #set($WikiManager = $xwiki.wikimanager) #set($Exception = $WikiManager.DefaultException) Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget 2007-10-05 15:31:12 UTC (rev 5303) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1190983126000</creationDate> -<date>1191517189000</date> -<contentUpdateDate>1191517189000</contentUpdateDate> -<version>1.18</version> +<date>1191596490000</date> +<contentUpdateDate>1191596490000</contentUpdateDate> +<version>1.19</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -53,7 +53,7 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.WidgetMacros") +<content>#includeMacros("WikiCode.Macros") #set($WikiManager = $xwiki.wikimanager) #set($Exception = $WikiManager.DefaultException) Deleted: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros 2007-10-05 15:19:12 UTC (rev 5302) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros 2007-10-05 15:31:12 UTC (rev 5303) @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<xwikidoc> -<web>WikiCode</web> -<name>WidgetMacros</name> -<language></language> -<defaultLanguage>en</defaultLanguage> -<translation>0</translation> -<parent></parent> -<creator>XWiki.Admin</creator> -<author>XWiki.Admin</author> -<customClass></customClass> -<contentAuthor>XWiki.Admin</contentAuthor> -<creationDate>1190973328000</creationDate> -<date>1191504710000</date> -<contentUpdateDate>1191504710000</contentUpdateDate> -<version>1.17</version> -<title></title> -<template></template> -<defaultTemplate></defaultTemplate> -<validationScript></validationScript> -<comment></comment> -<object> -<class> -<name>XWiki.TagClass</name> -<customClass></customClass> -<customMapping></customMapping> -<defaultViewSheet></defaultViewSheet> -<defaultEditSheet></defaultEditSheet> -<defaultWeb></defaultWeb> -<nameField></nameField> -<validationScript></validationScript> -<tags> -<cache>0</cache> -<displayType>input</displayType> -<multiSelect>1</multiSelect> -<name>tags</name> -<number>1</number> -<prettyName>Tags</prettyName> -<relationalStorage>1</relationalStorage> -<separator> </separator> -<separators> ,|</separators> -<size>30</size> -<unmodifiable>0</unmodifiable> -<values></values> -<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> -</tags> -</class> -<name>WikiCode.WidgetMacros</name> -<number>0</number> -<className>XWiki.TagClass</className> -<property> -<tags/> -</property> -</object> -<content>#macro(widgetbegin $title $rss) -<h2 class="heading-1-1-1"> $title - #if($rss && $rss != "") - <a href="$xwiki.getURL($rss, "view", "xpage=rdf")" style=""><img src="$xwiki.getSkinFile("icons/black-rss-mini.png")"></a> - #end -</h2> -#end - -#macro(widgetend ) -<!-- --> -#end</content> -</xwikidoc> _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications