Index: standard/src/main/webapp/WEB-INF/struts-config.xml =================================================================== --- standard/src/main/webapp/WEB-INF/struts-config.xml (revision 4108) +++ standard/src/main/webapp/WEB-INF/struts-config.xml (working copy) @@ -54,6 +54,8 @@ type="com.xpn.xwiki.web.ObjectRemoveForm"/> + @@ -147,6 +149,12 @@ + + + #if($inline && ($inline == true))

$msg.get("history")

#end -
+ + #set($formname="history")
@@ -20,38 +21,52 @@ #if(!$revisionscount) #set($revisionscount = 0) #end +#set($skipnext = false) +#set($versionshown = 0) #if ($tdoc.realLanguage!="") #set($lang = "&language=${tdoc.realLanguage}") #else #set($lang = "") #end #foreach ($version in $tdoc.getRecentRevisions($revisionscount)) -#set($origdoc = "") -#set($newdoc = "") #set($nextversion = $version) -#set($newdoc = $xwiki.getDocument($tdoc, $nextversion)) - +#set($revinfo = $tdoc.getRevisionInfo($nextversion)) +#if($xwiki.hasMinorEdit() && (!$request.getParameter("showminor"))) + #set($skipcur = $skipnext) + #set($skipnext = $revinfo.isMinorEdit()) +#end +#if(!$skipcur) + #set($versionshown = $versionshown + 1) + -#if($newdoc=="") - - -#else - - -#end + + #if($xwiki.hasEditComment()) - + #end #if($hasedit || $hasadmin) #end #end +#end
$nextversion$xwiki.getLocalUserName($newdoc.author)$xwiki.formatDate($newdoc.date, "dd/MM/yyyy hh:mm")$xwiki.getLocalUserName($revinfo.author)$xwiki.formatDate($revinfo.date, "dd/MM/yyyy hh:mm")$!{newdoc.comment}$!{revinfo.comment}
-
+
+
+ #if($hasadmin) +
+ #end + #if($xwiki.hasMinorEdit()) + #if(!$request.getParameter("showminor")) + + #else + + #end + #end
+