diff options
author | Dan McGee <dan@archlinux.org> | 2010-05-24 21:13:46 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2010-05-24 21:13:46 -0500 |
commit | e817efad53bc075ca94e6effd6eb3b6c838e2e63 (patch) | |
tree | 6bd4dae53aca75fef1f7480769ca2c42fe473e85 /templates/public | |
parent | b3e8354cdff4af8117feda0806a7c1104d5bb30e (diff) | |
parent | a24e503a63599fb5495fd85cba5806a34c695bb6 (diff) |
Merge branch 'redesign'
Conflicts:
templates/public/download.html
Diffstat (limited to 'templates/public')
-rw-r--r-- | templates/public/art.html | 193 | ||||
-rw-r--r-- | templates/public/blank.html | 8 | ||||
-rw-r--r-- | templates/public/developer_list.html | 112 | ||||
-rw-r--r-- | templates/public/donate.html | 126 | ||||
-rw-r--r-- | templates/public/download.html | 252 | ||||
-rw-r--r-- | templates/public/feeds.html | 124 | ||||
-rw-r--r-- | templates/public/index.html | 266 | ||||
-rw-r--r-- | templates/public/userlist.html | 13 |
8 files changed, 681 insertions, 413 deletions
diff --git a/templates/public/art.html b/templates/public/art.html index 960a566c..9b0bd62f 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -1,78 +1,129 @@ {% extends "base.html" %} {% block title %}Arch Linux - Artwork{% endblock %} + {% block content %} -<div class="box"> - <h2 class="title">Arch Linux Logos and Artwork</h2> - <h3>Official Packages</h3> - <p>Official logos, artwork, and more are available from the Extra repository. Currently, these packages are:</p> +<div id="artwork" class="box"> + + <h2>Arch Linux Logos and Artwork</h2> + + <h3>Logos for Press Usage</h3> + + <p>The following Arch Linux logos are available for press and other use, subject to + the restrictions of our <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy" + title="Arch Linux Trademark Policy">trademark policy</a>.</p> + + <p><strong>Two-color standard version</strong><br /> + <em>Also available in print-quality + <a href="/media/logos/archlinux-logo-dark-1200dpi.png" + title="Download 1200dpi PNG format">PNG</a> and scalable + <a href="/media/logos/archlinux-logo-dark-scalable.svg" + title="Download scalable SVG format">SVG</a> formats.</em></p> + + <img src="/media/logos/archlinux-logo-dark-90dpi.png" + alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" /> + + <p><strong>Two-color inverted version</strong> (for dark backgrounds)<br /> + <em>Also available in print-quality + <a href="/media/logos/archlinux-logo-light-1200dpi.png" + title="Download 1200dpi PNG format">PNG</a> and scalable + <a href="/media/logos/archlinux-logo-light-scalable.svg" + title="Download scalable SVG format">SVG</a> formats.</em></p> + + <img src="/media/logos/archlinux-logo-light-90dpi.png" + alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" /> + + <p><strong>One-color standard version</strong><br /> + <em>Also available in print-quality + <a href="/media/logos/archlinux-logo-black-1200dpi.png" + title="Download 1200dpi PNG format">PNG</a> and scalable + <a href="/media/logos/archlinux-logo-black-scalable.svg" + title="Download scalable SVG format">SVG</a> formats.</em></p> + + <img src="/media/logos/archlinux-logo-black-90dpi.png" + alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" /> + + <p><strong>One-colour inverted version</strong> (for dark backgrounds)<br /> + <em>Also available in print-quality + <a href="/media/logos/archlinux-logo-white-1200dpi.png" + title="Download 1200dpi PNG format">PNG</a> and scalable + <a href="/media/logos/archlinux-logo-white-scalable.svg" + title="Download scalable SVG format">SVG</a> formats.</em></p> + + <img src="/media/logos/archlinux-logo-white-90dpi.png" + alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" /> + + <h3>Logos and Artwork for the Community</h3> + + <p>Official logos and artwork are also available directly from the + repositories. Currently, these packages are:</p> + <ul> - <li><strong>archlinux-artwork</strong> - official logos, icons and CD labels</li> - <li><strong>archlinux-wallpaper</strong> - a variety of desktop wallpapers for standard and widescreen resolutions</li> - <li><strong>archlinux-themes-gdm</strong> - GDM login themes</li> - <li><strong>archlinux-themes-kde</strong> - KDE themes and icons</li> - <li><strong>archlinux-themes-kdm</strong> - KDM login themes</li> - <li><strong>archlinux-themes-ksplash</strong> - Ksplash themes</li> - <li><strong>archlinux-themes-slim</strong> - SLiM login themes</li> + <li><strong>archlinux-artwork</strong> - official logos, icons and CD labels</li> + <li><strong>archlinux-wallpaper</strong> - a variety of desktop wallpapers + for standard and widescreen resolutions</li> + <li><strong>archlinux-themes-kde</strong> - KDE themes and icons</li> + <li><strong>archlinux-themes-kdm</strong> - KDM login themes</li> + <li><strong>archlinux-themes-slim</strong> - SLiM login themes</li> </ul> - <p>Alternatively, you can <a href="ftp://ftp.archlinux.org/other/artwork/" title="Browse the FTP archives">download the source files via FTP</a>.</p> + + <p>Alternatively, you can <a href="ftp://ftp.archlinux.org/other/artwork/" + title="Browse the FTP archives">download the source files via FTP</a>.</p> + <h3>Former Logos</h3> - <p>Arch has gone through a few iterations of logos and associated artwork. - Here is a good selection of these logos. Several of the later logos can be - clicked on to get either a larger PNG or SVG version of the logo.</p> - <h4>Original Ribbon Logos</h4> - <p> - <img src="/logos/old/archlogo.gif" alt="Ribbon Logo 1"/> - <img src="/logos/old/archlogo2.gif" alt="Ribbon Logo 2"/> - <img src="/logos/old/archlogo_black_plain.png" alt="Ribbon Logo Black"/> - </p> - <p> - <img src="/logos/old/archlogo3.gif" alt="Ribbon Logo Binary 1"/> - <img src="/logos/old/archlogo_white.gif" alt="Ribbon Logo Binary 2"/> - <img src="/logos/old/archlogo_black.gif" alt="Ribbon Logo Binary Black"/> - </p> - <h4>"Arch Blue" Logos</h4> - <p> - <a href="/logos/old/archlinux_logo_2.svg"> - <img src="/logos/old/archblue.png" alt="Arch Blue Full"/> - </a> - <span style="margin-left: 1em;"> - <a href="/logos/old/archlinux_logo_1.svg"> - <img src="/logos/old/archblue2.png" alt="Arch Blue Compact"/> - </a> - </span> - </p> - <h4>"Arch Aqua" Logos</h4> - <p> - <a href="/logos/old/archlinux_logo_aqua.svg"> - <img src="/logos/old/sml_128-archlinux_logo_aqua.png" alt="Arch Aqua"/> - </a> - <a href="/logos/old/scalable/arch_linux_blue.svg"> - <img src="/logos/old/128x128/arch_linux_blue.png" alt="Arch Aqua Blue"/> - </a> - <a href="/logos/old/scalable/arch_linux_white.svg"> - <img src="/logos/old/128x128/arch_linux_white.png" alt="Arch Aqua White"/> - </a> - </p> - <h4>Release-specific Logos</h4> - <p> - <a href="/logos/old/wombat.png" title="Wombat"> - <img src="/logos/old/sml-wombat.png" height="128" alt="Arch Wombat"/> - </a> - </p> - <p> - <a href="/logos/old/scalable/arch_linux_blue_noodle.svg" title="Noodle"> - <img src="/logos/old/128x128/arch_linux_blue_noodle.png" alt="Arch Noodle Blue"/> - </a> - <a href="/logos/old/scalable/arch_linux_white_noodle.svg" title="Noodle"> - <img src="/logos/old/128x128/arch_linux_white_noodle.png" alt="Arch Noodle White"/> - </a> - <a href="/logos/old/scalable/arch_noodles.svg" title="Noodle"> - <img src="/logos/old/128x128/arch_noodles.png" alt="Arch Box of Noodles"/> - </a> - <a href="/logos/old/scalable/pot_arch.svg" title="Noodle"> - <img src="/logos/old/128x128/pot_arch.png" alt="Arch Cup of Noodles"/> - </a> - </p> -</div> -{% endblock %} + <p>Arch has gone through a few generations of branding and what follows are + some of our past logos. Although these images are no longer used frequently, + they remain subject to license restrictions. Email + <strong>tradermarks@archlinux.org</strong> with any questions.</p> + + <h4>Original Ribbon Series</h4> + + <div class="imagelist"> + <img src="/media/logos/legacy/arch-legacy-ribbon1.png" alt="Arch Ribbon Logo 1"/> + <img src="/media/logos/legacy/arch-legacy-ribbon2.png" alt="Arch Ribbon Logo 2"/> + <img src="/media/logos/legacy/arch-legacy-ribbon5.png" alt="Arch Ribbon Logo 5"/> + </div> + + <div class="imagelist"> + <img src="/media/logos/legacy/arch-legacy-ribbon3.png" alt="Arch Ribbon Logo 3"/> + <img src="/media/logos/legacy/arch-legacy-ribbon4.png" alt="Arch Ribbon Logo 4"/> + <img src="/media/logos/legacy/arch-legacy-ribbon6.png" alt="Arch Ribbon Logo 6"/> + </div> + + <h4>"Arch Blue" Series</h4> + + <div class="imagelist"> + <a href="/media/logos/legacy/arch-legacy-blue1.svg" title="Arch Blue"> + <img src="/media/logos/legacy/arch-legacy-blue1.png" alt="Arch Blue"/></a> + <a href="/media/logos/legacy/arch-legacy-blue2.svg" title="Arch Blue Vertical"> + <img src="/media/logos/legacy/arch-legacy-blue2.png" alt="Arch Blue Vertical"/></a> + </div> + + <h4>"Arch Aqua" Series</h4> + + <div class="imagelist"> + <a href="/media/logos/legacy/arch-legacy-aqua.svg" title="Arch Aqua"> + <img src="/media/logos/legacy/arch-legacy-aqua.png" alt="Arch Aqua" /></a> + <a href="/media/logos/legacy/arch-legacy-aqua-blue.svg" title="Arch Aqua Blue"> + <img src="/media/logos/legacy/arch-legacy-aqua-blue.png" alt="Arch Aqua Blue" /></a> + <a href="/media/logos/legacy/arch-legacy-aqua-white.svg" title="Arch Aqua White"> + <img src="/media/logos/legacy/arch-legacy-aqua-white.png" alt="Arch Aqua White" /></a> + </div> + + <h4>Release-specific Series</h4> + + <div class="imagelist"> + <a href="/media/logos/legacy/arch-legacy-wombat-lg.png" title="Arch Wombat"> + <img src="/media/logos/legacy/arch-legacy-wombat.png" alt="Arch Wombat" /></a> + <a href="/media/logos/legacy/arch-legacy-noodle-blue.svg" title="Arch Noodle Blue"> + <img src="/media/logos/legacy/arch-legacy-noodle-blue.png" alt="Arch Noodle Blue" /></a> + <a href="/media/logos/legacy/arch-legacy-noodle-white.svg" title="Arch Noodle White"> + <img src="/media/logos/legacy/arch-legacy-noodle-white.png" alt="Arch Noodle White" /></a> + <a href="/media/logos/legacy/arch-legacy-noodle-box.svg" title="Arch Box of Noodles"> + <img src="/media/logos/legacy/arch-legacy-noodle-box.png" alt="Arch Box of Noodles" /></a> + <a href="/media/logos/legacy/arch-legacy-noodle-cup.svg" title="Arch Cup of Noodles"> + <img src="/media/logos/legacy/arch-legacy-noodle-cup.png" alt="Arch Cup of Noodles" /></a> + </div> + +</div><!-- #artwork --> +{% endblock %} diff --git a/templates/public/blank.html b/templates/public/blank.html index f0bcedf4..2a8c83f4 100644 --- a/templates/public/blank.html +++ b/templates/public/blank.html @@ -1,10 +1,8 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Sample Page Title{% endblock %} {% block content %} -<div class="box"> - <h2 class="title">Download Arch Linux</h2> - <br /><br /> +<div id="sample-page-id" class="box"> + <h2>Sample page title</h2> </div> -<br /><br /> {% endblock %} - diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index ff38b26a..61a612c6 100644 --- a/templates/public/developer_list.html +++ b/templates/public/developer_list.html @@ -1,59 +1,67 @@ - <div id="devlist"> +<div id="arch-bio-toc"> + + <p> {% for dev in dev_list %} - <a href="#{{ dev.username }}">{{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> + <a href="#{{ dev.username }}" title="Jump to profile for {{ dev.get_full_name }}"> + {{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> {% endfor %} - </div><br /><br /> + </p> + +</div> - <table class="center" cellpadding="20"> +<table class="arch-bio-entry"> {% for dev in dev_list %} {% with dev.get_profile as prof %} - <tr> - <td class="devpic"> - <img src="{{ prof.picture.url }}" height="175" width="175" style="border:1px solid black" alt="Image for {{ prof.alias }}"/> - </td><td> - <a name="{{ dev.username }}"></a> - <table class="deventry" cellspacing="5"> - <tr> - <th>Name:</th> - <td>{{ dev.get_full_name }}</td> - </tr><tr> - <th>Alias:</th> - <td>{{ prof.alias }}</td> - </tr><tr> - <th>Email:</th> - <td>{{ prof.public_email }}</td> - </tr><tr> - <th>Other Contact:</th> - <td>{{ prof.other_contact }}</td> - </tr><tr> - <th>Roles:</th> - <td>{{ prof.roles }}<br /> - </td> - </tr><tr> - <th>Website:</th> - <td>{% if prof %}<a href="{{ prof.website }}">{{ prof.website }}</a>{% endif %}</td> - </tr><tr> - <th>Occupation:</th> - <td>{{ prof.occupation }}</td> - </tr><tr> - <th>YOB:</th> - <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td> - </tr><tr> - <th>Location:</th> - <td>{{ prof.location }}</td> - </tr><tr> - <th>Languages:</th> - <td>{{ prof.languages }}</td> - </tr><tr> - <th>Interests:</th> - <td>{{ prof.interests }}</td> - </tr><tr> - <th>Favorite Distros:</th> - <td>{{ prof.favorite_distros }}</td> - </tr> - </table> - </td> - </tr> + <tr> + <td class="pic pic-{{ dev.username }}"> + <img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/> + </td> + <td> + <a name="{{ dev.username }}"></a> + <table class="bio bio-{{ dev.username }}" cellspacing="0"> + <tr> + <th>Name:</th> + <td>{{ dev.get_full_name }}</td> + </tr><tr> + <th>Alias:</th> + <td>{{ prof.alias }}</td> + </tr><tr> + <th>Email:</th> + <td>{{ prof.public_email }}</td> + </tr><tr> + <th>Other Contact:</th> + <td>{{ prof.other_contact }}</td> + </tr><tr> + <th>Roles:</th> + <td>{{ prof.roles }}<br /> + </td> + </tr><tr> + <th>Website:</th> + <td>{% if prof %}<a href="{{ prof.website }}" + title="Visit the website for {{ dev.get_full_name }}"> + {{ prof.website }}</a>{% endif %}</td> + </tr><tr> + <th>Occupation:</th> + <td>{{ prof.occupation }}</td> + </tr><tr> + <th>YOB:</th> + <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td> + </tr><tr> + <th>Location:</th> + <td>{{ prof.location }}</td> + </tr><tr> + <th>Languages:</th> + <td>{{ prof.languages }}</td> + </tr><tr> + <th>Interests:</th> + <td>{{ prof.interests }}</td> + </tr><tr> + <th>Favorite Distros:</th> + <td>{{ prof.favorite_distros }}</td> + </tr> + </table> + </td> + </tr> {% endwith %} {% endfor %} - </table> +</table> diff --git a/templates/public/donate.html b/templates/public/donate.html index a14f20ed..acbb077c 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -1,58 +1,86 @@ {% extends "base.html" %} -{% block title %}Arch Linux - Donors{% endblock %} +{% block title %}Arch Linux - Donate{% endblock %} + {% block content %} -<div class="box"> - <h2 class="title">Donate to Arch Linux</h2> - <p> - Arch Linux survives because of the tireless efforts of many people in - the community and the core development circle. None of us are paid for our - work, and we don't have the personal funds to sustain server costs ourselves. - </p><p> - There are many ways to help Arch Linux. If technical development, +<div id="donations" class="box"> + + <h2>Donate to Arch Linux</h2> + + <p>Arch Linux survives because of the tireless efforts of many people in + the community and the core development circle. None of us are paid for + our work, and we don't have the personal funds to sustain server costs + ourselves.</p> + + <p>There are many ways to help support Arch Linux. If technical development, documentation, or support aren't your strong points, you could certainly - help us by dropping a few bucks our way. - </p><p> - Many thanks! - </p> - <div style="text-align:center"> + help us by dropping a few bucks our way.</p> + + <p>Many thanks!</p> + + <h3>Monetary donations</h3> + + <p>Financial contributions are accepted via <a title="Click to donate now" + href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=aaronmgriffin@gmail.com¤cy_code=USD">PayPal</a>. + Funds are used for server hardware upgrades, conventions, schwag giveaways and more.</p> + + <div id="paypal-button"> <!-- paypal code --> - <form action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <input type="hidden" name="cmd" value="_xclick"/> - <input type="hidden" name="business" value="aaronmgriffin@gmail.com"/> - <input type="hidden" name="currency_code" value="USD"/> - <input type="hidden" name="tax" value="0"/> - <input type="hidden" name="lc" value="US"/> - <input type="hidden" name="bn" value="PP-DonationsBF"/> - <input type="hidden" name="item_name" value="Arch Linux Donation"/> - <input type="hidden" name="image_url" value="/logos/arch-paypal.jpg"/> - <input type="hidden" name="no_shipping" value="1"/> - <input type="hidden" name="cn" value="Suggestions/Comments"/> - <input type="hidden" name="no_note" value="1"/> - <input type="image" src="/media/donate.gif" border="0" name="submit" - alt="Make payments with PayPal - it's fast, free and secure!" - style="background: transparent; border: none"/> + <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <p><input type="hidden" name="cmd" value="_xclick"/></p> + <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p> + <p><input type="hidden" name="currency_code" value="USD"/></p> + <p><input type="hidden" name="tax" value="0"/></p> + <p><input type="hidden" name="lc" value="US"/></p> + <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p> + <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p> + <p><input type="hidden" name="no_shipping" value="1"/></p> + <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p> + <p><input type="hidden" name="no_note" value="1"/></p> + <p><input type="image" src="/media/donate.gif" name="submit" + title="Make a PayPal donation to the Arch Linux project" + alt="Make a PayPal donation to the Arch Linux project" + style="background:transparent;border:none;" /></p> </form> </div> - <br /> - <h2 class="title">Sponsors and Contributions</h2> - <p>We'd like to thank <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network">Velocity Network</a> for contributing space in a server rack, bandwidth, and electricity for our main server for the last couple of years.</p> - <div style="text-align:center"> - <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="/media/vnet_button.png" class="" title="" alt="velocity network - it's about time" /></a> - </div> - <p>We also wish to extend a special Thank You to <a href="https://www.sevenl.net/?utm_source=archlinux-org&utm_medium=sponsored-banner&utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a> for their generous and ongoing contribution of a dedicated Arch Linux server. You too can have a dedicated Arch Linux server hosted by SevenL...head over to their <a href="https://www.sevenl.net/dedicated-server/?utm_source=archlinux-org&utm_medium=sponsored-banner&utm_campaign=thanks-to-sevenl" title="SevenL Networks - dedicated server hosting">website</a> for more details.</p> - <div style="text-align:center"> - <a href="https://www.sevenl.net/?utm_source=archlinux-org&utm_medium=sponsored-banner&utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a> - </div> - <p>More thanks go to <a href="http://www.airvm.com/VirtualServers" title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p> - <div style="text-align:center"> - <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" class="" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a> + + <h3>Commercial sponsors and contributions</h3> + + <p>We'd like to thank <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" + title="velocity network">Velocity Network</a> for contributing space + in a server rack, bandwidth, and electricity for our main server.</p> + + <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" + title="velocity network"><img src="/media/vnet_button.png" class="sponsor-btn-vnet" + title="" alt="velocity network - it's about time" /></a> + + <p>We also wish to extend a special Thank You to <a + href="https://www.sevenl.net/?utm_source=archlinux-org&utm_medium=sponsored-banner&utm_campaign=thanks-to-sevenl" + title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a> + for their generous and ongoing contribution of a dedicated Arch Linux + server . You too can have a dedicated Arch Linux server hosted by SevenL... + head over to their website for more details.</p> + + <a href="https://www.sevenl.net/?utm_source=archlinux-org&utm_medium=sponsored-banner&utm_campaign=thanks-to-sevenl" + title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" + class="sponsor-btn-sevenl" title="A big Thank You to SevenL Networks for their generous contribution" + alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a> + + <p>More thanks go to <a href="http://www.airvm.com/VirtualServers" + title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p> + + <a href="http://www.airvm.com/VirtualServers" + title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" + class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a> + + <h3>Past donors</h3> + + <div id="donor-list"> + <ul> + {% for donor in donors %} + <li>{{ donor.name }}</li>{% endfor %} + </ul> </div> - <h2 class="title">Past Donors</h2> - <ul id="donorlist"> - {% for donor in donors %} - <li>{{ donor.name }}</li>{% endfor %} - </ul> - <div class="clear"/> + <div class="clear"></div> + <p>A huge thanks to you all for your contributions!</p> </div> {% endblock %} - diff --git a/templates/public/download.html b/templates/public/download.html index 6d7656b0..3808222a 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -1,113 +1,157 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Downloads{% endblock %} {% block content %} -<div class="box"> - <h2 class="title">Release Info</h2> - <div style="text-align:center"> - <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 Arch Linux system - can always be updated with `pacman -Syu`.</p> - - <b>Current Release:</b> 2010.05 <br /> - <b>Included Kernel:</b> 2.6.33.4 <br /> - <b>Resources:</b> - <a href="http://bugs.archlinux.org/index.php?project=6">Bug Tracker</a> - - - <a href="http://www.archlinux.org/mailman/listinfo/arch-releng">Mailing List</a> - <br /> - <br /> - <b>Links and Instructions:</b><br /> - <a href="http://www.archlinux.org/iso/2010.05/README"> - Downloading Instructions - </a> - <br /> - <a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"> - Arch Linux Install Guide - </a> - </div> - <h2 class="title">BitTorrent Download (recommended)</h2> - <div style="text-align:center"> - <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. A web-seed - capable client is recommended for fastest download speeds.</p> - - <h3>Netinstall ISOs</h3> - <p> - <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-i686.iso.torrent">i686</a> - <br /> - <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-x86_64.iso.torrent">x86_64</a> - <br /> - <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-dual.iso.torrent">Dual Arch</a> - </p> - - <h3>Core ISOs</h3> - <p> - <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-i686.iso.torrent">i686</a> - <br /> - <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-x86_64.iso.torrent">x86_64</a> - <br /> - <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-dual.iso.torrent">Dual Arch</a> - </p> - - </div> - <h2 class="title">Buy A CD</h2> - <div style="text-align:center"> - These suppliers donate a small percentage of each CD purchased to - the Arch Linux project: - <table class="center" cellspacing="10"> - <tr><td> - <a href="http://www.osdisc.com/cgi-bin/distro/index.cgi?distro=archlinux"> - Purchase CD from OSDisc</a> - </td></tr> - <tr><td> - <a href="http://www.shoplinuxonline.com/index.php?main_page=index&cPath=1_46&zenid=ecd15b48affe8976130bc575c1276ee4"> - Purchase CD from Shop Linux Online</a> - </td></tr> - </table> - You can also purchase Arch on CD from these suppliers: - <table class="center" cellspacing="10"> +<div id="arch-downloads" class="box"> + + <h2>Arch Linux Downloads</h2> + + {% with "2010.05" 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 Arch Linux system + can always be updated with `pacman -Syu`.</p> + + <ul> + <li><strong>Current Release:</strong> {{ version }}</li> + <li><strong>Included Kernel:</strong> 2.6.33.4</li> + <li><strong>Resources:</strong> + <ul> + <li><a href="http://bugs.archlinux.org/index.php?project=6" + title="Arch Linux Bugtracker:Release Engineering">Bug Tracker</a></li> + <li><a href="http://www.archlinux.org/mailman/listinfo/arch-releng" + title="Arch Linux Release Engineering mailing list">Mailing List</a></li> + </ul> + </li> + </ul> + + <p><strong>Links and Instructions:</strong></p> + + <ul id="download-help"> + <li><a href="http://www.archlinux.org/iso/{{ version }}/README" + title="Official download instructions">Readme and Instructions</a></li> + <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide" + title="Official Installation Guide">Arch Linux Install Guide</a></li> + </ul> + + <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="cpu-arch">Dual Architecture</th> + <th>Description</th> + </tr> + </thead> + <tbody> <tr> <td> - <a href="http://www.linuxcd.org/view_distro.php?id_distro=48">Purchase CD from LinuxCD</a> + Netinstall Image + </td><td class="cpu-arch"> + <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-i686.iso.torrent" + title="Download for i686 architecture">Download</a> + </td><td class="cpu-arch"> + <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-x86_64.iso.torrent" + title="Download for x86-64 architecture">Download</a> + </td><td class="cpu-arch"> + <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent" + title="Download for both architectures">Download</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="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent" + title="Download for i686 architecture">Download</a> + </td><td class="cpu-arch"> + <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent" + title="Download for x86-64 architecture">Download</a> + </td><td class="cpu-arch"> + <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent" + title="Download for both architectures">Download</a> + </td><td class="wrap"> + Core packages are included on the media. Good for basic off-line installation. + </td> + </tbody> + </table> + {% endwith %} + + <h3>Get Arch Linux on CD</h3> + + <p>The following suppliers donate a portion of their proceeds to the + Arch Linux project:</p> + + <ul id="cd-vendors-donate"> + <li><a href="http://www.osdisc.com/cgi-bin/distro/index.cgi?distro=archlinux" + title="Purchase a CD from OSDisc">Purchase a CD from OSDisc</a></li> + <li><a href="http://www.shoplinuxonline.com/index.php?main_page=index&cPath=1_46&zenid=ecd15b48affe8976130bc575c1276ee4" + title="Purchase a CD from Shop Linux Online">Purchase a CD from Shop Linux Online</a></li> + </ul> + + <p>Arch Linux CDs are also available for purchase from these suppliers:</p> + + <ul id="cd-vendors"> + <li><a href="http://www.linuxcd.org/view_distro.php?id_distro=48" + title="Purchase a CD from LinuxCD">Purchase a CD from LinuxCD</a></li> + </ul> + + + <h3>HTTP/FTP Direct Downloads</h3> + + <p>In addition to the BitTorrent links above, install images can also be + downloaded via HTTP or FTP from the mirror sites listed below. Please + ensure the download image matches the checksum from the md5sums.txt or + sha1sums.txt file in the same directory as the image.</p> + + <h4>Checksums</h4> + + <p>File integrity checksums for the latest releases can be found below:</p> + + <ul> + <li><a href="http://www.archlinux.org/iso/{{version}}/sha1sums.txt" + title="Get the latest SHA1 checksums">SHA1 checksums</a></li> + <li><a href="http://www.archlinux.org/iso/{{version}}/md5sums.txt" + title="Get the latest MD5 checksums">MD5 checksums</a></li> + </ul> + + <table id="download-mirrors"> + <thead> + <tr> + <th><h4>Server Location</h4></th> + <th><h4>Download</h4></th> + </tr> + </thead> + <tbody> + <tr><td colspan="2"> + {% for mirror_url in mirror_url_list %} + {% ifchanged mirror_url.mirror.country %} + </td></tr> + <tr><td class="mirror-country" colspan="2"><strong>{{mirror_url.mirror.country}}</strong> + {% endifchanged %} + {% ifchanged mirror_url.mirror.name %} </td></tr> - </table> - </div> - - - <h2 class="title">HTTP/FTP Download</h2> - <div style="text-align:center"> - <p>In addition to the BitTorrent links above, ISO images can also be - downloaded via HTTP or FTP from the mirror sites listed below. Please - ensure the download image matches the checksum from the md5sums.txt or - sha1sums.txt file in the same directory as the image.</p> - <h3>Checksums</h3> - <p> - <a href="http://www.archlinux.org/iso/2010.05/sha1sums.txt">SHA1</a> - <br /> - <a href="http://www.archlinux.org/iso/2010.05/md5sums.txt">MD5</a> - </p> - - <table class="center"> - <tr><td colspan="2"><h3>Mirror Sites</h3> - {% for mirror_url in mirror_url_list %} - {% ifchanged mirror_url.mirror.country %} - </td></tr> - <tr><td colspan="2" style="text-align: left"><br /><h4>{{mirror_url.mirror.country}}</h4> - {% endifchanged %} - {% ifchanged mirror_url.mirror.name %} - </td></tr> - <tr><td style="text-align: left">{{mirror_url.mirror.name}}</td><td style="text-align: right"> - {% endifchanged %} - (<a href="{{mirror_url.url}}iso/">{{mirror_url.protocol.protocol}}</a>) - {% endfor %} + <tr><td class="mirror-server">{{mirror_url.mirror.name}}</td><td> + {% endifchanged %} + <a href="{{mirror_url.url}}iso/" + title="Download from {{mirror_url.url}}iso/">{{mirror_url.protocol.protocol|upper}}</a> + {% endfor %} </td></tr> - </table> - <p>If you want to become an Official Arch Linux Mirror please follow - the instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>. - </p> - </div> + </tbody> + </table> + + <p>If you want to become an Official Arch Linux Mirror please follow the + instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p> + </div> -<br /><br /> {% endblock %} - diff --git a/templates/public/feeds.html b/templates/public/feeds.html index a3502cf5..553aa3e5 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -1,16 +1,29 @@ {% extends "base.html" %} {% block title %}Arch Linux - RSS Feeds{% endblock %} + {% block content %} -<div class="box"> - <h2 class="title">RSS Feeds</h2> - <br /><br /> +<div id="rss-feeds" class="box"> + + <h2>RSS Feeds</h2> + <p>Several RSS feeds are available for consumption from the Arch website. - The majority of these are package related and allow feeds to be customized + The majority of these are package-related and allow feeds to be customized for the updates you care about.</p> - <p>Grab the <a href="/feeds/news/">news item feed <img src="/media/rss.png" alt="RSS Feed" /></a> + + <h3>News and Activity Feeds</h3> + + <p>Grab the <a href="/feeds/news/" class="rss" title="Arch Linux News feed">news item feed</a> to keep up-to-date with the latest news from the Arch Linux development staff.</p> - <p>If you are interested in - <a href="/feeds/packages/">all package updates <img src="/media/rss.png" alt="RSS Feed" /></a>, + + <p>The <a href="http://wiki.archlinux.org/index.php?title=Special:RecentChanges&feed=rss" + title="ArchWiki Recent Changes feed" class="rss">Arch Wiki: Recent changes feed</a> + is also available to track document changes from the <a href="http://wiki.archlinux.org/" + title="Arch Wiki community documentation">Arch Wiki</a>.</p> + + <h3>Package Feeds</h3> + + <p>If you are interested in <a href="/feeds/packages/" class="rss" + title="Arch Linux all package update feed">all package updates</a>, then grab this feed. Note that when a package is updated for multiple architectures, you will see each individual update show up here. Alternatively, you can select a packages feed from the below table that is @@ -18,25 +31,84 @@ architecture, there are a variety of feeds you can choose from. Note that feeds for a specific architecture, such as 'i686', will also include all package updates for 'any' (architecture-independent) packages.</p> - <table id="feedlist" class="center"> - <tr> - <th>Architecture</th> - <th>All Repos</th> - {% for repo in repos %} - <th>{{ repo }}</th> - {% endfor %} - </tr> - {% for arch in arches %} - <tr> - <td><strong>{{ arch }}</strong></td> - <td><a href="/feeds/packages/{{ arch }}/">Feed <img src="/media/rss.png" alt="RSS Feed" /></a></td> - {% for repo in repos %} - <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/">Feed <img src="/media/rss.png" alt="RSS Feed" /></a></td> + + <table class="pretty2"> + <thead> + <tr> + <th>Architecture</th> + <th>All Repos</th> + {% for repo in repos %} + <th>{{ repo }}</th> + {% endfor %} + </tr> + </thead> + <tbody> + {% for arch in arches %} + <tr> + <td><strong>{{ arch }}</strong></td> + <td><a href="/feeds/packages/{{ arch }}/" class="rss">Feed</a></td> + {% for repo in repos %} + <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/" class="rss">Feed</a></td> + {% endfor %} + </tr> {% endfor %} - </tr> - {% endfor %} + </tbody> </table> -</div> -<br /><br /> -{% endblock %} + <p>A <a href="http://aur.archlinux.org/rss.php" class="rss" title="AUR + newest packages feed">Newest Packages feed</a> is also available from + the <a href="http://aur.archlinux.org/" title="AUR Homepage">Arch User + Repository (AUR)</a>.</p> + + <h3>Development Feeds</h3> + + <p>Subscribe to any of the following to track bug tickets and feature + requests from the <a href="http://bugs.archlinux.org/" title="Arch Linux + Bugs">Arch Linux Bugtracker</a>:</p> + + <table class="pretty2"> + <thead> + <tr> + <th>Project</th> + <th>Recently Opened Tasks</th> + <th>Recently Edited Tasks</th> + <th>Recently Closed Tasks</th> + </tr> + </thead> + <tbody> + <tr> + <td>All Projects</td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&project=99" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=99" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=99" class="rss">Feed</a></td> + </tr><tr> + <td>Arch Linux</td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&project=1" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=1" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=1" class="rss">Feed</a></td> + </tr><tr> + <td>Release Engineering</td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&project=6" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=6" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=6" class="rss">Feed</a></td> + </tr><tr> + <td>Pacman Development</td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&project=3" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=3" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=3" class="rss">Feed</a></td> + </tr><tr> + <td>Community Packages</td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&project=5" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=5" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=5" class="rss">Feed</a></td> + </tr><tr> + <td>AUR</td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&project=2" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=2" class="rss">Feed</a></td> + <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=2" class="rss">Feed</a></td> + </tr> + </tbody> + </table> + + </div> +{% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index c403e08a..09239bde 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -6,127 +6,191 @@ {% endblock %} {% block content_left %} - <div id="about" class="box"> - <h2>Welcome to Arch!</h2> - <p> - You've reached the website for <strong>Arch Linux</strong>, a lightweight - and flexible Linux® distribution that tries to Keep It Simple. - </p><p> - Currently we have official packages optimized for the i686 and x86-64 - architectures. We complement our official package sets with a - <a href="http://aur.archlinux.org">community-operated package repository</a> - that grows in size and quality each and every day. - </p><p> - Our strong community is diverse and helpful, and we pride ourselves on - the range of skillsets and uses for Arch that stem from it. Please - check out our <a href="http://bbs.archlinux.org">forums</a> and - <a href="http://www.archlinux.org/mailman/listinfo/">mailing lists</a> - to get your feet wet. Also glance through our <a href="http://wiki.archlinux.org">wiki</a> - if you want to learn more about Arch. - </p><p style="text-align: right"> - <a href="{% url page-about %}"><span style="font-size:x-small">Learn more...</span></a> - </p> - </div> - <br /><br /> - <div style="float:right;position:relative;bottom:-25px"> - <a href="/feeds/news/"><img src="/media/rss.png" alt="RSS Feed" /></a> - </div> - <h2 class="title">Latest News</h2> - <div> +<div id="intro" class="box"> + + <h2>A simple, lightweight distribution</h2> + + <p>You've reached the website for <strong>Arch Linux</strong>, a + lightweight and flexible Linux® distribution that tries to Keep It + Simple.</p> + + <p>Currently we have official packages optimized for the i686 and + x86-64 architectures. We complement our official package sets with a + <a href="http://aur.archlinux.org" title="Arch User Repository (AUR)"> + community-operated package repository</a> that grows in size and + quality each and every day.</p> + + <p>Our strong community is diverse and helpful, and we pride ourselves + on the range of skillsets and uses for Arch that stem from it. Please + check out our <a href="http://bbs.archlinux.org" title="Arch Forums">forums</a> + and <a href="http://www.archlinux.org/mailman/listinfo/" title="Arch Mailing Lists">mailing lists</a> + to get your feet wet. Also glance through our <a href="http://wiki.archlinux.org" title="Arch Wiki">wiki</a> + if you want to learn more about Arch.</p> + + <p class="readmore"><a href="{% url page-about %}" + title="Learn more about Arch Linux">Learn more...</a></p> + +</div><!-- #intro --> + +<div id="news"> + + <h3>Latest News <span class="more">(<a href="{% url news-list %}" + title="Browse the news archives">more</a>)</span></h3> + + <a href="/feeds/news/" title="Arch News RSS Feeds" + class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a> + {% for news in news_updates %} - <br /> - <span style="float:right; font-size:x-small">{{ news.postdate }}</span> - <h4 class="news"><a href="{{ news.get_absolute_url }}">{{ news.title }}</a></h4> - <p class="news">{{ news.content|striptags|truncatewords:60 }}</p> - <br /> + <h4><a href="{{ news.get_absolute_url }}" + title="View full article: {{ news.title }}">{{ news.title }}</a></h4> + <p class="timestamp">{{ news.postdate }}</p> + <p>{{ news.content|striptags|truncatewords:50 }}</p> {% endfor %} - <span style="float:right;font-size:x-small"><a href="{% url news-list %}">More News...</a></span> - <br /><br /> - </div> + +</div><!-- #news --> {% endblock %} {% block content_right %} - <div id="search"> - <form method="get" action="/packages/"> - <p>Package Search: <input type="text" name="q" size="20" maxlength="200" /></p> - </form> - </div> - <div id="updates"> - <table width="100%"> - <tr> - <td><h3>Recent Updates</h3></td> - <td style="vertical-align:top;text-align:right"><a href="/feeds/packages/"><img src="/media/rss.png" alt="RSS Feed" /></a></td> - </tr> +<div id="pkgsearch" class="widget"> + + <form id="pkgsearch-form" method="get" action="/packages/"> + <fieldset> + <p>Package Search: <input id="pkgsearch-field" + type="text" name="q" size="18" maxlength="200" /></p> + </fieldset> + </form> + +</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> + + <a href="/feeds/packages/" title="Arch Package Updates RSS Feeds" + class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a> + + <table> {% for update in pkg_updates %} {% with update|first as fpkg %} - <tr> - <td><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td> - <td style="text-align:right"> - {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %} + <tr> + <td class="pkg-name"><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td> + <td class="pkg-arch"> + {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}" + title="View package details for {{ pkg.pkgname }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %} </td> - </tr> + </tr> {% endwith %} {% endfor %} - <tr> - <td style="font-size:x-small;white-space:nowrap;"><br /><a href="{% url feeds-list %}">More Feeds...</a></td> - <td style="text-align:right;font-size:x-small;white-space:nowrap;"><br /><a href="/packages/?sort=-last_update">More Updates...</a></td> - </tr> - </table> - </div> - <br /> + </table> + +</div> + +<div id="nav-sidebar" class="widget"> + <div style="text-align: center;"> <a href="http://www.archlinux.ca/archcon2010/" title="ArchCon 2010"><img src="/media/archcon.png" class="" title="" alt="ArchCon 2010" /></a> </div> - <br /> - {% if user.is_authenticated %} - <h3>Dev Links:</h3> - <ul class="links"> - <li><a href="/devel/">Dev Dashboard</a></li> - <li><a href="{% url news-list %}">News</a></li> - <li><a href="/packages/signoffs/">Signoffs</a></li> - <li><a href="/todo/">Todos</a></li> - <li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li> - <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki:HOWTO_Be_A_Packager">Package Maintainer's Guide</a></li> - <li><a href="/devel/profile/">Profile</a></li> - </ul> - {% endif %} - <h3>Documentation:</h3> - <ul class="links"> - <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide">Installation Guide</a></li> - <li><a href="http://wiki.archlinux.org/index.php/Beginners'_Guide">Beginners' Guide</a></li> - <li><a href="http://wiki.archlinux.org">Wiki</a></li> + + <h4>Documentation</h4> + + <ul> + <li><a href="http://wiki.archlinux.org/" + title="Community documentation">Wiki</a></li> + <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide" + title="Official installation guide">Official Installation Guide</a></li> + <li><a href="http://wiki.archlinux.org/index.php/Beginners'_Guide" + title="A good place to start for beginners">Unofficial Beginners' Guide</a></li> </ul> - <h3>Support Arch:</h3> - <ul class="links"> - <li><a href="{% url page-donate %}">Donate</a></li> + + <h4>Community</h4> + + <ul> + <li><a href="http://mailman.archlinux.org/mailman/listinfo/" + title="Community and developer mailing lists">Mailing Lists</a></li> + <li><a href="http://wiki.archlinux.org/index.php/IRC_Channels" + title="Official and regional IRC communities">IRC Channels</a></li> + <li><a href="http://planet.archlinux.org/" + title="Arch in the blogosphere">Planet Arch</a></li> + <li><a href="/static/magazine/" + title="Community newsletters and magazines">Magazines</a></li> + <li><a href="http://wiki.archlinux.org/index.php/International_Communities" + title="Arch communities in your native language">International Communities</a></li> + <li><a href="http://wiki.archlinux.org/index.php/Related_Projects" + title="Projects that are in some way related to Arch Linux">Related Projects</a></li> + </ul> + + <h4>Support</h4> + + <ul> + <li><a href="{% url page-donate %}" title="Help support Arch Linux">Donate</a></li> <li><a href="http://schwag.archlinux.ca/" - title="USB keys, Jewellery, case badges">Arch Schwag</a></li> + title="USB keys, jewellery, case badges">Arch Schwag</a></li> <li><a href="http://www.zazzle.com/archlinux*" title="T-shirts, mugs, mouse pads, hoodies, posters, skateboards, shoes, etc.">Schwag via Zazzle</a></li> <li><a href="http://www.freewear.org/?page=list_items&org=Archlinux" title="T-shirts">Schwag via Freewear</a></li> - <li><a href="{% url page-art %}">Logos & Artwork</a></li> </ul> - <h3>Community Links:</h3> - <ul class="links"> - <li><a href="http://www.archlinux.org/mailman/listinfo/">Mailing Lists</a></li> - <li><a href="http://wiki.archlinux.org/index.php/IRC_Channels">IRC Channels</a></li> - <li><a href="http://planet.archlinux.org">Planet Arch</a></li> - <li><a href="/static/magazine/">Magazines</a></li> - <li><a href="http://wiki.archlinux.org/index.php/Arch_Related_Projects">Arch-Based Projects</a></li> - <li><a href="http://wiki.archlinux.org/index.php/International_Communities">International Communities</a></li> - <li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review">Press</a></li> + + <h4>Development</h4> + + <ul> + <li><a href="/packages/" + title="View/search the package repository database">Packages</a></li> + <li><a href="http://bugs.archlinux.org/" + title="Report/track bugs or make feature requests">Bug Tracker</a></li> + <li><a href="{% url page-svn %}" + title="View SVN entries for packages">SVN Repositories</a></li> + <li><a href="http://projects.archlinux.org/" + title="Official Arch projects (git)">Projects in Git</a></li> + <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki" + title="Developer Wiki articles">DeveloperWiki</a></li> </ul> - <h3>Development:</h3> - <ul class="links"> - <li><a href="{% url page-devs %}">Developers</a></li> - <li><a href="{% url page-tus %}">Trusted Users</a></li> - <li><a href="{% url page-fellows %}">Fellows</a></li> - <li><a href="http://bugs.archlinux.org">Bug Tracker</a></li> - <li><a href="{% url page-svn %}">SVN</a></li> - <li><a href="http://projects.archlinux.org">Projects</a></li> + + <h4>About</h4> + + <ul> + <li><a href="http://wiki.archlinux.org/index.php/ArchLinux:About" + title="Learn more about Arch Linux">About Arch</a></li> + <li><a href="/download/" title="Get Arch Linux">Download Arch</a></li> + <li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review" + title="Arch Linux in the media">Press Coverage</a></li> + <li><a href="{% url page-art %}" title="Arch logos and other artwork for promotional use">Logos & Artwork</a></li> + <li><a href="{% url news-list %}" title="News Archives">News Archives</a></li> + <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li> + <li><a href="{% url page-devs %}" title="Active developers">Developer Profiles</a></li> + <li><a href="{% url page-tus %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li> + <li><a href="{% url page-fellows %}" title="Retired Developers">Fellows Profiles</a></li> </ul> - <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="/media/vnet_button.png" class="" title="" alt="velocity network - it's about time" /></a> - <a href="https://www.sevenl.net/?utm_source=archlinux-org&utm_medium=sponsored-banner&utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a> - <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" class="" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a> + +</div><!-- #nav-sidebar --> + +<div id="home-paypal-button" class="widget"> + + <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <p><input type="hidden" name="cmd" value="_xclick"/></p> + <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p> + <p><input type="hidden" name="currency_code" value="USD"/></p> + <p><input type="hidden" name="tax" value="0"/></p> + <p><input type="hidden" name="lc" value="US"/></p> + <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p> + <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p> + <p><input type="hidden" name="no_shipping" value="1"/></p> + <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p> + <p><input type="hidden" name="no_note" value="1"/></p> + <p><input type="image" src="/media/donate.gif" name="submit" + title="Make a PayPal donation to the Arch Linux project" + alt="Make a PayPal donation to the Arch Linux project" + style="background:transparent;border:none;" /></p> + </form> + +</div> + +<div id="sponsors" class="widget"> + + <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network"><img src="/media/vnet_button.png" alt="Velocity Network - It's about time" /></a> + <a href="https://www.sevenl.net/?utm_source=archlinux-org&utm_medium=sponsored-banner&utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a> + <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a> + +</div> {% endblock %} diff --git a/templates/public/userlist.html b/templates/public/userlist.html index ce8cb145..658e64e6 100644 --- a/templates/public/userlist.html +++ b/templates/public/userlist.html @@ -1,13 +1,16 @@ {% extends "base.html" %} +{% block title %}Arch Linux - {{ user_type }}{% endblock %} {% block content %} -<div class="box"> - <h2 class="title">Arch Linux {{user_type}}</h2> - <p>{{description}}</p> +<div id="dev-tu-profiles" class="box"> + + <h2>Arch Linux {{user_type}}</h2> + + <p>{{description}}</p> + {% with users as dev_list %} {% include 'public/developer_list.html' %} {% endwith %} + </div> -<br /><br /> {% endblock %} - |