Skip to content

Commit

Permalink
fix contact data page
Browse files Browse the repository at this point in the history
  • Loading branch information
d1ffuz0r committed Dec 23, 2011
1 parent 247d57f commit e463f19
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
4 changes: 4 additions & 0 deletions public/static/css/style.css
Expand Up @@ -9,6 +9,10 @@
font-style: normal;
}

img {
border: none;
}

body {
width: 100%;
margin: 0;
Expand Down
9 changes: 5 additions & 4 deletions public/templates/contacts.html
@@ -1,17 +1,18 @@
{% extends 'base.html' %}
{% load footer_tags %}
{% block title %}Contacts{% endblock %}
{% block page_title %}Contacts{% endblock %}
{% block content %}<div id="contacts">
{% block content %}{% social %}<div id="contacts">
<div class="contact jabber">
<span>Jabber</span>
<div class="desc">{{ contacts.jabber }}</div>
<div class="desc">{{ social.jabber }}</div>
</div>
<div class="contact icq">
<span>ICQ</span>
<div class="desc">{{ contacts.icq }}</div>
<div class="desc">{{ social.icq }}</div>
</div>
<div class="contact email">
<span>E-mail</span>
<div class="desc">{{ contacts.email }}</div>
<div class="desc">{{ social.email }}</div>
</div>
</div>{% endblock %}
10 changes: 4 additions & 6 deletions urls.py
@@ -1,16 +1,16 @@
from homesite.models import About, Services, Settings
from django.conf.urls.defaults import patterns, url, include
from django.views.generic.base import TemplateView
from django.views.generic.list import ListView

from homesite.feed import BlogRss
from django.contrib import admin
import settings

admin.autodiscover()

urlpatterns = patterns('',
url(r'^$', ListView.as_view(queryset=Settings.objects.all(),
context_object_name="home",
template_name="home.html")),
url(r'^$', TemplateView.as_view(template_name="home.html")),

url(r'^about/', ListView.as_view(queryset=About.objects.all(),
context_object_name="about",
Expand All @@ -20,9 +20,7 @@
context_object_name="skills",
template_name="skills.html")),

url(r'^contacts/', ListView.as_view(queryset=Settings.objects.all(),
context_object_name="contacts",
template_name="contacts.html")),
url(r'^contacts/', TemplateView.as_view(template_name="contacts.html")),
url(r'^blog/rss/$', BlogRss()),
url(r'^blog/post/(\d+)', 'homesite.views.blog_post'),
url(r'^blog/', 'homesite.views.blog_list'),
Expand Down

0 comments on commit e463f19

Please sign in to comment.