summaryrefslogtreecommitdiff
path: root/templates/public
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 20:18:51 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-12 20:18:51 -0500
commit6c5c3355a97d35afb7f1eee284966ad0bf8cee3b (patch)
tree8c68a1c118209a7d18c60d9c3c6960a6ae051bcf /templates/public
parent03558d8b474d91be6cf21310916672ed62e920b7 (diff)
parent5d9f87c02bd8ad73fdb27600e0afe71284e3082f (diff)
Merge tag 'release_2012-04-07'
I hate writing tag messages. Conflicts: packages/templatetags/package_extras.py templates/packages/flag.html templates/packages/flaghelp.html templates/public/download.html templates/public/index.html templates/public/svn.html
Diffstat (limited to 'templates/public')
-rw-r--r--templates/public/index.html16
-rw-r--r--templates/public/keys.html23
2 files changed, 24 insertions, 15 deletions
diff --git a/templates/public/index.html b/templates/public/index.html
index 58d5815d..ebfcde27 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -21,11 +21,15 @@
<p>Currently we provide the official packages from Arch that meet
the <a href="http://www.gnu.org/distros/free-system-distribution-guidelines.html">FSDG</a>,
replacements for those that don't, and our own additions, all of
- them optimized for the i686, x86-64, and mips64el
- architectures.</p>
+ them optimized for the i686, x86-64, and mips64el architectures.</p>
- <p>You can find us on IRC at <a
- href="irc://irc.freenode.net/#parabola">irc.freenode.net/#parabola</a>.</p>
+ <p>Our strong community is diverse and helpful. Please
+ check out our <a href="irc://chat.freenode.net#parabola" title="IRC channel">IRC channel</a>
+ and <a href="https://lists.parabolagnulinux.org/mailman/listinfo/"
+ title="Parabola Mailing Lists">mailing lists</a>
+ to get your feet wet. Also glance through our <a href="https://wiki.parabolagnulinux.org/"
+ title="Parabola Wiki">wiki</a>
+ if you want to learn more about Parabola.</p>
<p class="readmore"><a href="{% url 'page-about' %}"
title="Learn more about Parabola">Learn more...</a></p>
@@ -121,13 +125,13 @@
<h4>Community</h4>
<ul>
- <li><a href="https://lists.parabolagnulinux.org/"
+ <li><a href="https://lists.parabolagnulinux.org/mailman/listinfo/"
title="Community and developer mailing lists">Mailing Lists</a></li>
<li><a href="https://lists.parabolagnulinux.org/pipermail/dev/"
title="dev mailing list archives">Dev Archives</a></li>
<li><a href="https://wiki.parabolagnulinux.org/IRC_Channels"
title="Official and regional IRC communities">IRC Channels</a></li>
- <li><a href="http://identi.ca/group/parabola" title="Parabola at identi.ca">Identi.ca group</a></li>
+ <li><a href="https://identi.ca/group/parabola" title="Parabola at identi.ca">Identi.ca group</a></li>
</ul>
<h4>Support</h4>
diff --git a/templates/public/keys.html b/templates/public/keys.html
index f0aa310e..257a16ae 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load static from staticfiles %}
{% load pgp %}
{% block title %}Parabola - Master Signing Keys{% endblock %}
@@ -66,17 +67,11 @@
<table class="pretty2" id="key-status">
<thead>
<tr>
- <th></th>
+ <th>Developer</th>
<th>PGP Key</th>
{% for key in keys %}
- <th>{{ key.owner.get_full_name }}</th>
- {% endfor %}
- </tr>
- <tr>
- <th></th>
- <th></th>
- {% for key in keys %}
- <th>{% pgp_key_link key.pgp_key %}</th>
+ <th>{{ key.owner.get_full_name }}<br/>
+ {% pgp_key_link key.pgp_key %}</th>
{% endfor %}
</tr>
</thead>
@@ -94,4 +89,14 @@
</tbody>
</table>
</div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+ $("#key-status").tablesorter({
+ headers: { 1: { sorter: false } }
+ });
+});
+</script>
{% endblock %}