Changeset 38:5386a7c8c14d

Timestamp:

08/24/08 11:56:21 (3 months ago)

Author:

Jeffrey Gelens <jeffrey@…>

Branch:

default

Message:

Layout update

Files:

• blog/__init__.py (modified) (1 diff)
• blog/admin.py (modified) (1 diff)
• blog/models.py (modified) (1 diff)
• blog/signals.py (modified) (2 diffs)
• settings.py (modified) (1 diff)
• static/css/screen.css (modified) (7 diffs)
• templates/base.html (modified) (1 diff)
• templates/blog/index.html (modified) (2 diffs)
• templates/blog/single_article.html (modified) (2 diffs)
• templates/blog_base.html (modified) (1 diff)
• templates/contact_form.html (modified) (2 diffs)

blog/__init__.py

@@ -1 @@
-import blog.admin
 import blog.signals

blog/admin.py

@@ -16 +16 @@
     search_fields = ('title','body')
 
-#admin.site.register(models.Link)
-#admin.site.register(models.Article, ArticleOptions)
+admin.site.register(models.Link)
+admin.site.register(models.Article, ArticleOptions)

blog/models.py

@@ -4 +4 @@
 from django.forms.widgets import *
 
+LINK_CHOICES = (
+        ('B', 'Blogroll'),
+        ('G', 'General links'),
+        ('A', 'Articles'),
+)
+
 class Link(models.Model):
     name = models.CharField(max_length=50, core=True)
     url = models.URLField()
-    kind = models.CharField(max_length=1, choices = (('B', 'Blogroll'), ('G', 'General links')))
+    kind = models.CharField(max_length=1, choices=LINK_CHOICES)
 
     def __unicode__(self):

blog/signals.py

@@ -1 +1 @@
 from django.conf import settings
 from django.db.models import signals
-from django.dispatch import Signal
 from django.contrib.comments.models import FreeComment
 from django.contrib.sites.models import Site
@@ -47 +46 @@
                     instance.is_public = False
 
-Signal().connect(moderate_comments, sender=FreeComment)
+signals.post_save.connect(moderate_comments, sender=FreeComment)

settings.py

@@ -4 +4 @@
 USE_I18N = False
 USE_ETAGS = True
-DEFAULT_CONTENT_TYPE="application/xhtml+xml"
+#DEFAULT_CONTENT_TYPE="application/xhtml+xml"
 DJANGO_ROOT = os.path.abspath(os.path.dirname(__file__))
 

static/css/screen.css

@@ -14 +14 @@
     min-width: 800px;
     max-width: 1000px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px; 
 }
 
 /* General settings */
