On 11/02/2010 10:37 PM, Vincent Massol wrote:
Hi,
To be discussed but I'd rather we call the macro "activity" for several reasons: - it's shorter and easier to use (same reasoning as "avatar" vs "uservatar" macro) - it's more generic - we could want to add a parameter in the future that gives the time span (and it doesn't have specifically to be recent)
+1.
On Nov 2, 2010, at 6:13 PM, evalica (SVN) wrote:
Author: evalica Date: 2010-11-02 18:13:48 +0100 (Tue, 02 Nov 2010) New Revision: 32334
Modified: enterprise/trunk/wiki/src/main/resources/Main/Dashboard.xml enterprise/trunk/wiki/src/main/resources/Main/RecentActivity.xml Log: XE-736: Rename Main.RecentChanges to Main.RecentActivity to reflect the new implementation - Changed macro name from recentchanges to recentactivity
Modified: enterprise/trunk/wiki/src/main/resources/Main/Dashboard.xml =================================================================== --- enterprise/trunk/wiki/src/main/resources/Main/Dashboard.xml 2010-11-02 17:02:56 UTC (rev 32333) +++ enterprise/trunk/wiki/src/main/resources/Main/Dashboard.xml 2010-11-02 17:13:48 UTC (rev 32334) @@ -217,12 +217,12 @@ = $msg.get("xe.dashboard.wiki.recentactivity") = #else = $msg.get("xe.dashboard.space.recentactivity", [$doc.space]) = - ## Set variables to limit recent changes to the current space and 15 items. + ## Set variables to limit recent activity to the current space and 15 items. #set ($rcSpace = $doc.space) #set ($rcChangesNb = 15) #end
- {{recentchanges space="$!rcSpace" changesNb="$!rcChangesNb" /}} + {{recentactivity space="$!rcSpace" changesNb="$!rcChangesNb" /}}
))) )))
Modified: enterprise/trunk/wiki/src/main/resources/Main/RecentActivity.xml =================================================================== --- enterprise/trunk/wiki/src/main/resources/Main/RecentActivity.xml 2010-11-02 17:02:56 UTC (rev 32333) +++ enterprise/trunk/wiki/src/main/resources/Main/RecentActivity.xml 2010-11-02 17:13:48 UTC (rev 32334) @@ -1184,13 +1184,13 @@ <defaultCategory>Content</defaultCategory> </property> <property> -<description>Displays the recent changes in this wiki or in the passed space, if any.</description> +<description>Displays the recent activity in this wiki or in the passed space, if any.</description> </property> <property> -<id>recentchanges</id> +<id>recentactivity</id> </property> <property> -<name>Recent Changes</name> +<name>Recent Activity</name> </property> <property> <supportsInlineMode>0</supportsInlineMode> @@ -1322,7 +1322,7 @@ <defaultValue>true</defaultValue> </property> <property> -<description>Whether to show differences for the items in the changes list or not.</description> +<description>Whether to show differences for the items in the activity list or not.</description> </property> <property> <mandatory>0</mandatory> @@ -1388,7 +1388,7 @@ <defaultValue>true</defaultValue> </property> <property> -<description>Whether to show changes rss links or not.</description> +<description>Whether to show activity rss links or not.</description> </property> <property> <mandatory>0</mandatory> @@ -1454,7 +1454,7 @@ <defaultValue>30</defaultValue> </property> <property> -<description>Number of changes to show.</description> +<description>Number of activity to show.</description> </property> <property> <mandatory>0</mandatory> @@ -1520,7 +1520,7 @@ <defaultValue></defaultValue> </property> <property> -<description>Comma separated list of tags to display changes for.</description> +<description>Comma separated list of tags to display activity for.</description> </property> <property> <mandatory>0</mandatory> @@ -1586,7 +1586,7 @@ <defaultValue></defaultValue> </property> <property> -<description>Comma separated list of spaces to display the recent changes for.</description> +<description>Comma separated list of spaces to display the recent activity for.</description> </property> <property> <mandatory>0</mandatory> @@ -1663,7 +1663,7 @@ </object> <content>{{velocity}} ## -## Recent changes. +## Recent Activity ## ## Optional parameters : ## @@ -1671,9 +1671,9 @@ ## Note that HTTP parameters supercede velocity set variables. ## ## - rcShowRss (String set to "true" or "false"): show RSS at the bottom of the list. -## - rcSpace (List of string[s]): restrict recent changes retrieval to pages within the given space. -## - rcTag (List of string[s]): restrict recent changes retrieval to pages with the given tag. -## - rcAuthor (List of string[s]): restrict recent changes retrieval to pages with the given author. +## - rcSpace (List of string[s]): restrict recent activity retrieval to pages within the given space. +## - rcTag (List of string[s]): restrict recent activity retrieval to pages with the given tag. +## - rcAuthor (List of string[s]): restrict recent activity retrieval to pages with the given author. ## - rcChangesNb (String set to a numerical value): number of pages to display recent activity. ## - rcPagercPageEventsNo (String set to a numerical value): number of activity events displayed for each page. ## @@ -1705,7 +1705,7 @@ #end #end ## pass the variables from the velocity context -{{recentchanges #if($rcShowRss) showRss="$rcShowRss" #end +{{recentactivity #if($rcShowRss) showRss="$rcShowRss" #end #if($rcChangesNb) changesNb="$rcChangesNb" #end #if($rcPagercPageEventsNb) changesNb="$rcPagercPageEventsNb" #end #if($rcSpaceString) space="$rcSpaceString" #end
-- Sergiu Dumitriu http://purl.org/net/sergiu/