Author: vmassol
Date: 2007-11-22 17:38:45 +0100 (Thu, 22 Nov 2007)
New Revision: 6050
Removed:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Stats
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebHome
Log:
XE-37: Improve the statistics page to display most viewed pages, most edited
pages and best contributors with graphs and history
Removed old stats page and changed link from admin page so that it points to
the new stats page.
Deleted:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Stats
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Stats
2007-11-22 16:21:58 UTC (rev 6049)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Stats
2007-11-22 16:38:45 UTC (rev 6050)
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xwikidoc>
-<web>XWiki</web>
-<name>Stats</name>
-<language></language>
-<defaultLanguage>en</defaultLanguage>
-<translation>0</translation>
-<parent>XWiki.WebHome</parent>
-<creator>XWiki.Admin</creator>
-<author>XWiki.Admin</author>
-<customClass></customClass>
-<contentAuthor>XWiki.Admin</contentAuthor>
-<creationDate>1165966848000</creationDate>
-<date>1184172946000</date>
-<contentUpdateDate>1184172946000</contentUpdateDate>
-<version>1.2</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>
-<name>tags</name>
-<prettyName>Tags</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>1</relationalStorage>
-<displayType>input</displayType>
-<multiSelect>1</multiSelect>
-<size>30</size>
-<separator> </separator>
-<cache>0</cache>
-<separators> ,|</separators>
-<values></values>
-<number>1</number>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</tags>
-</class>
-<name>XWiki.Stats</name>
-<number>0</number>
-<className>XWiki.TagClass</className>
-<property>
-<tags/>
-</property>
-</object>
-<content>1 Stats API Demo
-
-<%
-period = request.get("period")
-Calendar cal = Calendar.getInstance();
-cal.setTime(new Date());
-if (period==null) {
- period = cal.get(Calendar.YEAR) * 100 + (cal.get(Calendar.MONTH)+1)
-}
-
-jour = cal.get(Calendar.YEAR) * 10000 + (cal.get(Calendar.MONTH)+1) * 100 +
(cal.get(Calendar.DAY_OF_MONTH)+1)
-
-type = request.get("type")
-if (type==null)
- type = "view"
-
-%>
-
-1.1 Wiki Stats [Top du Mois>${doc.name}] [Top du
Jour>${doc.name}?period=${jour}]
-
-1.1.1 Total
-
-<%
-sql = "select stats.name, stats.pageViews, stats.visits from DocumentStats as
stats where stats.action = '${type}' and stats.name not like '%.%' and
stats.period=${period} order by stats.pageViews desc"
-result = xwiki.search(sql, 20, 0)
-
-for (item in result) {
- name = item[0]
- nb = item[1]
- visits = item[2]
- if (name=="") {
- println "* Total Pages: ${nb}"
- println "* Total Visits: ${visits}"
- }
- else {
- println "* Space ${name}: ${nb}"
- }
-}
-%>
-
-
-1.1.1 Pages
-<%
-sql = "select stats.name, stats.pageViews from DocumentStats as stats where
stats.action = '${type}' and stats.name like '%.%' and stats.period=${period}
order by stats.pageViews desc"
-result = xwiki.search(sql, 20, 0)
-
-for (item in result) {
- name = item[0]
- nb = item[1]
- println "* [${name}]: ${nb}"
-}
-%>
-
-1.1 Last user connected
-
-<%
-
-sql = "select stats.name, max(stats.endDate) from VisitStats as stats group by
stats.name order by 2 desc";
-result = xwiki.search(sql, 100, 0)
-
-for (item in result) {
- user = item[0]
- userdate = item[1]
- try {
- userlink = xwiki.getUserName(user)
- } catch(Exception e) {
- userlink = user
- }
- println "* ${userlink}: ${userdate}"
-}
-%>
-</content></xwikidoc>
\ No newline at end of file
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebHome
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebHome
2007-11-22 16:21:58 UTC (rev 6049)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/WebHome
2007-11-22 16:38:45 UTC (rev 6050)
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xwikidoc>
-<web>XWiki</web>
-<name>WebHome</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>1107117224000</creationDate>
-<date>1184173074000</date>
-<contentUpdateDate>1184173074000</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>
-<name>tags</name>
-<prettyName>Tags</prettyName>
-<unmodifiable>0</unmodifiable>
-<relationalStorage>1</relationalStorage>
-<displayType>input</displayType>
-<multiSelect>1</multiSelect>
-<size>30</size>
-<separator> </separator>
-<cache>0</cache>
-<separators> ,|</separators>
-<values></values>
-<number>1</number>
-<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
-</tags>
-</class>
-<name>XWiki.WebHome</name>
-<number>0</number>
-<className>XWiki.TagClass</className>
-<property>
-<tags/>
-</property>
-</object>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>XWiki</web>
+<name>WebHome</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>1107117224000</creationDate>
+<date>1184173074000</date>
+<contentUpdateDate>1184173074000</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>
+<name>tags</name>
+<prettyName>Tags</prettyName>
+<unmodifiable>0</unmodifiable>
+<relationalStorage>1</relationalStorage>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<size>30</size>
+<separator> </separator>
+<cache>0</cache>
+<separators> ,|</separators>
+<values></values>
+<number>1</number>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>XWiki.WebHome</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
<content>1 Administration
1.1 User Administration
@@ -87,5 +87,5 @@
1.1 Others
* [Copy Document>XWiki.CopyDocument]
-* [Statistics>XWiki.Stats]
+* [Statistics>Stats.WebHome]
</content></xwikidoc>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications