diff --git a/basics/__init__.py b/basics/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/basics/templates/basics/disclaimer.html b/basics/templates/basics/disclaimer.html new file mode 100644 index 0000000..ebf1ce7 --- /dev/null +++ b/basics/templates/basics/disclaimer.html @@ -0,0 +1,12 @@ +{% extends "front_base.html" %} + +{% load static from staticfiles %} + +{% block title %} - Disclaimer{% endblock %} + +{% block content %} +

Disclaimer

+

The articles and thoughts on this site all originate from me, unless otherwise stated. Please use them with this statement in your mind. If you use anything, please put a backlink on your site to the given article(s) or the main page.

+

The social media icons on the right are from komodomedia.com komodomedia.com.

+

Some design ideas, like the arrows under the menu items are from a friend, Judit Pásti. +{% endblock content %} diff --git a/basics/tests.py b/basics/tests.py new file mode 100644 index 0000000..501deb7 --- /dev/null +++ b/basics/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/basics/urls.py b/basics/urls.py new file mode 100644 index 0000000..0c55d21 --- /dev/null +++ b/basics/urls.py @@ -0,0 +1,8 @@ +from django.conf.urls import patterns, url +from basics import views + +urlpatterns = patterns('', + url(r'^resume', views.resume, name='resume'), + url(r'^about', views.about, name='about'), + url(r'^disclaimer', views.disclaimer, name='disclaimer'), +) diff --git a/basics/views.py b/basics/views.py new file mode 100644 index 0000000..45df0be --- /dev/null +++ b/basics/views.py @@ -0,0 +1,10 @@ +from django.shortcuts import render + +def resume(request): + return render(request, 'resume.html', {}) + +def about(request): + return render(request, 'basics/about.html', {}) + +def disclaimer(request): + return render(request, 'basics/disclaimer.html', {}) diff --git a/blog/urls.py b/blog/urls.py index a0f8588..b11cbac 100644 --- a/blog/urls.py +++ b/blog/urls.py @@ -6,7 +6,4 @@ urlpatterns = patterns('', url(r'^feed$', views.feed, name='feed'), url(r'^tag/(?P.*)$', views.taglist, name='taglist'), url(r'^(?P\d+)/(?P\d+)/(?P\d+)/(?P[^/]+)$', views.read, name='read'), - url(r'^resume', views.resume, name='resume'), - url(r'^about', views.resume, name='about'), - url(r'^disclaimer', views.resume, name='disclaimer'), ) diff --git a/blog/views.py b/blog/views.py index 4dd6b2b..5d0b1d5 100644 --- a/blog/views.py +++ b/blog/views.py @@ -21,11 +21,3 @@ def taglist(request, tag): def feed(request): return render(request, 'blog/feed.xml', {}) -def resume(request): - return render(request, 'resume.html', {}) - -def about(request): - return renden(request, 'about.html', {}) - -def disclaimer(request): - return renden(request, 'disclaimer.html', {}) diff --git a/gergelypolonkai_django/static/images/komodomedia_azure_16.png b/gergelypolonkai_django/static/images/komodomedia_azure_16.png new file mode 100755 index 0000000..02b1d82 Binary files /dev/null and b/gergelypolonkai_django/static/images/komodomedia_azure_16.png differ diff --git a/gergelypolonkai_django/templates/front_base.html b/gergelypolonkai_django/templates/front_base.html index a4a6318..b134229 100644 --- a/gergelypolonkai_django/templates/front_base.html +++ b/gergelypolonkai_django/templates/front_base.html @@ -42,9 +42,9 @@

@@ -62,7 +62,7 @@
- :: Copyright © 2012, Gergely Polonkai :: Disclaimer :: + :: Copyright © 2012, Gergely Polonkai :: Disclaimer ::
Fork me on GitHub diff --git a/gergelypolonkai_django/urls.py b/gergelypolonkai_django/urls.py index bdd3eb2..8ce18e7 100644 --- a/gergelypolonkai_django/urls.py +++ b/gergelypolonkai_django/urls.py @@ -5,12 +5,10 @@ admin.autodiscover() urlpatterns = patterns('', # Examples: - url(r'^$', 'blog.views.mainpage', name='home'), - # url(r'^$', 'gergelypolonkai_django.views.home', name='home'), - url(r'^blog/', include('blog.urls', namespace='blog')), - + url(r'^$', 'blog.views.mainpage', name='home'), + url(r'^blog/', include('blog.urls', namespace='blog')), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', include(admin.site.urls)), + url(r'^', include('basics.urls', namespace='basics')), )