#17727625 : features to view old revision and to apply old revision

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6011 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/wiki/skins/xe_wiki/css/wiki.css

@@ -345,4 +345,4 @@ color:#666666; font-size:11px; font-weight:normal; margin-top:5px; padding-top:5
 .pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/common/arrowNextA1.gif) no-repeat right center; }
 .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/common/arrowNextEndA1.gif) no-repeat right center; }
 
-.contributors
+.oldhistory { float:left; margin-left: 5px; }

modules/wiki/skins/xe_wiki/header.html

@@ -21,6 +21,9 @@
             <div class="pageHistory">
                 <!--@if($oDocument)-->
                 <div class="userInfo">
+                    <!--@if($history)-->
+                        <div class="author">last edited by {$history->nick_name}</div>
+                    <!--@else-->
                     <!--@if(!$oDocument->getMemberSrl())-->
                         <div class="author">
                     last edited by 
@@ -35,13 +38,22 @@
                     last edited by 
                         <span class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</span></div>
                     <!--@end-->
+                    <!--@endif-->
                 <div class="date" title="{$lang->regdate}">
+                    <!--@if($history)-->
+                    <strong>{zdate($history->regdate, 'Y.m.d')}</strong> {zdate($history->regdate, 'H:i:s')}
+                    <!--@else-->
                     <strong>{$oDocument->getUpdate('Y.m.d')}</strong> {$oDocument->getUpdate('H:i:s')} 
+                    <!--@end-->
                 </div>
+                    <!--@if($history)-->
+                    <div class="oldhistory">[{$lang->notice_old_revision}]
+                    </div>
+                    <!--@endif-->
                 </div>
                 <!--@if($use_history != 'N')-->
                 <div class="history">
-                    <a href="{getUrl('act','dispWikiHistory','document_srl',$oDocument->document_srl)}">View History</a>
+                    <a href="{getUrl('act','dispWikiHistory','document_srl',$oDocument->document_srl,'history_srl','')}">View History</a>
                 </div>
                 <!--@end-->
                 <!--@end-->

modules/wiki/skins/xe_wiki/histories.html

@@ -2,16 +2,18 @@
 <div class="readBody">
 <table>
 <tr>
+<!--@if($page == 1)-->
 <td>
     {$oDocument->getUpdate()}
 </td>
 <td>
-    by {$oDocument->getNickName()}
+    by {$oDocument->getNickName()} (current)
 </td>
 <td>
-    (current revision)
+    <a href="{getUrl('act','',page,'')}">[View]</a>
 </td>
 </tr>
+<!--@endif-->
 <!--@foreach($histories as $val)-->
 <tr>
 <td>
@@ -21,9 +23,24 @@
     by {$val->nick_name}
 </td>
 <td>
+    <!--@if($val->content)-->
+    <a href="{getUrl('act','',page,'',history_srl,$val->history_srl)}">[View]</a>
+    <!--@end-->
 </td>
 </tr>
 <!--@end-->
 </table>
 </div>
+        <div class="pagination a1">
+            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
+            <!--@while($page_no = $page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong> 
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+
 <!--#include("footer.html")-->

modules/wiki/skins/xe_wiki/view_document.html

@@ -18,7 +18,11 @@
                         </form>
                     </div>
                 <!--@else-->
-                    {$oDocument->getContent(false)}
+                    <!--@if($history)-->
+                        {$history->content}
+                    <!--@else-->
+                        {$oDocument->getContent(false)}
+                    <!--@endif-->
                 <!--@end-->
             </div>
         </div>

modules/wiki/skins/xe_wiki/write_form.html

@@ -2,7 +2,11 @@
 
 <form action="./" method="post" onsubmit="return procFilter(this, insert)" id="fo_write">
 <input type="hidden" name="mid" value="{$mid}" />
+<!--@if($history)-->
+<input type="hidden" name="content" value="{htmlspecialchars($history->content)}" />
+<!--@else-->
 <input type="hidden" name="content" value="{$oDocument->getContentText()}" />
+<!--@end-->
 <input type="hidden" name="document_srl" value="{$document_srl}" />
 <input type="hidden" name="title" value="{$entry}" />