diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
commit | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (patch) | |
tree | 032ae62668538be964f57a12018d1ab9f696be5f /templates/public | |
parent | fbd23db51b7160a308cd88e407e676994eb08b10 (diff) | |
parent | 617550628b39f94e6cb11ec032eb18e6195bf64a (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/packages_list.html
templates/packages/search.html
templates/packages/signoffs.html
templates/public/about.html
templates/public/download.html
templates/public/index.html
templates/public/svn.html
templates/releng/results.html
templates/todolists/view.html
Diffstat (limited to 'templates/public')
-rw-r--r-- | templates/public/download.html | 5 | ||||
-rw-r--r-- | templates/public/index.html | 33 |
2 files changed, 31 insertions, 7 deletions
diff --git a/templates/public/download.html b/templates/public/download.html index 7c123b3f..5c5cf5bd 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -9,7 +9,8 @@ <h2>Parabola Downloads</h2> - {% with "2010.12.29" as version %} <h3>Release Info</h3> + {% with "2011.09.1" as version %} + <h3>Release Info</h3> <p>All available images can be burned to a CD, mounted as an ISO file, or be directly written to a USB stick using a utility like `dd`. These @@ -18,7 +19,7 @@ <ul> <li><strong>Current Release:</strong> {{ version }}</li> - <li><strong>Included Kernel:</strong> 2.6.36.2</li> + <li><strong>Included Kernel:</strong> 3.0.3</li> <li><strong>Resources:</strong> <ul> <li><a diff --git a/templates/public/index.html b/templates/public/index.html index 6254d7b0..c68baedb 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -33,17 +33,40 @@ <div id="news"> - <h3>Latest News <span class="more">(<a href="{% url news-list %}" - title="Browse the news archives">more</a>)</span></h3> + <h3> + <a href="{% url news-list %}" title="Browse the news archives">Latest News</a> + <span class="arrow"></span> + </h3> <a href="/feeds/news/" title="Parabola News RSS Feed" class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a> {% for news in news_updates %} - <h4><a href="{{ news.get_absolute_url }}" - title="View full article: {{ news.title }}">{{ news.title }}</a></h4> + {% if forloop.counter0 < 5 %} + <h4> + <a href="{{ news.get_absolute_url }}" + 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> + {% else %} + {% if forloop.counter0 == 5 %} + <h3> + <a href="{% url news-list %}" + title="Browse the news archives">Older News</a> + <span class="arrow"></span> + </h3> + <dl class="newslist"> + {% endif %} + <dt>{{ news.postdate|date }}</dt> + <dd> + <a href="{{ news.get_absolute_url }}" + title="View full article: {{ news.title }}">{{ news.title }}</a> + </dd> + {% if forloop.last %} + </dl> + {% endif %} + {% endif %} {% endfor %} </div><!-- #news --> @@ -75,7 +98,7 @@ {% for update in pkg_updates %} <tr> <td class="pkg-name"><span class="{{ update.repo|lower }}">{{ update.pkgbase }} {{ update.version }}</span></td> - <td class="pkg-arch"> + <td class="pkg-arch"> {% for pkg in update.package_links %}<a href="{{ pkg.get_absolute_url }}" title="Details for {{ pkg.pkgname }} [{{ pkg.repo|lower }}]">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %} </td> |