diff options
Diffstat (limited to 'templates/public')
| -rw-r--r-- | templates/public/developer_list.html | 20 | ||||
| -rw-r--r-- | templates/public/donate.html | 22 | ||||
| -rw-r--r-- | templates/public/download.html | 134 | ||||
| -rw-r--r-- | templates/public/feeds.html | 36 | ||||
| -rw-r--r-- | templates/public/index.html | 87 | ||||
| -rw-r--r-- | templates/public/keys.html | 56 | ||||
| -rw-r--r-- | templates/public/userlist.html | 3 |
7 files changed, 195 insertions, 163 deletions
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html index 376ab433..4401d97b 100644 --- a/templates/public/developer_list.html +++ b/templates/public/developer_list.html @@ -1,3 +1,4 @@ +{% load flags %} {% load pgp %} <div id="arch-bio-toc"> @@ -12,17 +13,24 @@ <table class="arch-bio-entry"> {% for dev in dev_list %} {% with dev.userprofile as prof %} - <tr> + <tr itemscope itemtype="http://schema.org/Person"> <td class="pic pic-{{ dev.username }}"> - <img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/> + <img itemprop="image" src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/> </td> <td> + <meta itemprop="name" content="{{ dev.get_full_name|escape }}"/> + <meta itemprop="givenName" content="{{ dev.first_name|escape }}"/> + <meta itemprop="familyName" content="{{ dev.last_name|escape }}"/> + <meta itemprop="jobTitle" content="{{ user_title|escape }}"/> + <div style="display:none" itemprop="memberOf" itemscope itemtype="http://schema.org/Organization"> + <meta itemprop="name" content="Arch Linux"/> + </div> <h3>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %} <a class="headerlink" name="{{ dev.username }}" id="{{ dev.username }}" href="#{{ dev.username }}" title="Permalink">ΒΆ</a></h3> <table class="bio bio-{{ dev.username }}"> <tr> <th>Alias:</th> - <td>{{ prof.alias }}</td> + <td itemprop="additionalName">{{ prof.alias }}</td> </tr><tr> <th>Email:</th> <td>{{ prof.public_email }}</td> @@ -38,7 +46,7 @@ </td> </tr><tr> <th>Website:</th> - <td>{% if prof.website %}<a href="{{ prof.website }}" + <td>{% if prof.website %}<a itemprop="url" href="{{ prof.website }}" title="Visit the website for {{ dev.get_full_name }}"> {{ prof.website }}</a>{% endif %}</td> </tr><tr> @@ -46,10 +54,10 @@ <td>{{ prof.occupation }}</td> </tr><tr> <th>YOB:</th> - <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td> + <td itemprop="birthDate">{% if prof.yob %}{{ prof.yob }}{% endif %}</td> </tr><tr> <th>Location:</th> - <td>{% if dev.userprofile.country %}<img src="{{ dev.userprofile.country.flag }}" alt="{{ dev.userprofile.country.name }}"/> {% endif %}{{ prof.location }}</td> + <td>{% country_flag dev.userprofile.country %}{{ prof.location }}</td> </tr><tr> <th>Languages:</th> <td>{{ prof.languages }}</td> diff --git a/templates/public/donate.html b/templates/public/donate.html index 0c20e289..963a02ca 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -23,7 +23,7 @@ <h3>Monetary donations</h3> - <p>Financial contributions are accepted via <a href="https://co.clickandpledge.com/Default.aspx?WID=47294" title="Donate via Click&Pledge to Arch Linux"/>Click&Pledge</a>. + <p>Financial contributions are accepted via <a href="https://co.clickandpledge.com/Default.aspx?WID=47294" title="Donate via Click&Pledge to Arch Linux">Click&Pledge</a>. Arch Linux is a member project of the <a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a> non-profit corporation. Funds are used for hosting costs, server hardware @@ -31,7 +31,7 @@ as <a href="http://www.spi-inc.org/donations/">how donations work</a>.</p> <a href="https://co.clickandpledge.com/Default.aspx?WID=47294"> - <img width="210" height="34" src="{% static "CP_EN_BK_S_001.gif" %}" alt="Donate via Click&Pledge to Arch Linux" title="Donate via Click&Pledge to Arch Linux"/> + <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&Pledge to Arch Linux" title="Donate via Click&Pledge to Arch Linux"/> </a> <h3>Commercial sponsors and contributions</h3> @@ -44,18 +44,6 @@ title="velocity network"><img width="252" height="58" src="{% static "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 width="252" height="58" src="{% static "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/ArchLinux" title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p> @@ -63,6 +51,12 @@ title="AirVM.com - Your Green Technology Partner"><img width="252" height="58" src="{% static "airvm_button.png" %}" class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a> + <p>We would also like to thank Kartenzia for sponsoring a dedicated Arch Linux Server. + Kartenzia.de is a new Start-Up based in Germany and specializes in + eco-friendly invitations like <a href="http://www.kartenzia.de/weihnachtskarten/">Weihnachten</a>.</p> + + <a href="http://www.kartenzia.de/"><img width="292" height="74" src="{% static "kartenzia_button.png" %}" class="sponsor-btn-kartenzia" /></a> + <h3>Past donors</h3> <div id="donor-list"> diff --git a/templates/public/download.html b/templates/public/download.html index 70b27b73..01e46f66 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -1,28 +1,35 @@ {% extends "base.html" %} {% load cache %} -{% load url from future %} {% load static from staticfiles %} +{% load flags %} {% load wiki %} {% block title %}{{ BRANDING_DISTRONAME }} - Downloads{% endblock %} + +{% block head %} +<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" /> +<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} Releases" href="/feeds/releases/" /> +{% endblock %} + {% block navbarclass %}anb-download{% endblock %} {% block content %} <div id="arch-downloads" class="box"> - <h2>Arch Linux Downloads</h2> + <h2>{{BRANDING_DISTRONAME}} Downloads</h2> - {% with "2011.08.19" 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 + <p>The image can be burned to a CD, mounted as an ISO file, + or be directly written to a USB stick using a utility like `dd`. It + is intended for new installations only; an existing {{BRANDING_DISTRONAME}} system can always be updated with `pacman -Syu`.</p> <ul> - <li><strong>Current Release:</strong> <a href="{% wiki_url 'DeveloperWiki:' %}{{ version }}">{{ version }}</a></li> - <li><strong>Included Kernel:</strong> 3.0.3</li> + {% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %} + {% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %} + {% if release.file_size %}<li><strong>ISO Size:</strong> {{ release.file_size|filesizeformat }}</li>{% endif %} + <li><a href="https://wiki.archlinux.org/index.php/Installation_Guide">Installation Guide</a></li> <li><strong>Resources:</strong> <ul> <li><a href="https://bugs.archlinux.org/index.php?project=6" @@ -33,14 +40,11 @@ </li> </ul> - <p><strong>Links and Instructions:</strong></p> + {% if release.info %} + <h3>Release Notes</h3> - <ul id="download-help"> - <li><a href="https://www.archlinux.org/iso/{{ version }}/README" - title="Official download instructions">Readme and Instructions</a></li> - <li><a href="{% wiki_url 'Install_Guide' %}" - title="Official Installation Guide">{{BRANDING_DISTRONAME}} Install Guide</a></li> - </ul> + <div class="article-content">{{ release.info_html }}</div> + {% endif %} <h3>Existing {{BRANDING_SHORTNAME}} Users</h3> @@ -54,82 +58,19 @@ 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> - Netinstall Image - </td><td class="cpu-arch"> - <a href="https://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="https://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="https://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 mirrors for absolute freshness. - </td> - </tr><tr> - <td> - Core Image - </td><td class="cpu-arch"> - <a href="https://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="https://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="https://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> - </tr> - </tbody> - </table> - - <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/view.cgi/products/linux/arch?affiliate=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> + {% if release %}<ul> + <li><a href="{{ release.magnet_uri }}" + title="Magnet link">Magnet link for {{ release.version }}</a></li> + <li><a href="{% url 'releng-release-torrent' release.version %}" + title="Download torrent">Torrent for {{ release.version }}</a></li> + </ul>{% endif %} - <h3>Test ISO Info</h3> + <h3>Netboot</h3> - <p>We provide daily snapshot ISOs. Those are largely untested, - but may be more up to date than the releases.</p> + <p>If you have a wired connection, you can boot the latest release directly over the network.</p> <ul> - <li><a href="{{ releng_iso_url }}" - title="Release Engineering ISO download">Download snapshots</a></li> <li><a href="{{ releng_pxeboot_url }}" - title="Arch Linux Netboot Live System">Boot latest snapshots over the network</a> - <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li> - <li><a href="{% url 'releng-test-overview' %}" - title="Release Engineering ISO feedback">Feedback</a></li> + title="{{BRANDING_DISTRONAME}} Netboot Live System">{{BRANDING_DISTRONAME}} Linux Netboot</a></li> </ul> <h3>HTTP Direct Downloads</h3> @@ -144,30 +85,29 @@ <p>File integrity checksums for the latest releases can be found below:</p> <ul> - <li><a href="https://www.archlinux.org/iso/{{version}}/sha1sums.txt" - title="Get the latest SHA1 checksums">SHA1 checksums</a></li> - <li><a href="https://www.archlinux.org/iso/{{version}}/md5sums.txt" - title="Get the latest MD5 checksums">MD5 checksums</a></li> + <li><a href="https://www.archlinux.org/{{ release.iso_url }}.sig" + title="PGP signature">PGP signature</a></li> + {% if release.md5_sum %}<li><strong>MD5:</strong> {{ release.md5_sum }}</li>{% endif %} + {% if release.sha1_sum %}<li><strong>SHA1:</strong> {{ release.sha1_sum }}</li>{% endif %} </ul> {% cache 600 download-mirrors %} <div id="download-mirrors"> - {% regroup mirror_urls by real_country as grouped_urls %} + {% regroup mirror_urls by country as grouped_urls %} {% for country in grouped_urls %} - {% if country.grouper %}<h5><img src="{{ country.grouper.flag }}" alt=""/> {{ country.grouper.name }}</h5> + {% if country.grouper %}<h5>{% country_flag country.grouper %}{{ country.grouper.name }}</h5> {% else %}<h5>Worldwide</h5>{% endif %} <ul> {% for mirror_url in country.list %} - <li><a href="{{ mirror_url.url }}iso/{{ version }}/" - title="Download from {{ mirror_url.url }}iso/{{ version }}/">{{ mirror_url.mirror.name }}</a></li> + <li><a href="{{ mirror_url.url }}{{ release.dir_path }}" + title="Download from {{ mirror_url.url }}">{{ mirror_url.mirror.name }}</a></li> {% endfor %} </ul> {% endfor %} </div> {% endcache %} - {% endwith %} - <p>If you want to become an Official Arch Linux Mirror please follow the + <p>If you want to become an Official {{BRANDING_DISTRONAME}} Mirror please follow the instructions listed <a href="{% wiki_url 'DeveloperWiki:NewMirrors' %}">here</a>.</p> </div> diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 91cd9e71..bb8e685a 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -12,8 +12,8 @@ <h3>News and Activity Feeds</h3> - <p>Grab the <a href="/feeds/news/" class="rss" title="{{ BRANDING_DISTRONAME }} News feed">news item feed</a> - to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.</p> + <p>Grab the <a href="/feeds/news/" class="rss" title="{{BRANDING_DISTRONAME}} news feed">news item feed</a> + to keep up-to-date with the latest news from the {{BRANDING_DISTRONAME}} development staff.</p> <p>The <a href="{% wiki_url 'Special:RecentChanges?feed=rss' %}" title="{{ BRANDING_WIKINAME }} Recent Changes feed" class="rss">{{ BRANDING_WIKINAME }}: Recent changes feed</a> @@ -35,19 +35,26 @@ <table class="pretty2"> <thead> <tr> - <th>Architecture</th> - <th>All Repos</th> - {% for repo in repos %} - <th>{{ repo }}</th> + <th></th> + <th>All Arches</th> + {% for arch in arches %} + <th>{{ arch }}</th> {% endfor %} </tr> </thead> <tbody> - {% for arch in arches %} <tr> - <td><strong>{{ arch }}</strong></td> + <td><strong>All Repos</strong></td> + <td><a href="/feeds/packages/" class="rss">Feed</a></td> + {% for arch in arches %} <td><a href="/feeds/packages/{{ arch }}/" class="rss">Feed</a></td> - {% for repo in repos %} + {% endfor %} + </tr> + {% for repo in repos %} + <tr> + <td><strong>{{ repo }}</strong></td> + <td><a href="/feeds/packages/all/{{ repo|lower }}/" class="rss">Feed</a></td> + {% for arch in arches %} <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/" class="rss">Feed</a></td> {% endfor %} </tr> @@ -58,6 +65,11 @@ <p>A <a href="https://aur.archlinux.org/rss.php" class="rss" title="AUR newest packages feed">newest packages feed</a> is also available from the <a href="https://aur.archlinux.org/" title="AUR Homepage">Arch User Repository (AUR)</a>.</p> + <h3>Release Feed</h3> + + <p>Grab the <a href="/feeds/releases/" class="rss" title="{{BRANDING_DISTRONAME}} release feed">ISO release feed</a> + if you want to help seed the ISO release torrents as they come out.</p> + <h3>Development Feeds</h3> <p>Subscribe to any of the following to track bug tickets and feature @@ -75,9 +87,9 @@ <tbody> <tr> <td>All Projects</td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=99" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=99" class="rss">Feed</a></td> - <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=99" class="rss">Feed</a></td> + <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=0" class="rss">Feed</a></td> + <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=edit&project=0" class="rss">Feed</a></td> + <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&topic=clo&project=0" class="rss">Feed</a></td> </tr><tr> <td>Arch Linux</td> <td><a href="https://bugs.archlinux.org/feed.php?feed_type=rss2&project=1" class="rss">Feed</a></td> diff --git a/templates/public/index.html b/templates/public/index.html index 8856fd95..b32260b5 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -1,6 +1,5 @@ {% extends "base.html" %} -{% load markup cache %} -{% load url from future %} +{% load cache %} {% load static from staticfiles %} {% load wiki %} @@ -46,19 +45,17 @@ <a href="/feeds/news/" title="{{ BRANDING_SHORTNAME }} News RSS Feed" class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a> - {% for news in news_updates %} - {% if forloop.counter0 < 5 %} + {% for news in news_updates %}{% 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"> - {% if forloop.counter0 == 0 %}{{ news.content|markdown|truncatewords_html:300 }} - {% else %}{{ news.content|markdown|truncatewords_html:100 }}{% endif %} + {% if forloop.counter0 == 0 %}{{ news.html|truncatewords_html:300 }} + {% else %}{{ news.html|truncatewords_html:100 }}{% endif %} </div> - {% else %} - {% if forloop.counter0 == 5 %} + {% else %}{% if forloop.counter0 == 5 %} <h3> <a href="{% url 'news-list' %}" title="Browse the news archives">Older News</a> @@ -71,17 +68,14 @@ <a href="{{ news.get_absolute_url }}" title="View full article: {{ news.title }}">{{ news.title }}</a> </dd> - {% if forloop.last %} - </dl> - {% endif %} - {% endif %} - {% endfor %} + {% if forloop.last %}</dl>{% endif %} + {% endif %}{% endfor %} </div> {% endcache %} {% endblock %} {% block content_right %} -{% cache 59 main-page-right secure %} +{% cache 59 main-page-updates user.is_authenticated %} <div id="pkgsearch" class="widget"> <form id="pkgsearch-form" method="get" action="/packages/"> <fieldset> @@ -89,7 +83,6 @@ <input id="pkgsearch-field" type="text" name="q" size="18" maxlength="200" /> </fieldset> </form> - </div> <div id="pkg-updates" class="widget box"> @@ -111,7 +104,9 @@ {% endfor %} </table> </div> +{% endcache %} +{% cache 59 main-page-right secure %} <div id="nav-sidebar" class="widget"> <h4>Documentation</h4> @@ -155,11 +150,12 @@ <ul> <li><a href="{% url 'mirrorlist' %}" title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li> + <li><a href="{% url 'mirror-list' %}" + title="See a listing of all available mirrors">Mirror List</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> - <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li> + <li><a href="{% url 'packages-differences' %}" + title="See differences in packages between available architectures">Differences Reports</a></li> </ul> <h4>Development</h4> @@ -173,21 +169,17 @@ title="Developer Wiki articles">Developer Wiki</a></li> <li><a href="/groups/" title="View the available package groups">Package Groups</a></li> - <li><a href="/todolists/" + <li><a href="/todo/" title="Developer 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 width="16" height="16" src="{% static "new.png" %}" alt="New"/></li> + title="View visualizations">Visualizations</a></li> </ul> <h4>More Resources</h4> <ul> <li><a href="{% url 'page-keys' %}" - title="Package/Database signing master keys">Signing Master Keys</a> - <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li> + title="Package/Database signing master keys">Signing Master Keys</a></li> <li><a href="{% wiki_url 'Arch_Linux_Press_Review' %}" title="Arch Linux in the media">Press Coverage</a></li> <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} logos and other artwork for promotional use">Logos & Artwork</a></li> @@ -202,22 +194,53 @@ <div id="home-donate-button" class="widget"> <a href="https://co.clickandpledge.com/Default.aspx?WID=47294"> - <img width="210" height="34" src="{% static "CP_EN_BK_S_001.gif" %}" alt="Donate via Click&Pledge to Arch Linux" title="Donate via Click&Pledge to Arch Linux"/> + <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&Pledge to Arch Linux" title="Donate via Click&Pledge to Arch Linux"/> </a> </div> <div id="arch-sponsors" class="widget"> - <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network"> <img width="252" height="58" src="{% static "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 width="252" height="58" src="{% static "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/ArchLinux" title="AirVM.com - Your Green Technology Partner"> - <img width="252" height="58" src="{% static "airvm_button.png" %}" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /> + <img width="252" height="58" src="{% static "airvm_button.png" %}" alt="AirVM.com - Your Green Technology Partner" /> </a> - </div> {% endcache %} {% endblock %} + +{% block script_block %} +<div id="konami" style="display:none;"></div> + +{% load cdn %}{% jquery %} +<script type="text/javascript"> +function setupTypeahead() { + $('#pkgsearch-field').typeahead({ + source: function(query, callback) { + $.getJSON('/opensearch/packages/suggest', {q: query}, function(data) { + callback(data[1]); + }); + }, + matcher: function(item) { return true; }, + sorter: function(items) { return items; }, + menu: '<ul class="pkgsearch-typeahead"></ul>', + items: 10 + }).attr('autocomplete', 'off'); +} +function setupKonami() { + var konami = new Konami(function() { + $('#konami').html('<img src="{% static "vector_tux.png" %}" alt=""/>'); + setTimeout(function() { + $('#konami').fadeIn(500); + }, 500); + $('#konami').click(function() { + $('#konami').fadeOut(500); + }); + }); +} +$(document).ready(function() { + $.ajax({ url: "{% static "bootstrap-typeahead.min.js" %}", cache: true, dataType: "script", success: setupTypeahead }); + $.ajax({ url: "{% static "konami.min.js" %}", cache: true, dataType: "script", success: setupKonami }); +}); +</script> +{% endblock %} diff --git a/templates/public/keys.html b/templates/public/keys.html index 4afc6d6b..c6da6c37 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -48,6 +48,16 @@ </tbody> </table> + <ul> + <li><a href="#master-sigs">Master Key Signatures</a></li> + <li><a href="#visualization">Visualization of PGP Master and Developer Keys</a></li> + <li><a href="#cross-sigs">Developer Cross-Signatures</a></li> + </ul> +</div> + +<div class="box"> + <h2 id="master-sigs">Master Key Signatures</h2> + <p>The following table shows all active developers and trusted users along with the status of their personal signing key. A 'Yes' indicates that the personal key of the developer is signed by the given master key. A 'No' @@ -89,14 +99,56 @@ </tbody> </table> </div> -{% load cdn %}{% jquery %} -<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script> + +<div class="box"> + <h2 id="visualization">Visualization of PGP Master and Developer Keys</h2> + + <div id="visualize-keys" class="visualize-chart"></div> +</div> + +<div class="box"> + <h2 id="cross-sigs">Developer Cross-Signatures</h2> + + <p>This table lists signatures directly between developer keys.</p> + + <table class="pretty2" id="cross-signatures"> + <thead> + <tr> + <th>Signer</th> + <th>Signee</th> + <th>Created</th> + <th>Expires</th> + </tr> + </thead> + <tbody> + {% for sig in cross_signatures %} + <tr> + <td>{% user_pgp_key_link sig.signer %}</td> + <td>{% user_pgp_key_link sig.signee %}</td> + <td>{{ sig.created }}</td> + <td>{{ sig.expires|default:"" }}</td> + </tr> + {% endfor %} + </tbody> + </table> +</div> + +{% load cdn %}{% jquery %}{% jquery_tablesorter %} +<script type="text/javascript" src="{% static "d3-3.0.6.min.js" %}"></script> <script type="text/javascript" src="{% static "archweb.js" %}"></script> +<script type="text/javascript" src="{% static "visualize.js" %}"></script> <script type="text/javascript"> $(document).ready(function() { $("#key-status").tablesorter({ + sortLocaleCompare: true, headers: { 1: { sorter: false } } }); + $("#cross-signatures").tablesorter({ + sortLocaleCompare: true + }); +}); +$(document).ready(function() { + developer_keys("#visualize-keys", "{% url 'pgp-keys-json' %}"); }); </script> {% endblock %} diff --git a/templates/public/userlist.html b/templates/public/userlist.html index 197346c3..6292af83 100644 --- a/templates/public/userlist.html +++ b/templates/public/userlist.html @@ -1,8 +1,11 @@ {% extends "base.html" %} +{% load static from staticfiles %} {% load cache %} {% block title %}{{ BRANDING_DISTRONAME }} - {{ user_type }}{% endblock %} +{% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %} + {% block content %} {% cache 600 dev-tu-profiles user_type %} <div id="dev-tu-profiles" class="box"> |