Skip to content

Commit

Permalink
Merge pull request #39 from pyladies-poland/feature/37_homepage
Browse files Browse the repository at this point in the history
[#37] - Added simple home page, templates folder and modify settings and...
  • Loading branch information
lukaszjagodzinski committed Apr 1, 2015
2 parents 6fba4fb + afc3923 commit b3649fd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sandbox/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@

STATIC_URL = '/static/'

TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'accounts/templates'), )
TEMPLATE_DIRS = (os.path.join(BASE_DIR, 'templates'),
)

AUTH_USER_MODEL = 'accounts.User'
2 changes: 2 additions & 0 deletions sandbox/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from django.conf.urls import patterns, include, url
from django.contrib import admin
from django.views.generic import TemplateView

urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^$', TemplateView.as_view(template_name='index.html'), name='home'),
url(r'^accounts/', include('accounts.urls', namespace='accounts')),
url(r'^places/', include('places.urls', namespace='places'))
)
8 changes: 8 additions & 0 deletions templates/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<head>
<title>Sandbox</title>
</head>
<body>
Welcome
</body>
</html>

0 comments on commit b3649fd

Please sign in to comment.