diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/patchwork/urls.py | 8 | ||||
| -rw-r--r-- | apps/settings.py | 17 | ||||
| -rw-r--r-- | apps/urls.py | 44 |
3 files changed, 20 insertions, 49 deletions
diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py index 9b681f9..b28eb90 100644 --- a/apps/patchwork/urls.py +++ b/apps/patchwork/urls.py @@ -17,12 +17,16 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from django.conf.urls import patterns, url +from django.conf.urls import patterns, url, include from django.conf import settings +from django.contrib import admin from django.contrib.auth import views as auth_views +admin.autodiscover() + urlpatterns = patterns('', - # Example: + url(r'^admin/', include(admin.site.urls)), + (r'^$', 'patchwork.views.projects'), (r'^project/(?P<project_id>[^/]+)/list/$', 'patchwork.views.patch.list'), (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project.project'), diff --git a/apps/settings.py b/apps/settings.py index dbe0544..01add3e 100644 --- a/apps/settings.py +++ b/apps/settings.py @@ -19,6 +19,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.admin', + 'django.contrib.staticfiles', 'patchwork', ) @@ -78,7 +79,7 @@ USE_I18N = True # URLs -ROOT_URLCONF = 'urls' +ROOT_URLCONF = 'patchwork.urls' # Security @@ -99,8 +100,6 @@ TEMPLATE_DIRS = ( # https://docs.djangoproject.com/en/1.6/ref/settings/#auth # -ADMIN_MEDIA_PREFIX = '/media/' - LOGIN_URL = '/user/login/' LOGIN_REDIRECT_URL = '/user/' @@ -114,6 +113,18 @@ SITE_ID = 1 # +# Static files settings +# https://docs.djangoproject.com/en/1.6/ref/settings/#static-files +# + +STATIC_URL = '/static/' + +STATICFILES_DIRS = [ + os.path.join(ROOT_DIR, 'htdocs'), +] + + +# # Patchwork settings # diff --git a/apps/urls.py b/apps/urls.py deleted file mode 100644 index a8bd68c..0000000 --- a/apps/urls.py +++ /dev/null @@ -1,44 +0,0 @@ -# Patchwork - automated patch tracking system -# Copyright (C) 2008 Jeremy Kerr <jk@ozlabs.org> -# -# This file is part of the Patchwork package. -# -# Patchwork is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Patchwork is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Patchwork; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import os - -from django.conf.urls import patterns, include -from django.conf import settings -from django.contrib import admin - -admin.autodiscover() - -htdocs = os.path.join(settings.ROOT_DIR, 'htdocs') - -urlpatterns = patterns('', - # Example: - (r'^', include('patchwork.urls')), - - # Uncomment this for admin: - (r'^admin/', include(admin.site.urls)), - - (r'^css/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': os.path.join(htdocs, 'css')}), - (r'^js/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': os.path.join(htdocs, 'js')}), - (r'^images/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': os.path.join(htdocs, 'images')}), -) - |