Author: tmortagne Date: 2007-10-04 19:07:27 +0200 (Thu, 04 Oct 2007) New Revision: 5289
Added: 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 xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager Log: XAWM-12: Add box that list all wikis current user is Admin. XAWM-13: Add box that list all wikis current user can view. XAWM-14: Add box that list all wikis current user own. XAWM-15: Add box that list last created wikis ordered by creation date. Some translation corrections Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xwikidoc> +<web>WikiCode</web> +<name>LastCreatedWikisWidget</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>1190974436000</creationDate> +<date>1191509752000</date> +<contentUpdateDate>1191509752000</contentUpdateDate> +<version>1.42</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.LastCreatedWikisWidget</name> +<number>0</number> +<className>XWiki.TagClass</className> +<property> +<tags/> +</property> +</object> +<content>#includeMacros("WikiCode.WidgetMacros") +#includeMacros("WikiCode.Macros") + +#set($WikiManager = $xwiki.wikimanager) +#set($Exception = $WikiManager.DefaultException) + +############################################################################# + +#if(!$nb) + #set($nb = 5) +#end + +#if(!$wikilist) + #set($wikilist = $WikiManager.getWikiDocumentList()) +#end + +#if(!$creationsortedwikilist) + #sortDocumentByCreationDate($wikilist $creationsortedwikilist false) +#end + +############################################################################# + +#widgetbegin($msg.get("wikimanager.widget.lastcreatedwikis.title"), "") +#if(!$creationsortedwikilist.isEmpty()) + <table id="lastcreatedwikistable"> + #foreach($wikidoc in $creationsortedwikilist) + #if($velocityCount < $nb) + <tr> + <td>http://$wikidoc.server</td> + <td>[$wikidoc.creator]</td> + <td>$wikidoc.creationDate</td> + <tr> + #end + #end + </table> +#end +#widgetend() +</content></xwikidoc> \ No newline at end of file Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xwikidoc> +<web>WikiCode</web> +<name>Macros</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>1191493346000</creationDate> +<date>1191506483000</date> +<contentUpdateDate>1191506483000</contentUpdateDate> +<version>1.38</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.Macros</name> +<number>0</number> +<className>XWiki.TagClass</className> +<property> +<tags/> +</property> +</object> +<content>#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist $asc) + #set($sorteddocumentlist = []) + + #if($documentlist.size() >0) + #set($doc0 = $documentlist.get(0)) + + #foreach($doc1 in $documentlist) + + #foreach($doc2 in $documentlist) + #if (!$sorteddocumentlist.contains($doc2)) + #if($sorteddocumentlist.contains($doc0) || ($asc && ($doc0.creationDate.compareTo($doc2.creationDate)) > 0) || (!$asc && ($doc0.creationDate.compareTo($doc2.creationDate) < 0))) + #set($doc0 = $doc2) + #end + #end + #end + + #set($added = $sorteddocumentlist.add($doc0)) + #end + #end +#end</content> +</xwikidoc> Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xwikidoc> +<web>WikiCode</web> +<name>UserWikisIsAdminWidget</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>1190979406000</creationDate> +<date>1191517249000</date> +<contentUpdateDate>1191517249000</contentUpdateDate> +<version>1.51</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.UserWikisIsAdminWidget</name> +<number>0</number> +<className>XWiki.TagClass</className> +<property> +<tags/> +</property> +</object> +<content>#includeMacros("WikiCode.WidgetMacros") + +#set($WikiManager = $xwiki.wikimanager) +#set($Exception = $WikiManager.DefaultException) + +############################################################################# + + +#if(!$wikilist) + #set($wikilist = $WikiManager.getWikiDocumentList()) +#end + +############################################################################# + +#widgetbegin($msg.get("wikimanager.widget.userwikisadmin.title") "") +#if(!$wikilist.isEmpty()) + <table id="userwikisadmintable"> + #set($currentwiki = $context.database) + #foreach($wikidoc in $wikilist) + $context.setDatabase($wikidoc.wikiName) + #if($xwiki.hasAccessLevel("admin", "${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences")) + <tr> + <td>http://$wikidoc.server</td> + <td>[$wikidoc.creator]</td> + <td>$wikidoc.creationDate</td> + <tr> + #end + #end + $context.setDatabase($currentwiki) + </table> +#end +#widgetend()</content> +</xwikidoc> Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xwikidoc> +<web>WikiCode</web> +<name>UserWikisIsOwnerWidget</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>1190983998000</creationDate> +<date>1191517229000</date> +<contentUpdateDate>1191517229000</contentUpdateDate> +<version>1.9</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.UserWikisIsOwnerWidget</name> +<number>0</number> +<className>XWiki.TagClass</className> +<property> +<tags/> +</property> +</object> +<content>#includeMacros("WikiCode.WidgetMacros") + +#set($WikiManager = $xwiki.wikimanager) +#set($Exception = $WikiManager.DefaultException) + +############################################################################# + +#if(!$wikilist) + #set($wikilist = $WikiManager.getWikiDocumentList()) +#end + +############################################################################# + +#widgetbegin($msg.get("wikimanager.widget.userwikisowner.title"), "") +#set($wikilist = $WikiManager.getWikiDocumentList()) +#if(!$wikilist.isEmpty()) + <table id="userwikisadmintable"> + #foreach($wikidoc in $wikilist) + #if($wikidoc.owner == $context.user) + <tr> + <td>http://$wikidoc.server</td> + <td>[$wikidoc.creator]</td> + <td>$wikidoc.creationDate</td> + <tr> + #end + #end + </table> +#end +#widgetend()</content> +</xwikidoc> Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<xwikidoc> +<web>WikiCode</web> +<name>UserWikisIsUserWidget</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>1190983126000</creationDate> +<date>1191517189000</date> +<contentUpdateDate>1191517189000</contentUpdateDate> +<version>1.18</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.UserWikisIsUserWidget</name> +<number>0</number> +<className>XWiki.TagClass</className> +<property> +<tags/> +</property> +</object> +<content>#includeMacros("WikiCode.WidgetMacros") + +#set($WikiManager = $xwiki.wikimanager) +#set($Exception = $WikiManager.DefaultException) + +############################################################################# + +#if(!$wikilist) + #set($wikilist = $WikiManager.getWikiDocumentList()) +#end + +############################################################################# + +#widgetbegin($msg.get("wikimanager.widget.userwikisuser.title"), "") +#if(!$wikilist.isEmpty()) + <table id="userwikisadmintable"> + #set($currentwiki = $context.database) + #foreach($wikidoc in $wikilist) + $context.setDatabase($wikidoc.wikiName) + #if($xwiki.hasAccessLevel("view", "${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences")) + <tr> + <td>http://$wikidoc.server</td> + <td>[$wikidoc.creator]</td> + <td>$wikidoc.creationDate</td> + <tr> + #end + #end + $context.setDatabase($currentwiki) + </table> +#end +#widgetend() +</content></xwikidoc> \ No newline at end of file Added: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros (rev 0) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/WidgetMacros 2007-10-04 17:07:27 UTC (rev 5289) @@ -0,0 +1,67 @@ +<?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> Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome 2007-10-04 16:11:07 UTC (rev 5288) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome 2007-10-04 17:07:27 UTC (rev 5289) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1186669668000</creationDate> -<date>1190978279000</date> -<contentUpdateDate>1190978279000</contentUpdateDate> -<version>1.7</version> +<date>1191491989000</date> +<contentUpdateDate>1191491989000</contentUpdateDate> +<version>1.10</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -106,18 +106,18 @@ </tr> #foreach($serverdoc in $list) <tr> - <td>http://$serverdoc.server</td> + <td>[$serverdoc.WikiName>$serverdoc.FullName] (http://$serverdoc.server)</td> <td>[$serverdoc.owner]</td> <td>$xwiki.formatDate($serverdoc.creationDate,"dd/MM/yyyy")</td> <td>$serverdoc.state</td> <td>$serverdoc.visibility</td> <td> #if($serverdoc.visibility == "public") - [$msg.get("WikiManager.action.setvisibility.private")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=private] | + [$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=private] | #elseif($serverdoc.visibility == "private") - [$msg.get("WikiManager.action.setvisibility.template")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=template] | + [$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=template] | #elseif($serverdoc.visibility == "template") - [$msg.get("WikiManager.action.setvisibility.public")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=public] | + [$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&wikiname=$serverdoc.WikiName&wikivisibility=public] | #end [$msg.get("delete")>?action=delete&wikiname=$serverdoc.WikiName] | <a href="$serverdoc.getURL("inline")">$msg.get("edit")</a> Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager 2007-10-04 16:11:07 UTC (rev 5288) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager 2007-10-04 17:07:27 UTC (rev 5289) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1188210403000</creationDate> -<date>1191425537000</date> -<contentUpdateDate>1191425537000</contentUpdateDate> -<version>1.7</version> +<date>1191510248000</date> +<contentUpdateDate>1191510248000</contentUpdateDate> +<version>1.8</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -232,6 +232,7 @@ <value>WikiResources.Translations</value> <value>[WikiCode.%Code]</value> <value>[WikiCode.%Macros]</value> +<value>[WikiCode.%Widget]</value> </documents> </property> <property> _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications