Mercurial > public > sg101
comparison gpp/templates/base.html @ 342:8587c7a22094
Moved the social block up higher, just below the main nav.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Sun, 27 Feb 2011 01:58:49 +0000 |
parents | 871a54546808 |
children | 8e3f252e4fbb |
comparison
equal
deleted
inserted
replaced
341:871a54546808 | 342:8587c7a22094 |
---|---|
69 <li><a href="{% url 'potd-view' %}">Photo of the Day</a></li> | 69 <li><a href="{% url 'potd-view' %}">Photo of the Day</a></li> |
70 <li><a href="{% url 'weblinks-main' %}">Links</a></li> | 70 <li><a href="{% url 'weblinks-main' %}">Links</a></li> |
71 <li><a href="{% url 'haystack_search' %}">Search</a></li> | 71 <li><a href="{% url 'haystack_search' %}">Search</a></li> |
72 <li><a href="{% url 'ygroup-thread_index' %}">Yahoo Group</a></li> | 72 <li><a href="{% url 'ygroup-thread_index' %}">Yahoo Group</a></li> |
73 </ul> | 73 </ul> |
74 {% include 'core/social_block.html' %} | |
74 {% cache 300 potd_block %} | 75 {% cache 300 potd_block %} |
75 {% photo_of_the_day %} | 76 {% photo_of_the_day %} |
76 {% endcache %} | 77 {% endcache %} |
77 {% shoutbox %} | 78 {% shoutbox %} |
78 {% cache 60 irc_block %} | 79 {% cache 60 irc_block %} |
79 {% irc_status %} | 80 {% irc_status %} |
80 {% endcache %} | 81 {% endcache %} |
81 {% include 'core/social_block.html' %} | |
82 </div> | 82 </div> |
83 | 83 |
84 <div id="content-primary" class="span-19 last"> | 84 <div id="content-primary" class="span-19 last"> |
85 {% block content %} | 85 {% block content %} |
86 {% endblock %} | 86 {% endblock %} |