Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:wanderer/occupywallst

  • Loading branch information...
commit 6dde22bcc1c4f895bb230ce98528f64ad10390ae 2 parents b3d8429 + 897a900
Justine Tunney authored
Showing with 18 additions and 14 deletions.
  1. +18 −14 occupywallst/templates/occupywallst/index.html
View
32 occupywallst/templates/occupywallst/index.html
@@ -37,24 +37,28 @@
{% endwith %}
</div>
</div>
- <div style="width:261px;" id="events">
- <h3 class="column_titles">Upcoming Events</h3><hr>
- {% for event in events %}
- {% ifchanged event.start_date.day %} <span>{{ event.start_date|date:"SHORT_DATE_FORMAT"|center:8 }}</span><br/> {% endifchanged %}
- <span><a href="{{ event.get_absolute_url }}">
- {{ event.title|slice:":30"}}
- {% if event.title|length > 30 %}...{% endif %}
- </a></span>
-
- {% endfor %}
-
+ <div style="width:261px;float:left" >
+ <div>
+ <h3 class="column_titles">Upcoming Events</h3><hr>
+ <ul style="padding-left: 20px; padding-right: 0px;">
+ {% for event in events %}
+ {% ifchanged event.start_date.day %} <span style="font-weight:bold">{{ event.start_date|date:"SHORT_DATE_FORMAT"|center:8 }}</span><br/> {% endifchanged %}
+ <li style="list-style-type: circle"><a href="{{ event.get_absolute_url }}">
+ {{ event.title|slice:":29"}}{% if event.title|length > 30 %}...{% endif %}
+ </a></li>
+ {% endfor %}
+ </ul>
+ </div>
+
<div id="wire">
<h3 class="column_titles" >The Wire</h3><hr>
+ <ul style="padding-left: 20px; padding-right: 0px;">
{% for article in articles %}
- <a style="display:block" href="{{ article.get_absolute_url }}">
- {{ article.title|slice:":30" }}{% if article.title|length > 30 %}...{% endif %}
- </a>
+ <li style="list-style-type: circle"><a style="display:block" href="{{ article.get_absolute_url }}">
+ {{ article.title|slice:":29" }}{% if article.title|length > 30 %}...{% endif %}
+ </a></li>
{% endfor %}
+ </ul>
</div>
<div>
<h3 class="column_titles" >Tweets</h3><hr>
Please sign in to comment.
Something went wrong with that request. Please try again.