summaryrefslogtreecommitdiff
path: root/templates/public
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 17:18:41 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 17:18:41 -0500
commitc0d6f0711c4760f08a6beb99818d075d7c993e2e (patch)
treee4a580d7b70181e9d5e36a8c438c63d0d7b63450 /templates/public
parentf286e9560e63a776397494899673b103f92f3198 (diff)
parent6ee65265a051933ee154c42490fdc509b9994202 (diff)
Merge tag 'release_2012-03-12'
Signature stuff and template tweaks Conflicts: templates/public/index.html
Diffstat (limited to 'templates/public')
-rw-r--r--templates/public/index.html12
1 files changed, 4 insertions, 8 deletions
diff --git a/templates/public/index.html b/templates/public/index.html
index 444d2908..fa8bb8fb 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -9,7 +9,6 @@
{% block content_left %}
{% cache 62 main-page-left secure %}
<div id="intro" class="box">
-
<h2>A <em>libre</em> version of Arch Linux</h2>
<p>You've reached the website for <strong>Parabola GNU/Linux-libre</strong>,
@@ -28,11 +27,9 @@
<p class="readmore"><a href="{% url page-about %}"
title="Learn more about Parabola">Learn more...</a></p>
-
</div>
<div id="news">
-
<h3>
<a href="{% url news-list %}" title="Browse the news archives">Latest News</a>
<span class="arrow"></span>
@@ -48,7 +45,10 @@
title="View full article: {{ news.title }}">{{ news.title }}</a>
</h4>
<p class="timestamp">{{ news.postdate|date }}</p>
- <div class="article-content">{{ news.content|markdown|truncatewords_html:75 }}</div>
+ <div class="article-content">
+ {% if forloop.counter0 == 0 %}{{ news.content|markdown|truncatewords_html:300 }}
+ {% else %}{{ news.content|markdown|truncatewords_html:100 }}{% endif %}
+ </div>
{% else %}
{% if forloop.counter0 == 5 %}
<h3>
@@ -68,7 +68,6 @@
{% endif %}
{% endif %}
{% endfor %}
-
</div>
{% endcache %}
{% endblock %}
@@ -76,7 +75,6 @@
{% block content_right %}
{% cache 59 main-page-right secure %}
<div id="pkgsearch" class="widget">
-
<form id="pkgsearch-form" method="get" action="/packages/">
<fieldset>
<label for="pkgsearch-field">Package Search:</label>
@@ -87,7 +85,6 @@
</div>
<div id="pkg-updates" class="widget box">
-
<h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
title="Browse all of the latest packages">more</a>)</span></h3>
@@ -108,7 +105,6 @@
</div>
<div id="nav-sidebar" class="widget">
-
<h4>Documentation</h4>
<ul>