summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-11-15 01:12:12 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-11-15 01:12:12 -0500
commit38f1b73179154c1fef676021acd6362e88837a89 (patch)
tree14b7789ccb23a7d0715dc9cfc75d3de0d3700dcf /templates
parentaa2836cb3859e05e9524def5ec37706e3299205c (diff)
parent03a0d27971898592698dbb0c5948b93c6a3a4741 (diff)
Merge tag 'release_2012-02-18'
Defend against bogus URLs, mirrorlist no FTP by default Conflicts: templates/public/index.html
Diffstat (limited to 'templates')
-rw-r--r--templates/public/index.html45
1 files changed, 23 insertions, 22 deletions
diff --git a/templates/public/index.html b/templates/public/index.html
index 0d57e505..15db0719 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -25,7 +25,7 @@
<p>You can find us on IRC at <a
href="irc://irc.freenode.net/#parabola">irc.freenode.net/#parabola</a>.</p>
-
+
<p class="readmore"><a href="{% url page-about %}"
title="Learn more about Parabola">Learn more...</a></p>
@@ -39,7 +39,7 @@
</h3>
<a href="/feeds/news/" title="Parabola News RSS Feed"
- class="rss-icon"><img src="{{ STATIC_URL }}rss.png" alt="RSS Feed" /></a>
+ class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
{% for news in news_updates %}
{% if forloop.counter0 < 5 %}
@@ -92,7 +92,7 @@
title="Browse all of the latest packages">more</a>)</span></h3>
<a href="/feeds/packages/" title="Parabola Package Updates RSS Feed"
- class="rss-icon"><img src="{{ STATIC_URL }}rss.png" alt="RSS Feed" /></a>
+ class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
<table>
{% for update in pkg_updates %}
@@ -153,38 +153,31 @@
<h4>Development</h4>
<ul>
- <li><a href="{% url page-keys %}"
- title="Package/Database signing master keys">Master Keys</a>
- <img src="{% cdnprefix %}/media/new.png" alt="New"/></li>
- <li><a href="/packages/"
- title="View/search the package repository database">Packages</a></li>
- <li><a href="/groups/"
- title="View the available package groups">Package Groups</a></li>
- <li><a href="{% url visualize-index %}"
- title="View visualizations">Visualizations</a>
- <img src="{% cdnprefix %}/media/new.png" alt="New"/></li>
-{% comment %}
- <li><a href="{% url page-svn %}"
- title="View SVN entries for packages">SVN Repositories</a></li>
-{% endcomment %}
<li><a href="https://projects.parabolagnulinux.org"
title="Official Parabola projects (git)">Projects in Git</a></li>
{% comment %}
+ <li><a href="{% url page-svn %}"
+ title="View SVN entries for packages">SVN Repositories</a></li>
<li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki"
- title="Developer Wiki articles">DeveloperWiki</a></li>
+ title="Developer Wiki articles">Developer Wiki</a></li>
{% endcomment %}
+ <li><a href="/groups/"
+ title="View the available package groups">Package Groups</a></li>
<li><a href="/todolists/"
title="Hacker Todo Lists">Todo Lists</a></li>
<li><a href="{% url releng-test-overview %}"
title="Releng Testbuild Feedback">Releng Testbuild Feedback</a></li>
+ <li><a href="{% url visualize-index %}"
+ title="View visualizations">Visualizations</a>
+ <img src="{% cdnprefix %}/media/new.png" alt="New"/></li>
</ul>
- <h4>About</h4>
+ <h4>More Resources</h4>
<ul>
- <li><a href="{% url page-about %}"
- title="Learn more about Parabola">About Parabola</a></li>
- <li><a href="/download/" title="Get Parabola">Download Parabola</a></li>
+ <li><a href="{% url page-keys %}"
+ title="Package/Database signing master keys">Signing Master Keys</a>
+ <img src="{% cdnprefix %}/media/new.png" alt="New"/></li>
<li><a href="https://wiki.parabolagnulinux.org/Media"
title="Parabola in the media">Media Appearances</a></li>
<li><a href="{% url page-art %}" title="Parabola logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
@@ -196,7 +189,14 @@
</div><!-- #nav-sidebar -->
+{% comment %}
+<div id="home-donate-button" class="widget">
+donate button would go here
+</div>
+{% endcomment %}
+
<div id="arch-sponsors" class="widget">
+
<a href="http://gnuchile.org">
<img src="{{ STATIC_URL }}gnuchile.png"
alt="GNU Chile - Donates the .org domain"
@@ -218,6 +218,7 @@
alt="Freedom Included - Donated Lemote Yeeloongs to port Parabola to the MIPS architecture"
title="Freedom Included - Donated Lemote Yeeloongs to port Parabola to the MIPS architecture" />
</a>
+
</div>
{% endcache %}
{% endblock %}