haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-17 07:41:26 +00:00
Code Issues Releases Wiki Activity

Merge branch '4.1'

Browse Source
This commit is contained in:
zhengxie
2015-05-08 10:38:44 +08:00
parent 4ad5c0726a 4785a376e4
commit 60b2a4b2bf
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/css/file_view_extra.css
View File

@@ -1,5 +1,6 @@
#main { #main {
width:100%; width:100%;
min-height:0;
} }
#view-hd, #view-hd,
#view-path-op, #view-path-op,

8
seahub/templates/shared_file_view.html
View File

@@ -71,16 +71,18 @@ $(function() {
{% endif %} {% endif %}
}); });
{% if filetype == 'PDF' and use_pdfjs %}
{% elif filetype == 'PDF' and not use_pdfjs and not html_exists %}
{% elif filetype == 'Document' and not html_exists %}
{% else %}
function setFileViewAreaHeight() { function setFileViewAreaHeight() {
var file_view = $('#file-view'); var file_view = $('#file-view');
if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) { if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) {
file_view.outerHeight($(window).height() - file_view.offset().top); file_view.outerHeight($(window).height() - file_view.offset().top);
} }
if ($(document).height() > $(window).height()) {
file_view.outerHeight($(document).height() - file_view.offset().top);
}
} }
$(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight); $(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight);
{% endif %}
{% if request.user.is_authenticated and request.user.username != shared_by %} {% if request.user.is_authenticated and request.user.username != shared_by %}
$('#save').click(function() { $('#save').click(function() {

9
seahub/templates/view_file_base.html
View File

@@ -174,16 +174,19 @@ function setToolbarPos() {
})(); })();
$(window).load(setToolbarPos).resize(setToolbarPos); $(window).load(setToolbarPos).resize(setToolbarPos);
{% if filetype == 'PDF' and use_pdfjs %}
{% elif filetype == 'PDF' and not use_pdfjs and not html_exists %}
{% elif filetype == 'Document' and not html_exists %}
{% else %}
function setFileViewAreaHeight() { function setFileViewAreaHeight() {
var file_view = $('#file-view'); var file_view = $('#file-view');
if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) { if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) {
file_view.outerHeight($(window).height() - file_view.offset().top); file_view.outerHeight($(window).height() - file_view.offset().top);
} }
if ($(document).height() > $(window).height()) {
file_view.outerHeight($(document).height() - file_view.offset().top);
}
} }
$(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight); $(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight);
{% endif %}
$('#history').click(function () { $('#history').click(function () {
window.open($(this).data('url')); window.open($(this).data('url'));

8
seahub/templates/view_history_file.html
View File

@@ -48,16 +48,18 @@ $(function() {
$('#file-view-tip').append('<a href="' + dld_url + '" class="big-obv-btn">' + "{% trans "Download" %}" + '</a>'); $('#file-view-tip').append('<a href="' + dld_url + '" class="big-obv-btn">' + "{% trans "Download" %}" + '</a>');
}); });
{% if filetype == 'PDF' and use_pdfjs %}
{% elif filetype == 'PDF' and not use_pdfjs and not html_exists %}
{% elif filetype == 'Document' and not html_exists %}
{% else %}
function setFileViewAreaHeight() { function setFileViewAreaHeight() {
var file_view = $('#file-view'); var file_view = $('#file-view');
if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) { if ($(window).height() > file_view.outerHeight(true) + file_view.offset().top) {
file_view.outerHeight($(window).height() - file_view.offset().top); file_view.outerHeight($(window).height() - file_view.offset().top);
} }
if ($(document).height() > $(window).height()) {
file_view.outerHeight($(document).height() - file_view.offset().top);
}
} }
$(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight); $(window).load(setFileViewAreaHeight).resize(setFileViewAreaHeight);
{% endif %}
{% include "snippets/file_content_js.html" %} {% include "snippets/file_content_js.html" %}