Permalink
Browse files

tables

  • Loading branch information...
1 parent 05af272 commit f4702d5558b55fa6f20754d7ae65d65cef96fe1a Benjamin Golub committed May 17, 2009
Showing with 58 additions and 52 deletions.
  1. +7 −5 static/css/base.css
  2. +51 −47 templates/base.html
View
@@ -41,6 +41,10 @@ form {
padding: 0;
}
+table td {
+ vertical-align: top;
+}
+
#header {
background-color: #bed7f5;
height: 56px;
@@ -75,14 +79,12 @@ form {
}
#body {
- margin: 30px;
- max-width: 650px;
+ width: 100%;
+ padding: 30px;
}
#sidebar {
- margin: 30px;
- position: absolute;
- right: 0;
+ padding: 30px;
width: 250px;
}
View
@@ -33,54 +33,58 @@
</form>
</div>
</div>
- <div id="sidebar">
- {% if GOOGLE_TALK_BADGE %}
- <div class="box">
- <iframe src="{{ GOOGLE_TALK_BADGE }}" frameborder="0" height="60" width="200"></iframe>
- </div>
- {% endif %}
- <div class="box">
- {% for entry in recent_entries %}
- <div class="entry summary">
- <a href="/e/{{ entry.slug }}">{{ entry.title }}</a>
- <span class="date" title="{{ entry.published }}">
- - {{ entry.published|bettertimesince }}
- </span>
- </div>
- {% endfor %}
- </div>
- <div class="box">
- <a href="/archive">Archive</a>
+ <table class="columns">
+ <tr>
+ <td id="body" class="left">
+ {% block body %}{% endblock %}
+ </td>
+ <td id="sidebar" class="right">
+ {% if GOOGLE_TALK_BADGE %}
+ <div class="box">
+ <iframe src="{{ GOOGLE_TALK_BADGE }}" frameborder="0" height="60" width="200"></iframe>
+ </div>
+ {% endif %}
+ <div class="box">
+ {% for entry in recent_entries %}
+ <div class="entry summary">
+ <a href="/e/{{ entry.slug }}">{{ entry.title }}</a>
+ <span class="date" title="{{ entry.published }}">
+ - {{ entry.published|bettertimesince }}
+ </span>
+ </div>
+ {% endfor %}
+ </div>
+ <div class="box">
+ <a href="/archive">Archive</a>
+ </div>
+ {% if flickr_feed.link %}
+ <div class="box">
+ <a href="{{ flickr_feed.link }}">Photos</a>
+ </div>
+ {% endif %}
+ {% if flickr_feed.items %}
+ <div class="box">
+ {% for item in flickr_feed.items %}
+ <a href="{{ item.link }}"><img src="{{ item.media.m }}" title="{{ item.title }}" alt="{{ item.title }}"/></a>
+ {% endfor %}
+ </div>
+ {% endif %}
+ {% if FRIENDFEED_NICKNAME %}
+ <div class="box">
+ <script type="text/javascript" src="http://friendfeed.com/embed/badge/{{ FRIENDFEED_NICKNAME }}"></script><noscript><a href="http://friendfeed.com/{{ FRIENDFEED_NICKNAME }}"><img alt="View my FriendFeed" style="border:0;" src="http://friendfeed.com/embed/badge/{{ FRIENDFEED_NICKNAME }}?format=png"/></a></noscript>
+ </div>
+ {% endif %}
+ {% if current_city %}
+ <div class="box">
+ <a href="http://maps.google.com/maps?q={{ current_city.latitude }},{{ current_city.longitude }}{% filter urlencode %} ({{ current_city.name }} {{ current_city.region}}, {{ current_city.country_code }}){% endfilter %}"><img src="http://maps.google.com/staticmap?zoom=9&amp;size=250x150&amp;markers={{ current_city.latitude }},{{ current_city.longitude }}&amp;key={{ current_city.maps_api_key }}" title="{{ current_city.name }}, {{ current_city.region }} {{ current_city.country_code }}" alt="{{ current_city.name }}, {{ current_city.region }} {{ current_city.country_code }}"/></a>
+ </div>
+ {% endif %}
+ <div class="box">
+ <script type="text/javascript" src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/translatemypage.xml&amp;up_source_language=en&amp;w=160&amp;h=60&amp;title=&amp;border=&amp;output=js"></script>
</div>
- {% if flickr_feed.link %}
- <div class="box">
- <a href="{{ flickr_feed.link }}">Photos</a>
- </div>
- {% endif %}
- {% if flickr_feed.items %}
- <div class="box">
- {% for item in flickr_feed.items %}
- <a href="{{ item.link }}"><img src="{{ item.media.m }}" title="{{ item.title }}" alt="{{ item.title }}"/></a>
- {% endfor %}
- </div>
- {% endif %}
- {% if FRIENDFEED_NICKNAME %}
- <div class="box">
- <script type="text/javascript" src="http://friendfeed.com/embed/badge/{{ FRIENDFEED_NICKNAME }}"></script><noscript><a href="http://friendfeed.com/{{ FRIENDFEED_NICKNAME }}"><img alt="View my FriendFeed" style="border:0;" src="http://friendfeed.com/embed/badge/{{ FRIENDFEED_NICKNAME }}?format=png"/></a></noscript>
- </div>
- {% endif %}
- {% if current_city %}
- <div class="box">
- <a href="http://maps.google.com/maps?q={{ current_city.latitude }},{{ current_city.longitude }}{% filter urlencode %} ({{ current_city.name }} {{ current_city.region}}, {{ current_city.country_code }}){% endfilter %}"><img src="http://maps.google.com/staticmap?zoom=9&amp;size=250x150&amp;markers={{ current_city.latitude }},{{ current_city.longitude }}&amp;key={{ current_city.maps_api_key }}" title="{{ current_city.name }}, {{ current_city.region }} {{ current_city.country_code }}" alt="{{ current_city.name }}, {{ current_city.region }} {{ current_city.country_code }}"/></a>
- </div>
- {% endif %}
- <div class="box">
- <script type="text/javascript" src="http://www.gmodules.com/ig/ifr?url=http://www.google.com/ig/modules/translatemypage.xml&amp;up_source_language=en&amp;w=160&amp;h=60&amp;title=&amp;border=&amp;output=js"></script>
- </div>
- </div>
- <div id="body">
- {% block body %}{% endblock %}
- </div>
+ </td>
+ </tr>
+ </table>
<div id="footer">
{% if EMAIL and NAME %}
&copy;{% now "Y" %} <a href="mailto:{{ EMAIL }}">{{ NAME }}</a> -

0 comments on commit f4702d5

Please sign in to comment.