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

Don't load removed settings template tag

Browse Source
This commit is contained in:
Roberto Rosario
2015-04-06 02:25:32 -04:00
parent 35b44e70c7
commit 7c4bb03534
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@
{% load navigation_tags %}
{% load project_tags %}
{% load settings %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -15,16 +14,7 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Language" content="{{ LANGUAGE_CODE }}" />
<title>{% block project_name %}{% project_name %}{% endblock %}{{ request.new_window_url }}{% block title %}{% endblock %}</title>
{% if new_window_url %}
<script type="text/javascript">
window.open('{{ new_window_url|safe }}','{{ new_window_url_name|default:"_blank" }}','toolbar=1,scrollbars=1,location=1,status=1,menubar=1,resizable=1');
</script>
<noscript>
<META HTTP-EQUIV="refresh" CONTENT="{{ new_window_url_timeout|default:'2' }};{{ new_window_url|safe }}">
</noscript>
{% endif %}
<title>{% block project_name %}{% project_name %}{% endblock %}{% block title %}{% endblock %}</title>
{% compress css %}
<link href="http://fonts.googleapis.com/css?family=IM+Fell+English+SC" rel="stylesheet" type="text/css">
@@ -94,7 +84,7 @@
{% endcompress %}
</head>
<body>
{% if web_theme_view_type == 'plain' %}
{% if appearance_type == 'plain' %}
{% block content_plain %}{% endblock %}
{% else %}
<nav class="navbar navbar-default navbar-fixed-top">

2
mayan/apps/common/views.py
View File

@@ -265,7 +265,7 @@ def login_view(request):
kwargs['authentication_form'] = EmailAuthenticationForm
if not request.user.is_authenticated():
context = {'web_theme_view_type': 'plain'}
context = {'appearance_type': 'plain'}
return login(request, extra_context=context, **kwargs)
else:
return HttpResponseRedirect(reverse(getattr(settings, 'LOGIN_REDIRECT_URL', 'main:home')))

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

@@ -794,8 +794,6 @@ def document_print(request, document_id):
post_redirect = None
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_redirect or document.get_absolute_url())))
new_window_url = None
if request.method == 'POST':
form = PrintForm(request.POST)
if form.is_valid():
@@ -809,6 +807,8 @@ def document_print(request, document_id):
new_url.append(urlquote(hard_copy_arguments))
new_window_url = '?'.join(new_url)
return HttpResponseRedirect(new_window_url)
else:
form = PrintForm()
@@ -817,7 +817,6 @@ def document_print(request, document_id):
'object': document,
'title': _('Print: %s') % document,
'next': next,
'new_window_url': new_window_url if new_window_url else new_window_url
}, context_instance=RequestContext(request))
@@ -841,6 +840,7 @@ def document_hard_copy(request, document_id):
pages = document.pages.all()
return render_to_response('documents/document_print.html', {
'appearance_type': 'plain',
'object': document,
'page_range': page_range,
'pages': pages,