DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #145 from pranavk/rev_history

Browse Source 
Rev history cleanups
This commit is contained in:
Andras Timar 2016-11-28 09:51:01 +01:00 committed by GitHub
commit 434414657f
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
css/style.css
View File

@ -182,16 +182,22 @@
#revViewerContainer{ #revViewerContainer{
position: absolute; position: absolute;
width: 85%; width: 100%;
z-index: 600; z-index: 600;
background-color: #ddd !important; background-color: #ddd !important;
top: 45px; top: 45px;
bottom: 0; bottom: 0;
} }
#revViewer{
position: relative;
margin-right: 250px;
height: 100%;
}
#revPanelContainer{ #revPanelContainer{
position: absolute; position: fixed;
width: 15%; width: 250px;
z-index: 600; z-index: 600;
background-color: #efefef !important; background-color: #efefef !important;
right: 0; right: 0;
@ -247,6 +253,11 @@
#revisionsContainer a{ #revisionsContainer a{
padding-left: 15px; padding-left: 15px;
opacity: 0.5;
}
#revisionsContainer a:hover{
opacity: 1;
} }
#revisionsContainer li:hover, #revisionsContainer li.active{ #revisionsContainer li:hover, #revisionsContainer li.active{

6
js/documents.js
View File

@ -218,9 +218,9 @@ var documentsMain = {
'</div>', '</div>',
revHistoryItemTemplate: '<li>' + revHistoryItemTemplate: '<li>' +
'<a href="{{downloadUrl}}" class="downloadVersion has-tooltip" title="Download"><img src="{{downloadIconUrl}}" />' + '<a href="{{downloadUrl}}" class="downloadVersion has-tooltip" title="' + t('richdocuments', 'Download this revision') + '"><img src="{{downloadIconUrl}}" />' +
'<a class="versionPreview"><span class="versiondate has-tooltip" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span></a>' + '<a class="versionPreview"><span class="versiondate has-tooltip" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span></a>' +
'<a href="{{restoreUrl}}" class="restoreVersion"><img src="{{restoreIconUrl}}" />' + '<a href="{{restoreUrl}}" class="restoreVersion has-tooltip" title="' + t('richdocuments', 'Restore this revision') + '"><img src="{{restoreIconUrl}}" />' +
'</a>' + '</a>' +
'</li>', '</li>',
@ -343,7 +343,7 @@ var documentsMain = {
moreVersionsLabel: t('richdocuments', 'More versions...'), moreVersionsLabel: t('richdocuments', 'More versions...'),
closeButtonUrl: OC.imagePath('core', 'actions/close') closeButtonUrl: OC.imagePath('core', 'actions/close')
}); });
$(document.body).prepend(revHistoryContainer); $('#revViewerContainer').prepend(revHistoryContainer);
documentsMain.UI.revisionsStart = 0; documentsMain.UI.revisionsStart = 0;