matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add new style document page viewer. Remove web_theme_hide_menus feature, all views except the login view will show the main menu. Remove unused javascript. Remove the now unused no-parent-history CSS class. Remove the facybox-iframe class and associated JavaScript.

Browse Source
This commit is contained in:
Roberto Rosario
2015-04-05 23:47:24 -04:00
parent d51ba315ad
commit 28e86f044d
5 changed files with 118 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
mayan/apps/appearance/templates/appearance/base.html
View File

@@ -93,53 +93,44 @@
{% if web_theme_view_type == 'plain' %}
{% block content_plain %}{% endblock %}
{% else %}
{% if not web_theme_hide_menus %}
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">{% trans 'Toggle navigation' %}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'main:home' %}">{% project_name %}{% if debug %} <i class="fa fa-bug"></i>{% endif %}</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
{% get_menu_links 'main menu' as menu_links %}
{% for link in menu_links %}
{% with 'true' as as_li %}
{% with 'true' as hide_active_anchor %}
{% with 'active' as li_class_active %}
{% with 'first' as li_class_first %}
{% with ' ' as link_classes %}
{% include 'navigation/generic_subnavigation.html' %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endfor %}
</ul>
<ul class="nav navbar-nav navbar-right">
{% if not user.is_authenticated %}
{% trans 'Anonymous' %}
{% else %}
<li><a href="{% url 'common:current_user_details' %}" title="{% trans 'User details' %}">{{ user.get_full_name|default:user }} <i class="fa fa-user"></i></a></li>
{% endif %}
</ul>
</div>
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">{% trans 'Toggle navigation' %}</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'main:home' %}">{% project_name %}{% if debug %} <i class="fa fa-bug"></i>{% endif %}</a>
</div>
</nav>
{% else %}
<style type="text/css">
.container {
width: 100%;
}
</style>
{% endif %}
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
{% get_menu_links 'main menu' as menu_links %}
{% for link in menu_links %}
{% with 'true' as as_li %}
{% with 'true' as hide_active_anchor %}
{% with 'active' as li_class_active %}
{% with 'first' as li_class_first %}
{% with ' ' as link_classes %}
{% include 'navigation/generic_subnavigation.html' %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endfor %}
</ul>
<ul class="nav navbar-nav navbar-right">
{% if not user.is_authenticated %}
{% trans 'Anonymous' %}
{% else %}
<li><a href="{% url 'common:current_user_details' %}" title="{% trans 'User details' %}">{{ user.get_full_name|default:user }} <i class="fa fa-user"></i></a></li>
{% endif %}
</ul>
</div>
</div>
</nav>
<div class="container">
<div class="row">
@@ -233,37 +224,63 @@
<script type="text/javascript" src="{% static 'appearance/packages/fancyBox-master/lib/jquery.mousewheel.pack.js' %}"></script>
<script type="text/javascript">
jQuery(document).ready(function() {
$('form').submit(function(){
$('button', this).click(function() {
return false;
});
$(':submit', this).click(function() {
return false;
});
});
$('.scrollable').scrollview();
'use strict';
function resizeFullHeight() {
$('.full-height').height($(window).height() - $('.full-height').data('heightDifference'));
}
function set_image_noninteractive(image) {
// Remove border to indicate non interactive image
image.removeClass('thin_border');
container = image.parent().parent();
// Save img HTML
html = image.parent().html();
// Remove anchor
image.parent().remove();
// Place again img
container.html(html);
}
function load_document_image(image) {
$.get( image.attr('data-src'), function(result) {
if (result.status == 'success') {
image.attr('src', result.data);
image.addClass(image.attr('data-post-load-class'));
} else if (result.detail == 'unknown_file_format') {
image.attr('src', "{% static 'images/mimetypes/unknown.png' %}");
set_image_noninteractive(image);
} else {
image.attr('src', "{% static 'images/mimetypes/error.png' %}");
set_image_noninteractive(image);
}
})
.fail(function() {
image.attr('src', "{% static 'images/mimetypes/error.png' %}");
set_image_noninteractive(image);
})
}
jQuery(document).ready(function() {
resizeFullHeight();
$(window).resize(function() {
$('.full-height').height($(window).height() - $('.full-height').data('heightDifference'));
resizeFullHeight();
});
$('.no-parent-history', this).click(function() {
location.replace(this.href);
return false;
});
$('.scrollable').scrollview();
$("a.fancybox").fancybox({
'openEffect' : 'elastic',
'closeEffect' : 'elastic',
$('a.fancybox').fancybox({
openEffect : 'elastic',
closeEffect : 'elastic',
prevEffect : 'none',
nextEffect : 'none',
'titleShow' : true,
'type' : 'image',
'autoResize': true,
titleShow : true,
type : 'image',
autoResize : true,
});
$("a.fancybox-staging").click(function(e) {
$('a.fancybox-staging').click(function(e) {
var $this = $(this);
$.get($this.attr('href'), function( result ) {
@@ -272,13 +289,13 @@
{
href : result.data,
title : $this.attr('title'),
'openEffect' : 'elastic',
'closeEffect' : 'elastic',
openEffect : 'elastic',
closeEffect : 'elastic',
prevEffect : 'none',
nextEffect : 'none',
'titleShow' : true,
'type' : 'image',
'autoResize': true,
titleShow : true,
type : 'image',
autoResize : true,
},
]);
}
@@ -286,61 +303,6 @@
e.preventDefault();
})
$("a.fancybox-noscaling").fancybox({
openEffect : 'elastic',
closeEffect : 'elastic',
prevEffect : 'none',
nextEffect : 'none',
'titleShow' : true,
'type' : 'image',
'autoResize': false
});
$("a.fancybox-iframe").fancybox({
openEffect : 'elastic',
closeEffect : 'elastic',
'titleShow' : false,
'type' : 'iframe',
autoHeight : false,
width : '99%',
height : '99%',
minHeight : '100%',
minWidth : '100%',
'showNavArrows': false,
'margin' : 18,
});
function set_image_noninteractive(image) {
// Remove border to indicate non interactive image
image.removeClass('thin_border');
container = image.parent().parent();
// Save img HTML
html = image.parent().html();
// Remove anchor
image.parent().remove();
// Place again img
container.html(html);
}
function load_document_image(image) {
$.get( image.attr('data-src'), function(result) {
if (result.status == 'success') {
image.attr('src', result.data);
image.addClass(image.attr('data-post-load-class'));
} else if (result.detail == 'unknown_file_format') {
image.attr('src', "{% static 'images/mimetypes/unknown.png' %}");
set_image_noninteractive(image);
} else {
image.attr('src', "{% static 'images/mimetypes/error.png' %}");
set_image_noninteractive(image);
}
})
.fail(function() {
image.attr('src', "{% static 'images/mimetypes/error.png' %}");
set_image_noninteractive(image);
})
}
$('img.lazy-load').lazyload({
appear: function(elements_left, settings) {
load_document_image($(this));

21
mayan/apps/documents/apps.py
View File

@@ -35,9 +35,9 @@ from .links import (
link_document_multiple_update_page_count, link_document_page_edit,
link_document_page_navigation_first, link_document_page_navigation_last,
link_document_page_navigation_next,
link_document_page_navigation_previous, link_document_page_rotate_left,
link_document_page_rotate_right, link_document_page_text,
link_document_page_transformation_list,
link_document_page_navigation_previous, link_document_page_return,
link_document_page_rotate_left, link_document_page_rotate_right,
link_document_page_text, link_document_page_transformation_list,
link_document_page_transformation_create,
link_document_page_transformation_edit,
link_document_page_transformation_delete, link_document_page_view,
@@ -106,6 +106,9 @@ class DocumentsApp(apps.AppConfig):
menu_front_page.bind_links(links=[link_document_list_recent, link_document_list])
menu_setup.bind_links(links=[link_document_type_setup])
# Document
menu_object.bind_links(links=[link_document_edit, link_document_document_type_edit, link_document_print, link_document_delete, link_document_download, link_document_clear_transformations, link_document_update_page_count], sources=[Document])
# Document type links
menu_object.bind_links(links=[link_document_type_edit, link_document_type_filename_list, link_document_type_delete], sources=[DocumentType])
menu_object.bind_links(links=[link_document_type_filename_edit, link_document_type_filename_delete], sources=[DocumentTypeFilename])
@@ -119,19 +122,15 @@ class DocumentsApp(apps.AppConfig):
menu_facet.bind_links(links=[link_document_events_view, link_document_version_list], sources=[Document], position=2)
# Document actions
menu_facet.bind_links(links=[link_document_page_rotate_left, link_document_page_rotate_right, link_document_page_zoom_in, link_document_page_zoom_out, link_document_page_view_reset], sources=['documents:document_page_view'])
menu_object.bind_links(links=[link_document_version_revert, link_document_version_download], sources=[DocumentVersion])
menu_multi_item.bind_links(links=[link_document_multiple_clear_transformations, link_document_multiple_delete, link_document_multiple_download, link_document_multiple_update_page_count, link_document_multiple_document_type_edit], sources=[Document])
# Document pages
menu_object.bind_links(links=[link_document_edit, link_document_document_type_edit, link_document_print, link_document_delete, link_document_download, link_document_clear_transformations, link_document_update_page_count], sources=[Document])
menu_object.bind_links(links=[link_document_page_transformation_list, link_document_page_view, link_document_page_text, link_document_page_edit], sources=[DocumentPage])
menu_sidebar.bind_links(links=[link_document_page_navigation_first, link_document_page_navigation_previous, link_document_page_navigation_next, link_document_page_navigation_last], sources=[DocumentPage])
menu_facet.bind_links(links=[link_document_page_rotate_left, link_document_page_rotate_right, link_document_page_zoom_in, link_document_page_zoom_out, link_document_page_view_reset], sources=['documents:document_page_view'])
menu_facet.bind_links(links=[link_document_page_return, link_document_page_view, link_document_page_text, link_document_page_edit], sources=[DocumentPage])
menu_facet.bind_links(links=[link_document_page_navigation_first, link_document_page_navigation_previous, link_document_page_navigation_next, link_document_page_navigation_last, link_document_page_transformation_list], sources=[DocumentPage])
menu_object.bind_links(links=[link_document_page_transformation_edit, link_document_page_transformation_delete], sources=[DocumentPageTransformation])
menu_sidebar.bind_links(links=[link_document_page_transformation_create], sources=['documents:document_page_transformation_list'])
menu_sidebar.bind_links(links=[link_document_page_transformation_create], sources=['documents:document_page_transformation_create'])
menu_sidebar.bind_links(links=[link_document_page_transformation_create], sources=['documents:document_page_transformation_edit', 'documents:document_page_transformation_delete'])
menu_sidebar.bind_links(links=[link_document_page_transformation_create], sources=[DocumentPage, 'documents:document_page_transformation_create'])
namespace = StatisticNamespace(name='documents', label=_('Documents'))
namespace.add_statistic(DocumentStatistics(name='document_stats', label=_('Document tendencies')))

33
mayan/apps/documents/links.py
View File

@@ -70,22 +70,23 @@ link_clear_image_cache = Link(
)
# Document pages
link_document_page_transformation_create = Link(args='page.pk', klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text= _('Create new transformation'), view='documents:document_page_transformation_create')
link_document_page_transformation_delete = Link(args='transformation.pk', klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Delete'), view='documents:document_page_transformation_delete')
link_document_page_transformation_edit = Link(args='transformation.pk', klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Edit'), view='documents:document_page_transformation_edit')
link_document_page_transformation_list = Link(args='page.pk', klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Page transformations'), view='documents:document_page_transformation_list')
link_document_page_edit = Link(klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_EDIT], text=_('Edit page text'), view='documents:document_page_edit', args='page.pk')
link_document_page_navigation_first = Link(conditional_disable=is_first_page, keep_query=True, klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('First page'), view='documents:document_page_navigation_first', args='page.pk')
link_document_page_navigation_last = Link(conditional_disable=is_last_page, keep_query=True, text=_('Last page'), klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], view='documents:document_page_navigation_last', args='page.pk')
link_document_page_navigation_previous = Link(conditional_disable=is_first_page, keep_query=True, klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Previous page'), view='documents:document_page_navigation_previous', args='page.pk')
link_document_page_navigation_next = Link(conditional_disable=is_last_page, keep_query=True, klass='no-parent-history', text=_('Next page'), permissions=[PERMISSION_DOCUMENT_VIEW], view='documents:document_page_navigation_next', args='page.pk')
link_document_page_rotate_left = Link(klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Rotate left'), view='documents:document_page_rotate_left', args='page.pk')
link_document_page_rotate_right = Link(klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Rotate right'), view='documents:document_page_rotate_right', args='page.pk')
link_document_page_text = Link(args='page.pk', klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Page text'), view='documents:document_page_text')
link_document_page_view = Link(args='page.pk', klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Page image'), view='documents:document_page_view')
link_document_page_view_reset = Link(permissions=[PERMISSION_DOCUMENT_VIEW], klass='no-parent-history', text=_('Reset view'), view='documents:document_page_view_reset', args='page.pk')
link_document_page_zoom_in = Link(conditional_disable=is_max_zoom, klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Zoom in'), view='documents:document_page_zoom_in', args='page.pk')
link_document_page_zoom_out = Link(conditional_disable=is_min_zoom, klass='no-parent-history', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Zoom out'), view='documents:document_page_zoom_out', args='page.pk')
link_document_page_transformation_create = Link(args='page.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text= _('Create new transformation'), view='documents:document_page_transformation_create')
link_document_page_transformation_delete = Link(args='transformation.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Delete'), view='documents:document_page_transformation_delete')
link_document_page_transformation_edit = Link(args='transformation.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Edit'), view='documents:document_page_transformation_edit')
link_document_page_transformation_list = Link(args='page.pk', permissions=[PERMISSION_DOCUMENT_TRANSFORM], text=_('Transformations'), view='documents:document_page_transformation_list')
link_document_page_edit = Link(permissions=[PERMISSION_DOCUMENT_EDIT], text=_('Edit page text'), view='documents:document_page_edit', args='page.pk')
link_document_page_navigation_first = Link(conditional_disable=is_first_page, icon='fa fa-step-backward', keep_query=True, permissions=[PERMISSION_DOCUMENT_VIEW], text=_('First page'), view='documents:document_page_navigation_first', args='page.pk')
link_document_page_navigation_last = Link(conditional_disable=is_last_page, icon='fa fa-step-forward', keep_query=True, text=_('Last page'), permissions=[PERMISSION_DOCUMENT_VIEW], view='documents:document_page_navigation_last', args='page.pk')
link_document_page_navigation_previous = Link(conditional_disable=is_first_page, icon='fa fa-arrow-left', keep_query=True, permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Previous page'), view='documents:document_page_navigation_previous', args='page.pk')
link_document_page_navigation_next = Link(conditional_disable=is_last_page, icon='fa fa-arrow-right', keep_query=True, text=_('Next page'), permissions=[PERMISSION_DOCUMENT_VIEW], view='documents:document_page_navigation_next', args='page.pk')
link_document_page_return = Link(icon='fa fa-file', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Document'), view='documents:document_preview', args='page.document.pk')
link_document_page_rotate_left = Link(icon='fa fa-rotate-left', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Rotate left'), view='documents:document_page_rotate_left', args='page.pk')
link_document_page_rotate_right = Link(icon='fa fa-rotate-right', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Rotate right'), view='documents:document_page_rotate_right', args='page.pk')
link_document_page_text = Link(args='page.pk', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Page text'), view='documents:document_page_text')
link_document_page_view = Link(args='page.pk', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Page image'), view='documents:document_page_view')
link_document_page_view_reset = Link(permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Reset view'), view='documents:document_page_view_reset', args='page.pk')
link_document_page_zoom_in = Link(conditional_disable=is_max_zoom, icon='fa fa-search-plus', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Zoom in'), view='documents:document_page_zoom_in', args='page.pk')
link_document_page_zoom_out = Link(conditional_disable=is_min_zoom, icon='fa fa-search-minus', permissions=[PERMISSION_DOCUMENT_VIEW], text=_('Zoom out'), view='documents:document_page_zoom_out', args='page.pk')
# Document versions
link_document_version_revert = Link(conditional_disable=is_current_version, permissions=[PERMISSION_DOCUMENT_VERSION_REVERT], text=_('Revert'), view='documents:document_version_revert', args='object.pk')

7
mayan/apps/documents/views.py
View File

@@ -589,7 +589,6 @@ def document_page_view(request, document_page_id):
'page': document_page,
'rotation': rotation,
'title': ' '.join([base_title, zoom_text]),
'web_theme_hide_menus': True,
'zoom': zoom,
}, context_instance=RequestContext(request))
@@ -613,7 +612,6 @@ def document_page_text(request, document_page_id):
'page': document_page,
'navigation_object_list': ['page'],
'title': _('Details for: %s') % document_page,
'web_theme_hide_menus': True,
}, context_instance=RequestContext(request))
@@ -642,7 +640,6 @@ def document_page_edit(request, document_page_id):
'navigation_object_list': ['page'],
'page': document_page,
'title': _('Edit: %s') % document_page,
'web_theme_hide_menus': True,
}, context_instance=RequestContext(request))
@@ -1171,7 +1168,6 @@ def document_page_transformation_list(request, document_page_id):
'page': document_page,
'navigation_object_list': ['page'],
'title': _('Transformations for: %s') % document_page,
'web_theme_hide_menus': True,
'list_object_variable_name': 'transformation',
'extra_columns': [
{'name': _('Order'), 'attribute': 'order'},
@@ -1210,7 +1206,6 @@ def document_page_transformation_create(request, document_page_id):
'navigation_object_list': ['page'],
'title': _('Create new transformation for page: %(page)s of document: %(document)s') % {
'page': document_page.page_number, 'document': document_page.document},
'web_theme_hide_menus': True,
}, context_instance=RequestContext(request))
@@ -1240,7 +1235,6 @@ def document_page_transformation_edit(request, document_page_transformation_id):
'transformation': document_page_transformation.get_transformation_display(),
'document_page': document_page_transformation.document_page},
'transformation': document_page_transformation,
'web_theme_hide_menus': True,
}, context_instance=RequestContext(request))
@@ -1269,5 +1263,4 @@ def document_page_transformation_delete(request, document_page_transformation_id
'transformation': document_page_transformation.get_transformation_display(),
'document_page': document_page_transformation.document_page},
'transformation': document_page_transformation,
'web_theme_hide_menus': True,
}, context_instance=RequestContext(request))

2
mayan/apps/documents/widgets.py
View File

@@ -55,7 +55,7 @@ class DocumentPagesCarouselWidget(forms.widgets.Widget):
click_view='documents:document_page_view',
click_view_arguments=[page.pk],
page=page.page_number,
fancybox_class='fancybox-iframe',
fancybox_class='',
image_class='lazy-load-carousel',
size=DISPLAY_SIZE,
version=latest_version_pk,