diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 22:39:59 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 22:39:59 -0500 |
commit | bc432a1ff0e69bf45c5f3b97077a13952611196d (patch) | |
tree | b4e62456fe86dbbb1361d4146eb4e71052a37a89 | |
parent | ea4eb919f8b1645c77df9035acc165c65a56664a (diff) | |
parent | 463676a775646246707fd71dc31752d25715da7e (diff) |
Merge tag 'release_2011-11-09'
Too many new things to count
Conflicts:
templates/public/download.html
templates/public/index.html
-rw-r--r-- | templates/public/download.html | 128 | ||||
-rw-r--r-- | templates/public/index.html | 44 |
2 files changed, 27 insertions, 145 deletions
diff --git a/templates/public/download.html b/templates/public/download.html deleted file mode 100644 index 4a52f0fe..00000000 --- a/templates/public/download.html +++ /dev/null @@ -1,128 +0,0 @@ -{% extends "base.html" %} -{% load cache %} - -{% block title %}Parabola - Downloads{% endblock %} -{% block navbarclass %}anb-download{% endblock %} - -{% block content %} -<div id="arch-downloads" class="box"> - - <h2>Parabola Downloads</h2> - - {% with "2010.12.29" 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 - are intended for new installations only; an existing Parabola system - can always be updated with `pacman -Syu`.</p> - - <ul> - <li><strong>Current Release:</strong> {{ version }}</li> - <li><strong>Included Kernel:</strong> 2.6.36.2</li> - <li><strong>Resources:</strong> - <ul> - <li><a - href="https://lists.parabolagnulinux.org/mailman/listinfo/dev" - title="Parabola Hackers Discussion List">Mailing List</a></li> - </ul> - </li> - <li><strong>Instructions:</strong> - <ul> - <li><a - href="https://wiki.parabolagnulinux.org/installation_guide" - title="Official Installation Guide">Parabola Install Guide</a>. - </li> - </ul> - </li> - </ul> - - <h3>Existing Arch Users</h3> - - <p>If you are an Arch user, there is no need to download the ISO - to update your existing system to Parabola. You can just follow the - instructions in our wiki to convert your existing Arch system into a free - as in freedom one. <a href="https://wiki.parabolagnulinux.org/migration" - title="Migration Guide">More here.</a></p> - - <h3>BitTorrent Download (recommended)</h3> - - <p>If you can spare the bytes, please leave the client open after your - download is finished, so you can seed it back to others. - <em>A web-seed capable client is recommended for fastest download speeds.</em></p> - - <table id="download-torrents" class="pretty1"> - <thead> - <tr> - <th>Format</th> - <th class="cpu-arch">i686 CPU</th> - <th class="cpu-arch">x86-64 CPU</th> - <th class="magnet-link" colspan="2">Magnet Links</th> - <th>Description</th> - </tr> - </thead> - <tbody> - <tr> - <td> - Netinstall Image - </td> - - <td class="cpu-arch"> - <a href="https://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-netinstall-i686.iso.torrent" - title="Download for i686 architecture">Download</a> - </td> - - <td class="cpu-arch"> - <a href="https://repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-netinstall-x86_64.iso.torrent" - title="Download for x86-64 architecture">Download</a> - </td> - - <td class="magnet-link"> - <a href="magnet:?xt=urn:btih:6dac9ac183e18632c33eef3f1823c1f8ce67eaa4&dn=parabola-2010.12.29-netinstall-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce" - title="Magnet Link for ISO image">i686 Magnet</a> - </td> - - <td class="magnet-link"> - <a href="magnet:?xt=urn:btih:f589fa6d0ab73d5fdf3c2f43e64bd3fc250a8daf&dn=parabola-2010.12.29-netinstall-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce" - title="Magnet Link for ISO image">x86_64 Magnet</a> - </td> - - <td class="wrap"> - Downloads and installs packages versions via FTP for absolute freshness. - </td> - </tr><tr> - <td> - Core Image - </td><td class="cpu-arch"> - <a href="https://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.iso.torrent" - title="Download for i686 architecture">Download</a> - </td><td class="cpu-arch"> - <a href="https://repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-core-x86_64.iso.torrent" - title="Download for x86-64 architecture">Download</a> - </td><td class="magnet-link"> - <a href="magnet:?xt=urn:btih:d9bb9f9641a222d2d302988da95225f570bcdb6d&dn=parabola-2010.12.29-core-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce" - title="Magnet Link for ISO image">i686 Magnet</a> - </td><td class="magnet-link"> - <a href="magnet:?xt=urn:btih:fae6de60f0dfa703165e94df5a77e9bd607ef4cf&dn=parabola-2010.12.29-core-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce" - title="Magnet Link for ISO image">x86_64 Magnet</a> - </td><td class="wrap"> - Core packages are included on the media. Good for basic off-line installation. - </td> - </tr> - </tbody> - </table> - - <h3>HTTP/FTP Direct Downloads</h3> - - <p>In addition to the BitTorrent links above, install images can also be - downloaded via HTTP from the site listed below. Please ensure the download - image matches the checksum from the MD5SUMS or SHA256SUMS file in the same - directory as the image.</p> - - <p><a href="https://repo.parabolagnulinux.org/isos/" title="Parabola ISOs - directory">Go to the Parabola ISOs directory.</a></p> - - {%endwith%} - -</div> -{% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index 175e7726..81c03090 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% load markup %} -{% load cache %} -{% load cdn %} +{% load markup cache cdn %} {% block head %} <link rel="alternate" type="application/rss+xml" title="Parabola News Updates" href="/feeds/news/" /> @@ -12,7 +10,7 @@ {% cache 300 main-page-left secure %} <div id="intro" class="box"> - <h2>A <em>libre</em> version of Archlinux</h2> + <h2>A <em>libre</em> version of Arch Linux</h2> <p>You've reached the website for <strong>Parabola GNU/Linux-libre</strong>, a project aiming to provide a fully free as in freedom Archlinux, the @@ -20,8 +18,8 @@ Simple.</p> <p>Currently we provide the official libre packages from Arch, plus our own - libre replacements when necessary, all of them optimized for the i686 and - x86-64 architectures.</p> + libre replacements when necessary, all of 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> @@ -115,7 +113,7 @@ <li><a href="https://wiki.parabolagnulinux.org/" title="Community documentation">Wiki</a></li> <li><a href="https://wiki.parabolagnulinux.org/installation_guide" - title="Parabola Installation Guide">Official Parabola Installation Guide</a></li> + title="Official installation guide">Official Installation Guide</a></li> <li><a href="https://wiki.parabolagnulinux.org/Migration" title="Free your Arch instalation">Migration from Archlinux</a></li> </ul> @@ -124,7 +122,7 @@ <ul> <li><a href="https://lists.parabolagnulinux.org/" - title="Community and developer mailing lists">Mailing Lists</a></li> + 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" @@ -141,8 +139,13 @@ <h4>Tools</h4> <ul> + <li><a href="{% url mirrorlist %}" + title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li> + <li><a href="{% url mirror-status %}" + title="Check the status of all known mirrors">Mirror Status</a></li> <li><a href="/packages/differences/" - title="See differences in packages between available architectures">Differences Reports</a></li> + title="See differences in packages between available architectures">Differences Reports</a> + <img src="{% cdnprefix %}/media/new.png" alt="New"/></li> </ul> <h4>Development</h4> @@ -151,15 +154,27 @@ <li><a href="{% url page-keys %}" title="Package/Database signing master keys">Master Keys</a></li> <li><a href="/packages/" - title="View/search the package repository database">Packages</a></li> + title="View/search the package repository database">Packages</a> + <img src="{% cdnprefix %}/media/new.png" alt="New"/></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> - <li><a href="https://bugs.parabolagnulinux.org/" - title="Parabola's Issue Tracker">Issue Tracker</a></li> +{% comment %} + <li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki" + title="Developer Wiki articles">DeveloperWiki</a></li> +{% endcomment %} <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> </ul> <h4>About</h4> @@ -179,11 +194,6 @@ </div><!-- #nav-sidebar --> -{% comment %} -<div id="home-paypal-button" class="widget"> -</div> -{% endcomment %} - <div id="arch-sponsors" class="widget"> <a href="http://gnuchile.org"> <img src="{{ STATIC_URL }}gnuchile.png" |