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

Move favicon redirection to main app, use proper static file URL generation

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-24 02:49:24 -04:00
parent 8b02f8cb0c
commit 6b8f8f18e7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mayan/apps/common/urls.py
View File

@@ -1,8 +1,7 @@
from __future__ import unicode_literals
from django.conf import settings
from django.conf.urls import patterns, url
from django.views.generic import RedirectView, TemplateView
from django.views.generic import TemplateView
urlpatterns = patterns('common.views',
@@ -28,8 +27,6 @@ urlpatterns += patterns('',
url(r'^password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'main/password_reset_confirm.html', 'post_reset_redirect': '/password/reset/complete/'}, name='password_reset_confirm_view'),
url(r'^password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'main/password_reset_complete.html'}, name='password_reset_complete_view'),
url(r'^password/reset/done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'main/password_reset_done.html'}, name='password_reset_done_view'),
(r'^favicon\.ico$', RedirectView.as_view(url='%s%s' % (settings.STATIC_URL, 'images/favicon.ico'))),
)
urlpatterns += patterns('',

6
mayan/apps/main/urls.py
View File

@@ -1,9 +1,15 @@
from __future__ import unicode_literals
from django.conf.urls import patterns, url
from django.contrib.staticfiles.templatetags.staticfiles import static
from django.views.generic import RedirectView
urlpatterns = patterns('main.views',
url(r'^$', 'home', (), 'home'),
url(r'^maintenance_menu/$', 'maintenance_menu', (), 'maintenance_menu'),
url(r'^diagnostics/$', 'diagnostics_view', (), 'diagnostics'),
)
urlpatterns += patterns('',
(r'^favicon\.ico$', RedirectView.as_view(url=static('images/favicon.ico'))),
)