+hr { color: #ffa63a; height: 1px; background-color: #ffa63a; border: 0; }
 img { border: 0px; }
 p { text-align: justify; line-height: 150%; }
-a { text-decoration: none; color: #3e5fa7; }
-a:hover { color: #738EC9; text-shadow: #738EC9 2px 2px 10px; }
+a { 
+    text-decoration: none;
+    color: #3e5fa7;
+    -webkit-transition: 0.25s color ease-in;
+}
+a:hover { color: #ffa63a; }
 ul { padding: 0; margin: 0; }
 li { color: #a1a5a9; }
 div { padding: 0; margin: 0; }
 table { border: 0; }
+h1, h2 { color: #353633; }
 td, th {
     border: 0;
@@ -38 +46 @@
     height: 74px;
     border-bottom: 1px solid #000000;
-    background: url(/static/images/headerbg.png) repeat-x top left;
-    overflow: hidden;
+    background: url(/static/images/headerbg.png) repeat-x top right;
+    overflow: hidden;
+    -moz-border-radius-topleft: 10px;
+    -webkit-border-top-left-radius: 10px;
+    -moz-border-radius-topright: 10px;
+    -webkit-border-top-right-radius: 10px;
 }
 
@@ -53 +65 @@
 }
 
-#menu a { color: #ffffff; }
-#menu a:hover { color: #3E5FA7; }
+#menu a { 
+    color: #ffffff; 
+    -webkit-transition: 0.4s color ease-in;
+}
+#menu a:hover { color: #3e5Fa7; }
 #menu ul { padding-top: 50px; }
 #menu ul li {
@@ -136 +151 @@
 
 .article { margin-bottom: 25px; } 
-.article hr { color: #ffa63a; height: 1px; background-color: #ffa63a; border: 0; }
 .article p img { border: 1px solid #ffa63a; padding: 1px; }
 .article ul { padding-left: 20px; }
@@ -146 +160 @@
     font-size: 12px;
     line-height: 150%;
+    color: #484946;
     font-family: "Lucida Grande", Geneva, Arial, Verdana, sans-serif;
 }
@@ -151 +166 @@
 .entry-title { margin: 0; }
 .entry-title, .entry-title a {
-    color: #000000;
-    letter-spacing: -0.1em;
-    font-family: 'Lucida Sans Unicode', 'Lucida Grande', sans-serif;
-    text-shadow: #666 2px 2px 10px;
-}
-.entry-title a:hover { text-shadow: #738EC9 2px 2px 10px; text-decoration: underline; }
-.published, .comments { border: 0; font-style: oblique; color: #999999; }
+    color: #353633;
+    -webkit-transition: 0.4s color ease-in; 
+}
+.entry-title a:hover { color: #3e5Fa7; }
+.published, .comments { border: 0; font-size: 0.8em; font-style: oblique; color: #999999; }
 .flatpage-title a {
     text-decoration: underline;
@@ -167 +180 @@
 .comment-title { 
     display: inline;
-    text-shadow: #666 2px 2px 10px;
     padding: 10px;
     padding-left: 5px;
     padding-bottom: 0;
     text-transform: capitalize;
+    color: #353633;
 }
 

templates/base.html

@@ -26 +26 @@
     <div id="logo">
       <a href="/" title="Back to homepage">
-        <img src="/static/images/logo.png" alt="Back to main page" />
+        <img src="/static/images/logo_corner.png" alt="Back to main page" />
       </a>
     </div>

templates/blog/index.html

@@ -13 +13 @@
   <p>
     <small class="greyout">
-    {% ifequal topic "life" %}
+  {% ifequal topic "life" %}
     Show only articles about <a href="/blog/tech">technology</a>
     or <a href="/blog">all</a> articles.
@@ -28 +28 @@
   </p>
 
+    <hr />
 {% for article in articles  %}
   {% get_free_comment_count for blog.article article.id as comment_count %}

templates/blog/single_article.html

@@ -11 +11 @@
 {% load humanize %}
   <div class="hentry article">
+    <hr />
     <abbr class="published" title="{{ article.pub_date|date:"Y-m-d\Th:i:sO" }}">{{ article.pub_date|naturalday|capfirst }}</abbr>
     <h2 class="entry-title"><a class="rel-bookmark" href="{{ article.get_absolute_url }}">{{ article.title }}</a></h2>
@@ -20 +21 @@
      {{ article.body|restructuredtext }}
     {% endifequal %}
+    <hr />
   </div>
 

templates/blog_base.html

@@ -22 +22 @@
       {% latest_comments %}
 
+      <h2>Articles</h2>
+      {% show_links "A" %}
+
       <h2>Links</h2>
       {% show_links "G" %}

templates/contact_form.html

@@ -5 +5 @@
   <h1><a id="contact-me" name="contact-me">Contact Jeffrey</a></h1>
   <p class="contact-form">
+  <table>
     <form action="/contact" method="post">
       <tr><th><label for="id_name">Name:</label></th><td><input type="text" name="name" id="id_name" /></td></tr>
@@ -12 +13 @@
       <tr><th>&nbsp;</th><td><input type="submit" value="Send" /></td></tr>
     </form>
+  </table>
   </p>
   </div>