Author: tmortagne Date: 2007-10-08 22:13:36 +0200 (Mon, 08 Oct 2007) New Revision: 5322
Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget 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: XAWM-12: Modify using XWIKI-1794 XAWM-13: Modify using XWIKI-1794 XAWM-14: Modify using XWIKI-1794 XAWM-15: Modify using XWIKI-1794 XAWM-16: Modify using XWIKI-1794 XAWM-17: Modify using XWIKI-1794 XAWM-18: Modify using XWIKI-1794 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-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget 2007-10-08 20:13:36 UTC (rev 5322) @@ -6,15 +6,15 @@ <language></language> <defaultLanguage>en</defaultLanguage> <translation>0</translation> -<parent></parent> +<parent>Panels.WebHome</parent> <creator>XWiki.Admin</creator> <author>XWiki.Admin</author> <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> -<creationDate>1190974436000</creationDate> -<date>1191602683000</date> -<contentUpdateDate>1191602683000</contentUpdateDate> -<version>1.45</version> +<creationDate>1191854731000</creationDate> +<date>1191860811000</date> +<contentUpdateDate>1191860811000</contentUpdateDate> +<version>1.8</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -22,6 +22,125 @@ <comment></comment> <object> <class> +<name>Panels.PanelClass</name> +<customClass></customClass> +<customMapping></customMapping> +<defaultViewSheet></defaultViewSheet> +<defaultEditSheet></defaultEditSheet> +<defaultWeb></defaultWeb> +<nameField></nameField> +<validationScript></validationScript> +<category> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>category</name> +<number>5</number> +<prettyName>Category</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>Information|Navigation|Tools|Administration|Other</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</category> +<content> +<editor>Text</editor> +<name>content</name> +<number>4</number> +<prettyName>Content</prettyName> +<rows>25</rows> +<size>60</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</content> +<description> +<editor>Text</editor> +<name>description</name> +<number>3</number> +<prettyName>Description</prettyName> +<rows>5</rows> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</description> +<name> +<name>name</name> +<number>1</number> +<prettyName>Name</prettyName> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> +</name> +<type> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>type</name> +<number>2</number> +<prettyName>Panel type</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>view|edit</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</type> +</class> +<name>WikiCode.LastCreatedWikisWidget</name> +<number>0</number> +<className>Panels.PanelClass</className> +<property> +<category>Information</category> +</property> +<property> +<content>#panelheader($msg.get("wikimanager.widget.lastcreatedwikis.title")) + + #includeMacros("WikiCode.Macros") + + #set($WikiManager = $xwiki.wikimanager) + #set($Exception = $WikiManager.DefaultException) + +############################################################################# + + #if(!$nb) + #set($nb = 5) + #end + + #if(!$allwikilist) + #set($allwikilist = $WikiManager.getWikiDocumentList()) + #end + + #if(!$creationsortedallwikilist) + #sortDocumentByCreationDate($allwikilist $creationsortedallwikilist false) + #end + +############################################################################# + + #if(!$creationsortedallwikilist.isEmpty()) + #foreach($wikidoc in $creationsortedallwikilist) + #if($velocityCount < $nb) + #displaymodification("http://$wikidoc.server" "http://$wikidoc.server" $wikidoc.creationDate $formatDate $wikidoc.creator true) + #end + #end + #end + +#panelfooter()</content> +</property> +<property> +<description>Panel Description</description> +</property> +<property> +<name>LastCreatedWikisWidget</name> +</property> +<property> +<type>view</type> +</property> +</object> +<object> +<class> <name>XWiki.TagClass</name> <customClass></customClass> <customMapping></customMapping> @@ -53,40 +172,5 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.Macros") - -#set($WikiManager = $xwiki.wikimanager) -#set($Exception = $WikiManager.DefaultException) - -############################################################################# - -#if(!$nb) - #set($nb = 5) -#end - -#if(!$allwikilist) - #set($allwikilist = $WikiManager.getWikiDocumentList()) -#end - -#if(!$creationsortedallwikilist) - #sortDocumentByCreationDate($allwikilist $creationsortedallwikilist false) -#end - -############################################################################# - -#widgetbegin($msg.get("wikimanager.widget.lastcreatedwikis.title"), "") -#if(!$creationsortedallwikilist.isEmpty()) - <table id="lastcreatedwikistable"> - #foreach($wikidoc in $creationsortedallwikilist) - #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 +<content>#includeForm("Panels.PanelSheet")</content> +</xwikidoc> Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode 2007-10-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode 2007-10-08 20:13:36 UTC (rev 5322) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191506975000</creationDate> -<date>1191600769000</date> -<contentUpdateDate>1191600769000</contentUpdateDate> -<version>1.42</version> +<date>1191860958000</date> +<contentUpdateDate>1191860958000</contentUpdateDate> +<version>1.74</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -61,10 +61,6 @@ #set($nb = 30) #end -#if(!$formatDate) - #set($formatDate = $msg.get("wikimanager.defaultdatetimeformat")) -#end - #if(!$wikinamelist) #if(!$wikiname) #set($wikinamelist = [$context.Database]) @@ -84,18 +80,7 @@ ############################################################################# -<ul> - #foreach ($item in $documentlist) - <li> - [$item.name in $item.web>$item.prefixedFullName] - $xwiki.formatDate($item.date, $formatDate) - #set($author = $xwiki.getUserName($item.author)) - #if ($author == "XWikiGuest") - Guest - #else - $author - #end - </li> - #end -</ul> -</content></xwikidoc> \ No newline at end of file +#foreach ($item in $documentlist) + #displaymodification($item.name $item.prefixedFullName $item.date $formatDate $item.author true) +#end</content> +</xwikidoc> Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget 2007-10-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget 2007-10-08 20:13:36 UTC (rev 5322) @@ -6,15 +6,15 @@ <language></language> <defaultLanguage>en</defaultLanguage> <translation>0</translation> -<parent></parent> +<parent>Panels.WebHome</parent> <creator>XWiki.Admin</creator> <author>XWiki.Admin</author> <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> -<creationDate>1191508343000</creationDate> -<date>1191602308000</date> -<contentUpdateDate>1191602308000</contentUpdateDate> -<version>1.11</version> +<creationDate>1191850901000</creationDate> +<date>1191864838000</date> +<contentUpdateDate>1191864838000</contentUpdateDate> +<version>1.14</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -22,6 +22,120 @@ <comment></comment> <object> <class> +<name>Panels.PanelClass</name> +<customClass></customClass> +<customMapping></customMapping> +<defaultViewSheet></defaultViewSheet> +<defaultEditSheet></defaultEditSheet> +<defaultWeb></defaultWeb> +<nameField></nameField> +<validationScript></validationScript> +<category> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>category</name> +<number>5</number> +<prettyName>Category</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>Information|Navigation|Tools|Administration|Other</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</category> +<content> +<editor>Text</editor> +<name>content</name> +<number>4</number> +<prettyName>Content</prettyName> +<rows>25</rows> +<size>60</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</content> +<description> +<editor>Text</editor> +<name>description</name> +<number>3</number> +<prettyName>Description</prettyName> +<rows>5</rows> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</description> +<name> +<name>name</name> +<number>1</number> +<prettyName>Name</prettyName> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> +</name> +<type> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>type</name> +<number>2</number> +<prettyName>Panel type</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>view|edit</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</type> +</class> +<name>WikiCode.LastWikiModificationsWidget</name> +<number>0</number> +<className>Panels.PanelClass</className> +<property> +<category>Information</category> +</property> +<property> +<content>#panelhiddenheader($msg.get("wikimanager.widget.lastmodifications.title")) + + #includeMacros("WikiCode.Macros") + + #set($WikiManager = $xwiki.wikimanager) + #set($Exception = $WikiManager.DefaultException) + +############################################################################# + + #if(!$allwikilist) + #set($allwikilist = $WikiManager.getWikiDocumentList()) + #end + + #if(!$allwikinamelist) + #set($allwikinamelist = [$context.mainWiki]) + #foreach($wikidoc in $wikilist) + #set($added = $allwikinamelist.add($wikidoc.wikiName)) + #end + #end + + #set($wikinamelist = $allwikinamelist) + +############################################################################# + + #includeInContext("WikiCode.LastWikiModificationsCode") + +#panelfooter()</content> +</property> +<property> +<description>Panel Description</description> +</property> +<property> +<name>LastWikiModificationsWidget</name> +</property> +<property> +<type>view</type> +</property> +</object> +<object> +<class> <name>XWiki.TagClass</name> <customClass></customClass> <customMapping></customMapping> @@ -53,29 +167,5 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.Macros") - -#set($WikiManager = $xwiki.wikimanager) -#set($Exception = $WikiManager.DefaultException) - -############################################################################# - -#if(!$allwikilist) - #set($allwikilist = $WikiManager.getWikiDocumentList()) -#end - -#if(!$allwikinamelist) - #set($allwikinamelist = [$context.mainWiki]) - #foreach($wikidoc in $wikilist) - #set($added = $allwikinamelist.add($wikidoc.wikiName)) - #end -#end - -#set($wikinamelist = $allwikinamelist) - -############################################################################# - -#widgetbegin($msg.get("wikimanager.widget.lastmodifications.title"), "") - #includeInContext("WikiCode.LastWikiModificationsCode") -#widgetend()</content> +<content>#includeForm("Panels.PanelSheet")</content> </xwikidoc> 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-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros 2007-10-08 20:13:36 UTC (rev 5322) @@ -12,9 +12,9 @@ <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> <creationDate>1191493346000</creationDate> -<date>1191663165000</date> -<contentUpdateDate>1191663165000</contentUpdateDate> -<version>1.63</version> +<date>1191860997000</date> +<contentUpdateDate>1191860997000</contentUpdateDate> +<version>1.86</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -53,19 +53,7 @@ <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 - -#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist $asc) +<content>#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist $asc) #set($sorteddocumentlist = []) #if($documentlist.size() >0) @@ -86,6 +74,19 @@ #end #end +#macro(displaymodification $pagename $pagelink $date $formatDate $user $star) + #if(!$formatDate) + #set($formatDate = $msg.get("wikimanager.defaultdatetimeformat")) + #end + + #set($username = $xwiki.getUserName($user)) + #if ($username == "XWikiGuest") + #set($username = "Guest") + #end + + #if($star)*#end [$pagename>$pagelink] $xwiki.formatDate($date, $formatDate) $username +#end + #macro(addlastwikimodifications $documentlist $wikiname $usermodifications $usermodificationswiki $nb) #set($currentwiki = $context.database) #if($wikiname) @@ -105,7 +106,7 @@ #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)) Modified: xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget =================================================================== --- xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget 2007-10-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget 2007-10-08 20:13:36 UTC (rev 5322) @@ -6,15 +6,15 @@ <language></language> <defaultLanguage>en</defaultLanguage> <translation>0</translation> -<parent></parent> +<parent>Panels.WebHome</parent> <creator>XWiki.Admin</creator> <author>XWiki.Admin</author> <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> -<creationDate>1191515000000</creationDate> -<date>1191602692000</date> -<contentUpdateDate>1191602692000</contentUpdateDate> -<version>1.10</version> +<creationDate>1191854905000</creationDate> +<date>1191857383000</date> +<contentUpdateDate>1191857383000</contentUpdateDate> +<version>1.6</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -22,6 +22,122 @@ <comment></comment> <object> <class> +<name>Panels.PanelClass</name> +<customClass></customClass> +<customMapping></customMapping> +<defaultViewSheet></defaultViewSheet> +<defaultEditSheet></defaultEditSheet> +<defaultWeb></defaultWeb> +<nameField></nameField> +<validationScript></validationScript> +<category> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>category</name> +<number>5</number> +<prettyName>Category</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>Information|Navigation|Tools|Administration|Other</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</category> +<content> +<editor>Text</editor> +<name>content</name> +<number>4</number> +<prettyName>Content</prettyName> +<rows>25</rows> +<size>60</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</content> +<description> +<editor>Text</editor> +<name>description</name> +<number>3</number> +<prettyName>Description</prettyName> +<rows>5</rows> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</description> +<name> +<name>name</name> +<number>1</number> +<prettyName>Name</prettyName> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> +</name> +<type> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>type</name> +<number>2</number> +<prettyName>Panel type</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>view|edit</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</type> +</class> +<name>WikiCode.MyLastWikiModificationsWidget</name> +<number>0</number> +<className>Panels.PanelClass</className> +<property> +<category>Information</category> +</property> +<property> +<content>#panelheader($msg.get("wikimanager.widget.mylastmodifications.title")) + + #includeMacros("WikiCode.Macros") + + #set($WikiManager = $xwiki.wikimanager) + #set($Exception = $WikiManager.DefaultException) + +############################################################################# + + #if(!$wikilist) + #set($wikilist = $WikiManager.getWikiDocumentList()) + #end + + #if(!$allwikinamelist) + #set($allwikinamelist = [$context.mainWiki]) + #foreach($wikidoc in $wikilist) + #set($added = $allwikinamelist.add($wikidoc.wikiName)) + #end + #end + + #set($wikinamelist = $allwikinamelist) + +############################################################################# + + #set($usermodifications = "${context.user}") + #set($usermodificationswiki = "${context.database}") + #includeInContext("WikiCode.LastWikiModificationsCode") + +#panelfooter()</content> +</property> +<property> +<description>Panel Description</description> +</property> +<property> +<name>MyLastWikiModificationsWidget</name> +</property> +<property> +<type>view</type> +</property> +</object> +<object> +<class> <name>XWiki.TagClass</name> <customClass></customClass> <customMapping></customMapping> @@ -53,31 +169,5 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.Macros") - -#set($WikiManager = $xwiki.wikimanager) -#set($Exception = $WikiManager.DefaultException) - -############################################################################# - -#if(!$wikilist) - #set($wikilist = $WikiManager.getWikiDocumentList()) -#end - -#if(!$allwikinamelist) - #set($allwikinamelist = [$context.mainWiki]) - #foreach($wikidoc in $wikilist) - #set($added = $allwikinamelist.add($wikidoc.wikiName)) - #end -#end - -#set($wikinamelist = $allwikinamelist) - -############################################################################# - -#widgetbegin($msg.get("wikimanager.widget.mylastmodifications.title"), "") - #set($usermodifications = "${context.user}") - #set($usermodificationswiki = "${context.database}") - #includeInContext("WikiCode.LastWikiModificationsCode") -#widgetend()</content> +<content>#includeForm("Panels.PanelSheet")</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-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget 2007-10-08 20:13:36 UTC (rev 5322) @@ -6,15 +6,15 @@ <language></language> <defaultLanguage>en</defaultLanguage> <translation>0</translation> -<parent></parent> +<parent>Panels.WebHome</parent> <creator>XWiki.Admin</creator> <author>XWiki.Admin</author> <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> -<creationDate>1190979406000</creationDate> -<date>1191602533000</date> -<contentUpdateDate>1191602533000</contentUpdateDate> -<version>1.53</version> +<creationDate>1191854790000</creationDate> +<date>1191860706000</date> +<contentUpdateDate>1191860706000</contentUpdateDate> +<version>1.24</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -22,7 +22,7 @@ <comment></comment> <object> <class> -<name>XWiki.TagClass</name> +<name>Panels.PanelClass</name> <customClass></customClass> <customMapping></customMapping> <defaultViewSheet></defaultViewSheet> @@ -30,59 +30,143 @@ <defaultWeb></defaultWeb> <nameField></nameField> <validationScript></validationScript> -<tags> +<category> <cache>0</cache> -<displayType>input</displayType> -<multiSelect>1</multiSelect> -<name>tags</name> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>category</name> +<number>5</number> +<prettyName>Category</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>Information|Navigation|Tools|Administration|Other</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</category> +<content> +<editor>Text</editor> +<name>content</name> +<number>4</number> +<prettyName>Content</prettyName> +<rows>25</rows> +<size>60</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</content> +<description> +<editor>Text</editor> +<name>description</name> +<number>3</number> +<prettyName>Description</prettyName> +<rows>5</rows> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</description> +<name> +<name>name</name> <number>1</number> -<prettyName>Tags</prettyName> -<relationalStorage>1</relationalStorage> +<prettyName>Name</prettyName> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> +</name> +<type> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>type</name> +<number>2</number> +<prettyName>Panel type</prettyName> +<relationalStorage>0</relationalStorage> <separator> </separator> <separators> ,|</separators> -<size>30</size> +<size>1</size> <unmodifiable>0</unmodifiable> -<values></values> +<values>view|edit</values> <classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> -</tags> +</type> </class> <name>WikiCode.UserWikisIsAdminWidget</name> <number>0</number> -<className>XWiki.TagClass</className> +<className>Panels.PanelClass</className> <property> -<tags/> +<category>Information</category> </property> -</object> -<content>#includeMacros("WikiCode.Macros") +<property> +<content>#panelheader($msg.get("wikimanager.widget.userwikisadmin.title")) -#set($WikiManager = $xwiki.wikimanager) -#set($Exception = $WikiManager.DefaultException) + #includeMacros("WikiCode.Macros") + #set($WikiManager = $xwiki.wikimanager) + #set($Exception = $WikiManager.DefaultException) + ############################################################################# + #if(!$allwikilist) + #set($allwikilist = $WikiManager.getWikiDocumentList()) + #end -#if(!$allwikilist) - #set($allwikilist = $WikiManager.getWikiDocumentList()) -#end - ############################################################################# -#widgetbegin($msg.get("wikimanager.widget.userwikisadmin.title") "") -#if(!$allwikilist.isEmpty()) - <table id="userwikisadmintable"> + #if(!$allwikilist.isEmpty()) #set($currentwiki = $context.database) #foreach($wikidoc in $allwikilist) $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> + $context.setDatabase($currentwiki) + #displaymodification("http://$wikidoc.server" "http://$wikidoc.server" $wikidoc.creationDate $formatDate $wikidoc.creator true) #end #end $context.setDatabase($currentwiki) - </table> -#end -#widgetend()</content> + #end + +#panelfooter()</content> +</property> +<property> +<description>Panel Description</description> +</property> +<property> +<name>UserWikisIsAdminWidget</name> +</property> +<property> +<type>view</type> +</property> +</object> +<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>#includeForm("Panels.PanelSheet")</content> </xwikidoc> 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-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget 2007-10-08 20:13:36 UTC (rev 5322) @@ -6,15 +6,15 @@ <language></language> <defaultLanguage>en</defaultLanguage> <translation>0</translation> -<parent></parent> +<parent>Panels.WebHome</parent> <creator>XWiki.Admin</creator> <author>XWiki.Admin</author> <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> -<creationDate>1190983998000</creationDate> -<date>1191602583000</date> -<contentUpdateDate>1191602583000</contentUpdateDate> -<version>1.11</version> +<creationDate>1191854809000</creationDate> +<date>1191860750000</date> +<contentUpdateDate>1191860750000</contentUpdateDate> +<version>1.9</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -22,6 +22,116 @@ <comment></comment> <object> <class> +<name>Panels.PanelClass</name> +<customClass></customClass> +<customMapping></customMapping> +<defaultViewSheet></defaultViewSheet> +<defaultEditSheet></defaultEditSheet> +<defaultWeb></defaultWeb> +<nameField></nameField> +<validationScript></validationScript> +<category> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>category</name> +<number>5</number> +<prettyName>Category</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>Information|Navigation|Tools|Administration|Other</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</category> +<content> +<editor>Text</editor> +<name>content</name> +<number>4</number> +<prettyName>Content</prettyName> +<rows>25</rows> +<size>60</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</content> +<description> +<editor>Text</editor> +<name>description</name> +<number>3</number> +<prettyName>Description</prettyName> +<rows>5</rows> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</description> +<name> +<name>name</name> +<number>1</number> +<prettyName>Name</prettyName> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> +</name> +<type> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>type</name> +<number>2</number> +<prettyName>Panel type</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>view|edit</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</type> +</class> +<name>WikiCode.UserWikisIsOwnerWidget</name> +<number>0</number> +<className>Panels.PanelClass</className> +<property> +<category>Information</category> +</property> +<property> +<content>#panelheader($msg.get("wikimanager.widget.userwikisowner.title")) + + #includeMacros("WikiCode.Macros") + + #set($WikiManager = $xwiki.wikimanager) + #set($Exception = $WikiManager.DefaultException) + +############################################################################# + + #if(!$allwikilist) + #set($allwikilist = $WikiManager.getWikiDocumentList()) + #end + +############################################################################# + + #if(!$allwikilist.isEmpty()) + #foreach($wikidoc in $allwikilist) + #if($wikidoc.owner == $context.user) + #displaymodification("http://$wikidoc.server" "http://$wikidoc.server" $wikidoc.creationDate $formatDate $wikidoc.creator true) + #end + #end + #end +#panelfooter()</content> +</property> +<property> +<description>Panel Description</description> +</property> +<property> +<name>UserWikisIsOwnerWidget</name> +</property> +<property> +<type>view</type> +</property> +</object> +<object> +<class> <name>XWiki.TagClass</name> <customClass></customClass> <customMapping></customMapping> @@ -53,32 +163,5 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.Macros") - -#set($WikiManager = $xwiki.wikimanager) -#set($Exception = $WikiManager.DefaultException) - -############################################################################# - -#if(!$allwikilist) - #set($allwikilist = $WikiManager.getWikiDocumentList()) -#end - -############################################################################# - -#widgetbegin($msg.get("wikimanager.widget.userwikisowner.title"), "") -#if(!$allwikilist.isEmpty()) - <table id="userwikisadmintable"> - #foreach($wikidoc in $allwikilist) - #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> +<content>#includeForm("Panels.PanelSheet")</content> </xwikidoc> 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-08 20:11:26 UTC (rev 5321) +++ xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget 2007-10-08 20:13:36 UTC (rev 5322) @@ -6,15 +6,15 @@ <language></language> <defaultLanguage>en</defaultLanguage> <translation>0</translation> -<parent></parent> +<parent>Panels.WebHome</parent> <creator>XWiki.Admin</creator> <author>XWiki.Admin</author> <customClass></customClass> <contentAuthor>XWiki.Admin</contentAuthor> -<creationDate>1190983126000</creationDate> -<date>1191602625000</date> -<contentUpdateDate>1191602625000</contentUpdateDate> -<version>1.20</version> +<creationDate>1191854770000</creationDate> +<date>1191860772000</date> +<contentUpdateDate>1191860772000</contentUpdateDate> +<version>1.10</version> <title></title> <template></template> <defaultTemplate></defaultTemplate> @@ -22,6 +22,121 @@ <comment></comment> <object> <class> +<name>Panels.PanelClass</name> +<customClass></customClass> +<customMapping></customMapping> +<defaultViewSheet></defaultViewSheet> +<defaultEditSheet></defaultEditSheet> +<defaultWeb></defaultWeb> +<nameField></nameField> +<validationScript></validationScript> +<category> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>category</name> +<number>5</number> +<prettyName>Category</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>Information|Navigation|Tools|Administration|Other</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</category> +<content> +<editor>Text</editor> +<name>content</name> +<number>4</number> +<prettyName>Content</prettyName> +<rows>25</rows> +<size>60</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</content> +<description> +<editor>Text</editor> +<name>description</name> +<number>3</number> +<prettyName>Description</prettyName> +<rows>5</rows> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> +</description> +<name> +<name>name</name> +<number>1</number> +<prettyName>Name</prettyName> +<size>40</size> +<unmodifiable>0</unmodifiable> +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> +</name> +<type> +<cache>0</cache> +<displayType>select</displayType> +<multiSelect>0</multiSelect> +<name>type</name> +<number>2</number> +<prettyName>Panel type</prettyName> +<relationalStorage>0</relationalStorage> +<separator> </separator> +<separators> ,|</separators> +<size>1</size> +<unmodifiable>0</unmodifiable> +<values>view|edit</values> +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> +</type> +</class> +<name>WikiCode.UserWikisIsUserWidget</name> +<number>0</number> +<className>Panels.PanelClass</className> +<property> +<category>Information</category> +</property> +<property> +<content>#panelheader($msg.get("wikimanager.widget.userwikisuser.title")) + + #includeMacros("WikiCode.Macros") + + #set($WikiManager = $xwiki.wikimanager) + #set($Exception = $WikiManager.DefaultException) + +############################################################################# + + #if(!$allwikilist) + #set($allwikilist = $WikiManager.getWikiDocumentList()) + #end + +############################################################################# + + #if(!$allwikilist.isEmpty()) + #set($currentwiki = $context.database) + #foreach($wikidoc in $allwikilist) + $context.setDatabase($wikidoc.wikiName) + #if($xwiki.hasAccessLevel("view", "${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences")) + $context.setDatabase($currentwiki) + #displaymodification("http://$wikidoc.server" "http://$wikidoc.server" $wikidoc.creationDate $formatDate $wikidoc.creator true) + #end + #end + $context.setDatabase($currentwiki) + #end + +#panelfooter()</content> +</property> +<property> +<description>Panel Description</description> +</property> +<property> +<name>UserWikisIsUserWidget</name> +</property> +<property> +<type>view</type> +</property> +</object> +<object> +<class> <name>XWiki.TagClass</name> <customClass></customClass> <customMapping></customMapping> @@ -53,35 +168,5 @@ <tags/> </property> </object> -<content>#includeMacros("WikiCode.Macros") - -#set($WikiManager = $xwiki.wikimanager) -#set($Exception = $WikiManager.DefaultException) - -############################################################################# - -#if(!$allwikilist) - #set($allwikilist = $WikiManager.getWikiDocumentList()) -#end - -############################################################################# - -#widgetbegin($msg.get("wikimanager.widget.userwikisuser.title"), "") -#if(!$allwikilist.isEmpty()) - <table id="userwikisadmintable"> - #set($currentwiki = $context.database) - #foreach($wikidoc in $allwikilist) - $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 +<content>#includeForm("Panels.PanelSheet")</content> +</xwikidoc> _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications