diff options
| author |  Tom Willemse | 2013-05-09 20:46:07 +0200 |
|---|---|---|
| committer | Tom Willemse | 2013-05-09 21:18:03 +0200 |
| commit | 760adb211a4256a671b9afea98d9a633e550b384 (patch) | |
| tree | 979c378da7a09105a02d96ac2938a17e9dcb3e20 | |
| parent | 4ad12a9470a2b14fc33f90947542474405eaa540 (diff) | |
| download | ryuslash.org-760adb211a4256a671b9afea98d9a633e550b384.tar.gz ryuslash.org-760adb211a4256a671b9afea98d9a633e550b384.zip | |
Use bootstrap
| -rw-r--r-- | ryuslash/aggregator/templates/aggregator/base.html | 46 | ||||
| -rw-r--r-- | ryuslash/aggregator/templates/aggregator/posts.html | 85 | ||||
| -rw-r--r-- | ryuslash/static/logo.png | bin | 15931 -> 3771 bytes |
3 files changed, 71 insertions, 60 deletions
diff --git a/ryuslash/aggregator/templates/aggregator/base.html b/ryuslash/aggregator/templates/aggregator/base.html index 215ec7e..1b674aa 100644 --- a/ryuslash/aggregator/templates/aggregator/base.html +++ b/ryuslash/aggregator/templates/aggregator/base.html @@ -4,42 +4,32 @@ <head> <meta charset="utf-8" /> <title>ryuslash</title> - <link href="/static/main.css" rel="stylesheet" /> + <link href="http://ryuslash.org/bootstrap2/css/bootstrap.min.css" + rel="stylesheet" type="text/css" /> <link rel="shortcut icon" href="/static/favicon.png" /> {% block head %}{% endblock %} </head> <body> - <header> - <img src="/static/logo.png" alt="ryuslash.org" title="ryuslash.org"/> - <h1> - <a href="http://ryuslash.org"> - <span id="logo-blue">ryu</span><span id="logo-orange">slash</span> - </a> - </h1> - - <nav> - <ul> - {% if category == 'post' %} - <li class="selected top"> - {% else %} - <li class="top"> - {% endif %} - <a href="/">posts</a> + <div class="navbar navbar-static-top"> + <div class="navbar-inner"> + <div class="container"> + <img class="pull-left" src="/static/logo.png" + alt="ryuslash.org" title="ryuslash.org" /> + <a class="brand" href="http://ryuslash.org">ryuslash</a> + <ul class="nav pull-right"> + <li {% if category == 'post' %}class="active"{% endif %}> + <a href="/post/">posts</a> </li> - - {% if category == 'activity' %} - <li class="selected bottom"> - {% else %} - <li class="bottom"> - {% endif %} - <a href="/activity/">activities</a> + <li {% if category == 'activity' %}class="active"{% endif %}> + <a href="/activity/">activities</a> </li> - </ul> - </nav> - </header> + </ul> + </div> + </div> + </div> - <section class="content"> + <div class="container"> {% block content %}{% endblock %} </div> </body> diff --git a/ryuslash/aggregator/templates/aggregator/posts.html b/ryuslash/aggregator/templates/aggregator/posts.html index b70cb0d..3b84c0d 100644 --- a/ryuslash/aggregator/templates/aggregator/posts.html +++ b/ryuslash/aggregator/templates/aggregator/posts.html @@ -2,42 +2,63 @@ {% load posts_extras %} {% block head %} -<link href="/feeds/posts/" rel="alternate" type="application/rss+xml" - title="All posts" /> + <link href="/feeds/posts/" rel="alternate" type="application/rss+xml" + title="All posts" /> {% endblock %} {% block content %} - {% for post in list.object_list %} - <article class="post"> - (<span class="keyword">defpost</span> - <a href="{{ post.link }}" - class="variable-name">{{ post.title|slugify|nameless|truncate:48 }}</a> - (<img src="/static/images/logos/{{ post.icon }}" width="16" - height="16"/>) - <div class="doc"> - {% autoescape off %}{{ post.content }}{% endautoescape %} - </div> - <span class="string">"{{ post.updated }}"</span>) - </article> - {% endfor %} + <div class="row"> + <div class="span3"> + <img src="https://secure.gravatar.com/avatar/d3af11dc82b44c4f78517c2036271d5c?s=210" /> + <br /> + </div> + <div class="span9"> + {% for post in list.object_list %} + <table> + <tr> + <td style="vertical-align: top"> + {% if post.title %} + <h4> + {% endif %} + <a href="{{ post.link }}"> + <img class="media-object" src="/static/images/logos/{{ post.icon }}" /> + </a> + {% if post.title %} + </h4> + {% endif %} + </td> + <td> + {% if post.title %} + <h4>{{ post.title }}</h4> + {% endif %} + {% autoescape off %}{{ post.content }}{% endautoescape %} + </td> + </tr> + </table> + <br /> + {% endfor %} -<div id="pager"> - {% if list.has_previous %} - <span class="nav-prev"> - <a href="/{{ category }}/{{ list.previous_page_number }}/" - id="previous">[previous]</a> - </span> - {% endif %} + <div class="pagination pagination-centered"> + <ul> + {% if list.has_previous %} + <li> + <a href="/{{ category }}/{{ list.previous_page_number }}/"> + Prev + </a> + </li> + {% endif %} - <span id="current"> - {{ list.number }} / {{ list.paginator.num_pages }} - </span> + <li><a href="#">{{ list.number }}</a></li> - {% if list.has_next %} - <span class="nav-next"> - <a href="/{{ category }}/{{ list.next_page_number }}/" - id="next">[next]</a> - </span> - {% endif %} -</div> + {% if list.has_next %} + <li> + <a href="/{{ category }}/{{ list.next_page_number }}"> + Next + </a> + </li> + {% endif %} + </ul> + </div> + </div> + </div> {% endblock %} diff --git a/ryuslash/static/logo.png b/ryuslash/static/logo.png Binary files differindex a451578..ee37d3b 100644 --- a/ryuslash/static/logo.png +++ b/ryuslash/static/logo.png |
