gergely/gergelypolonkai-web-django
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved "static" pages to the basics app

Browse Source
This commit is contained in:
Gergely Polonkai
2013-10-01 23:40:42 +02:00
parent 414ff5b4a4
commit 4560c925fc
10 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gergelypolonkai_django/static/images/komodomedia_azure_16.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 643 B

6
gergelypolonkai_django/templates/front_base.html
View File

@@ -42,9 +42,9 @@
<div id="menu">
<div id="tagcloud-button"><img alt="" src="{% static "images/tagcloud.png" %}" /></div>
<ul>
<li {% if currentMenu == 'resume' %} class="active"{% endif %}><a href="{% url 'blog:resume' %}">Resume</a></li>
<li {% if currentMenu == 'resume' %} class="active"{% endif %}><a href="{% url 'basics:resume' %}">Resume</a></li>
<li {% if currentMenu == 'blog' %} class="active"{% endif %}><a href="{% url 'blog:index' %}">Blog</a></li>
<li {% if currentMenu == 'about' %} class="active"{% endif %}><a href="{% url 'blog:about' %}">About me</a></li>
<li {% if currentMenu == 'about' %} class="active"{% endif %}><a href="{% url 'basics:about' %}">About me</a></li>
</ul>
<br class="clear" />
</div>
@@ -62,7 +62,7 @@
<div id="bottombar-wrapper">
<div id="bottombar-padding"></div>
<div id="bottombar"{% if app.environment == 'dev' %} style="bottom: 40px;"{% endif %}>
:: Copyright &copy; 2012, Gergely Polonkai :: <a href="{% url 'blog:disclaimer' %}">Disclaimer</a> ::
:: Copyright &copy; 2012, Gergely Polonkai :: <a href="{% url 'basics:disclaimer' %}">Disclaimer</a> ::
</div>
</div>
<a href="https://github.com/gergelypolonkai" id="github-ribbon" target="_blank"><img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png" alt="Fork me on GitHub"></a>

10
gergelypolonkai_django/urls.py
View File

@@ -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')),
)