From 6f9308abd95e6935bb173cbe6439b45f29763ba1 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 May 2010 13:29:27 -0500 Subject: Redirect to root url after login Signed-off-by: Dan McGee --- settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.py b/settings.py index 88adf19d..30f594e6 100644 --- a/settings.py +++ b/settings.py @@ -34,6 +34,7 @@ # login url LOGIN_URL = '/login/' +LOGIN_REDIRECT_URL = '/' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( -- cgit v1.2.3-54-g00ecf From 278162de2055f5d84e5887f3d68bb48b52ad2840 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:15:38 -0700 Subject: Added new stylesheets which will eventually go CDN Signed-off-by: Dan McGee --- media/archweb-print.css | 11 ++ media/archweb.css | 282 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 293 insertions(+) create mode 100644 media/archweb-print.css create mode 100644 media/archweb.css diff --git a/media/archweb-print.css b/media/archweb-print.css new file mode 100644 index 00000000..2946de54 --- /dev/null +++ b/media/archweb-print.css @@ -0,0 +1,11 @@ +/* + * ARCH LINUX DJANGO (MAIN SITE) + * + * Stylesheet for printing + */ + +/* general styling */ +body { font: normal 100% sans-serif; } +#content { font-size: 0.812em; } +#archnavbarmenu, #archdev-navbar, .admin-actions { display: none; } + diff --git a/media/archweb.css b/media/archweb.css new file mode 100644 index 00000000..d981bdf1 --- /dev/null +++ b/media/archweb.css @@ -0,0 +1,282 @@ +/* + * ARCH LINUX DJANGO (MAIN SITE) + * + * Font sizing based on 16px browser defaults (use em): + * 14px = 0.875em + * 13px = 0.812em + * 12px = 0.75em + * 11px = 0.6875em + * + */ + +/* import the global navbar stylesheet */ +@import url('http://cinderwick.ca/archnavbar/archnavbar.css'); + +/* simple reset */ +* { margin: 0; padding: 0; border: 0; line-height: 1.4; } + +/* general styling */ +body { min-width: 650px; background: #eef; color: #444; font: normal 100% sans-serif; text-align: center; } +p { margin: .33em 0 1em; } +ol, ul { margin-bottom: 1em; padding-left: 2em; } +ul { list-style: square; } +code { font: 1.2em monospace; background: #ffa; padding: 0.15em 0.25em; } +pre { font: 1.2em monospace; border: 1px solid #bdb; background: #dfd; padding: 0.5em; margin: 0.25em 2em; } +blockquote { margin: 1.5em 2em; } +input { vertical-align: middle; } +.clear { clear: both; } +hr { border: none; border-top: 1px solid #888; } + +/* scale fonts down to a sane default (16 * .812 = 13px) */ +#content { font-size: 0.812em; } + +/* link style */ +a { text-decoration: none; } +a:link, th a:visited { color: #07b; } +a:visited { color: #549; } +a:hover { text-decoration: underline; } +a:active { color: #e90; } + +/* headings */ +h2 { font-size: 1.5em; margin-bottom: 0.5em; border-bottom: 1px solid #888; } +h3 { font-size: 1.25em; margin-top: 1em; } +h4 { font-size: 1.15em; margin-top: 1em; } +h5 { font-size: 1em; margin-top: 1em; } + +/* general layout */ +div#content { width: 95%; margin: 0 auto; text-align: left; } +div#content-left-wrapper { float: left; width: 100%; } /* req to keep content above sidebar in source code */ +div#content-left { margin: 0 340px 0 0; } +div#content-right { float: left; width: 300px; margin-left: -300px; } +div.box { margin-bottom: 1.5em; padding: 0.65em; background: #fff; border: 1px solid #bcd; } +div#footer { clear: both; margin: 2em 0 1em; } +div#footer p { margin: 0; text-align: center; font-size: 0.85em; } + +/* alignment */ +div.center, table.center, img.center { width: auto; margin-left: auto; margin-right: auto; } +p.center, td.center, th.center { text-align: center; } + +/* table generics */ +table { width: 100%; border-collapse: collapse; } +table .wrap { white-space: normal; } +th, td { white-space: nowrap; text-align: left; } +th { vertical-align: middle; font-weight: bold; } +td { vertical-align: top; } + +/* table pretty styles */ +table.pretty1 { width: auto; margin-top: 0.25em; margin-bottom: 0.5em; border-collapse: collapse; border: 1px solid #bcd; } +table.pretty1 th { padding: 0.35em; background: #eef; border: 1px solid #bcd; } +table.pretty1 td { padding: 0.35em; border: 1px dotted #bcd; } +table.pretty2 { width: auto; margin-top: 0.25em; margin-bottom: 0.5em; border-collapse: collapse; border: 1px solid #bbb; } +table.pretty2 th { padding: 0.35em; background: #eee; border: 1px solid #bbb; } +table.pretty2 td { padding: 0.35em; border: 1px dotted #bbb; } + + +/* forms and input styling */ +form p { margin: 0.5em 0; } +label { width: 12em; vertical-align: top; display: inline-block; font-weight: bold; } +input, textarea, select { background: #ffc; border: 1px solid #cca; } +input[type=text], input[type=password], textarea { padding: 0.10em; } +input[type=submit], input[type=button] { background: #6af; color: #fff; border: 1px solid #37c; font-weight: bold; margin: 0; padding: 0.10em 0.25em; } +input[type=submit]:hover, input[type=button]:hover { background: #38d; border-color: #04a; } +form.general-form label, form.general-form .form-help { width: 10em; vertical-align: top; display: inline-block; } +form.general-form input[type=text], form.general-form textarea { width: 45%; } + +/* archdev navbar */ +div#archdev-navbar { margin: 1.5em 0; } +div#archdev-navbar ul { list-style: none; margin: -0.5em 0; padding: 0; } +div#archdev-navbar li { display: inline; margin: 0; padding: 0; font-size: 0.9em; } +div#archdev-navbar li a { padding: 0 0.5em; color: #07b; } + +/* error/info messages (x pkg is already flagged out-of-date, etc) */ +#sys-message { width: 35em; text-align: center; margin: 1em auto; padding: 0.5em; background: #fff; border: 1px solid #f00; } +#sys-message p { margin: 0; } + +/* + * PAGE SPECIFIC STYLES + */ + +/* home: introduction */ +#intro p.readmore { margin: -0.5em 0 0 0; font-size: .9em; text-align: right; } + +/* home: news */ +#news { margin-top: 1.5em; } +#news p { margin-bottom: 1.5em; } +#news h3 { border-bottom: 1px solid #888; } +#news .more { font-weight: normal; } +#news .rss-icon { float: right; margin: -1.6em 0.4em 0 0; } +#news h4 { font-size: 1em; margin-top: 1.5em; border-bottom: 1px dotted #bbb; } +#news .timestamp { float: right; font-size: 0.85em; margin: -1.8em 0.5em 0 0; } + +/* home: pkgsearch box */ +#pkgsearch { padding: 1em 0.75em; background: #3ad; color: #fff; border: 1px solid #08b; } +#pkgsearch p { margin: 0; padding: 0; font-weight: bold; font-size: 0.9em; text-align: right; } +#pkgsearch input { vertical-align: bottom; width: 12em; padding: 0.15em; font-size: 1em; background: #fff; border: 1px solid #09c; } + +/* home: recent pkg updates */ +#pkg-updates h3 { margin: 0 0 0.3em; } +#pkg-updates .more { font-weight: normal; } +#pkg-updates .rss-icon { float: right; margin: -2em 0 0 0; } +#pkg-updates table { margin: 0; } +#pkg-updates td.pkg-arch { text-align: right; } +#pkg-updates a.testing, #pkg-updates a.community-testing { font-style: italic; } + +/* home: sidebar navigation */ +div#nav-sidebar ul { list-style: none; margin: 0.5em 0 0.5em 1em; padding: 0; } + +/* home: sponsor banners */ +div#sponsors img { padding: 0.3em 0; } + +/* home: sidebar components (navlist, sponsors, pkgsearch, etc) */ +div.widget { margin-bottom: 1.5em; } + +/* feeds page */ +#rss-feeds .rss { padding-right: 20px; background: url(rss.png) top right no-repeat; } + +/* artwork: logo images */ +#artwork img.inverted { background: #333; padding: 0; } +#artwork div.imagelist img { display: inline; margin: 0.75em; } + +/* news: article pages */ +div#news-article .article-info { margin: 0; color: #999; } + +/* news: add/edit article */ +form#newsform { width: 60em; } +form#newsform input[type=text], form#newsform textarea { width: 75%; } + + +/* donate: donor list */ +div#donor-list ul { margin: 0.5em 0; padding: 0; list-style: none; } +div#donor-list li { margin: 0; padding: 0; font-size: 0.8em; } +div#donor-list br { clear: left; } +div.donor-slice { float: left; width: 16em; } + +/* download page */ +#arch-downloads h3 { border-bottom: 1px dotted #aaa; } +table#download-torrents .cpu-arch { text-align: center; } +table#download-mirrors { width: auto; margin-bottom: 1em; } +table#download-mirrors td.mirror-country { padding-top: 1em; } +table#download-mirrors td.mirror-server { padding-right: 1em; } +table#download-mirrors a { display: block; float: right; width: 4em; } + +/* pkglists/devlists */ +table.results { font-size: 0.846em; } +table.results th { padding: 0.5em 1em 0.25em 0.25em; border-bottom: 1px solid #999; white-space: nowrap; } +table.results td { padding: .3em 1em .3em 3px; } +table.results tr.even { background: #e7ecff; } + +/* pkglist: layout */ +div#pkglist-search { margin-bottom: 1.5em; } +div#pkglist-about { margin-top: 1.5em; } + +/* pkglist: results */ +#pkglist-results .flagged { color: red; } + +/* pkglist: results navigation */ +#pkglist-stats-top { font-size: 0.85em; border-bottom: 1px dotted #999; } +#pkglist-stats-bottom { font-size: 0.85em; border-top: 1px dotted #999; } +#pkglist-results .pkglist-nav { float: right; margin-top: -2.2em; } +.pkglist-nav .prev { margin-right: 1em; } +.pkglist-nav .next { margin-right: 1em; } + +/* pkglist: search fields */ +#pkglist-search h3 { font-size: 1em; margin-top:0; } +#pkglist-search div { float: left; margin-right: 1.65em; font-size: 0.85em; } +#pkglist-search legend { display: none; } +#pkglist-search label { width: auto; display: block; font-weight: normal; } + +/* pkgdetails: action list (svn entries, flag out-of-date) */ +#pkgdetails #actionlist { float: right; } +#pkgdetails #actionlist ul { list-style: none; padding: 0; font-size: 0.846em } +#pkgdetails #actionlist .flagged { color: red; font-size: 0.9em; font-style: italic; } + +/* pkgdetails: pkg info */ +#pkgdetails #pkginfo { width: auto; } +#pkgdetails #pkginfo td { padding: 0.25em 0 0.25em 1.5em; } + +/* pkgdetails: flag package */ +form#flag-pkg-form label { width: 10em; } +form#flag-pkg-form textarea, form#flag-pkg-form input[type=text] { width: 45%; } + +/* pkgdetails: deps, required by and file lists */ +#pkgdetails #metadata h3 { background: #555; color: #fff; font-size: 1em; margin-bottom: 0.5em; padding: 0.2em 0.35em; } +#pkgdetails #metadata ul { list-style: none; margin: 0; padding: 0; } +#pkgdetails #metadata li { padding-left: 0.5em; } +#pkgdetails #metadata br { clear: both; } +#pkgdetails #pkgdeps { float: left; width: 48%; margin-right: 2%; } +#pkgdetails #pkgreqs { float: left; width: 50%; } +#pkgdetails #pkgfiles { clear: left; padding-top: 1em; } + +/* dev/TU biographies */ +div#arch-bio-toc { width: 75%; margin: 0 auto; text-align: center; } +table.arch-bio-entry td.pic { vertical-align: top; padding-right: 15px; padding-top: 10px; } +table.arch-bio-entry td.pic img { padding: 4px; border: 1px solid #ccc; } +/* ************************************** TEMPORARY *****************************/ + +td.pic-dale img, +td.pic-dan img, +td.pic-dgriffiths img, +td.pic-francois img, +td.pic-geoffroy img, +td.pic-james img, +td.pic-jgc img, +td.pic-kevin img, +td.pic-pierre img, +td.pic-romashka img, +td.pic-ronald img, +td.pic-thomas img, +td.pic-vesa img { display: none; } +td.pic-dale, +td.pic-dan, +td.pic-dgriffiths, +td.pic-francois, +td.pic-geoffroy, +td.pic-james, +td.pic-jgc, +td.pic-kevin, +td.pic-pierre, +td.pic-romashka, +td.pic-ronald, +td.pic-thomas, +td.pic-vesa { background: url(http://cinderwick.ca/archnavbar/arch-bio-nopic.png) no-repeat; vertical-align: top; padding-right: 15px; padding-top: 10px; } +/* ************************************** END TEMPORARY *****************************/ +table.arch-bio-entry table.bio { margin-bottom: 2em; } +table.arch-bio-entry table.bio th { text-align: left; padding-right: 0.5em; vertical-align: top; white-space: nowrap; } +table.arch-bio-entry table.bio td { width: 100%; padding-bottom: 0.25em; } + +/* dev: login/out */ +p.login-error {} +table#dev-login { width: auto; } + +/* dev dashboard: flagged packages */ +form#dash-pkg-notify { text-align: right; padding: 1em 0 0; margin-top: 1em; font-size: 0.85em; border-top: 1px dotted #aaa; } +form#dash-pkg-notify label { width: auto; font-weight: normal; } +form#dash-pkg-notify input { vertical-align: middle; margin: 0 0.25em; } +form#dash-pkg-notify input[type=submit] { margin-top: -0.25em; } +form#dash-pkg-notify p { margin: 0; } + +/* dev dashboard: collapse stat tables by default */ +table#stats-by-maintainer, table#stats-by-repo, table#stats-by-arch { display: none; } +table.dash-stats .key { width: 50%; } +span.dash-click { font-weight: normal; font-size: 0.8em; color: #888; } +div.dash-stats h3 { color: #07b; border-bottom: 1px dotted #aaa; } + +/* dev dashboard: admin actions (add news items, todo list, etc) */ +ul.admin-actions { float: right; list-style: none; margin-top: -2.5em; } +ul.admin-actions li { display: inline; padding-left: 1.5em; } + +/* dev: todo list */ +#dev-todo .complete, #dev-todo-details .complete { color: green; } +#dev-todo .incomplete, #dev-todo-details .incomplete { color: red; } + +/* dev: signoff page */ +#dev-signoffs ul { list-style: none; margin: 0; padding: 0; } +#dev-signoffs .signoff-yes { color: green; font-weight: bold; } +#dev-signoffs .signoff-no { color: red; } +#dev-signoffs .signed-username { color: #888; margin-left: 0.5em; } + +/* Used by Django's FormWrappers */ +textarea.vLargeTextField { width: 450px; height: 250px; } + +/* highlight current website in the navbar */ +#archnavbar ul li.selected a { color: white !important; } -- cgit v1.2.3-54-g00ecf From 3be33a91a30b349c13191d11f625712352621390 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:16:35 -0700 Subject: New and legacy logo files for Artwork page Signed-off-by: Dan McGee --- media/logos/archlinux-logo-black-1200dpi.png | Bin 0 -> 283011 bytes media/logos/archlinux-logo-black-90dpi.png | Bin 0 -> 12971 bytes media/logos/archlinux-logo-black-scalable.svg | 153 +++++ media/logos/archlinux-logo-dark-1200dpi.png | Bin 0 -> 291912 bytes media/logos/archlinux-logo-dark-90dpi.png | Bin 0 -> 13805 bytes media/logos/archlinux-logo-dark-scalable.svg | 156 +++++ media/logos/archlinux-logo-light-1200dpi.png | Bin 0 -> 284099 bytes media/logos/archlinux-logo-light-90dpi.png | Bin 0 -> 13084 bytes media/logos/archlinux-logo-light-scalable.svg | 156 +++++ media/logos/archlinux-logo-white-1200dpi.png | Bin 0 -> 263771 bytes media/logos/archlinux-logo-white-90dpi.png | Bin 0 -> 11870 bytes media/logos/archlinux-logo-white-scalable.svg | 157 +++++ media/logos/legacy/arch-legacy-aqua-blue.png | Bin 0 -> 11150 bytes media/logos/legacy/arch-legacy-aqua-blue.svg | 200 ++++++ media/logos/legacy/arch-legacy-aqua-white.png | Bin 0 -> 9171 bytes media/logos/legacy/arch-legacy-aqua-white.svg | 200 ++++++ media/logos/legacy/arch-legacy-aqua.png | Bin 0 -> 7709 bytes media/logos/legacy/arch-legacy-aqua.svg | 103 ++++ media/logos/legacy/arch-legacy-blue1.png | Bin 0 -> 6563 bytes media/logos/legacy/arch-legacy-blue1.svg | 57 ++ media/logos/legacy/arch-legacy-blue2.png | Bin 0 -> 4588 bytes media/logos/legacy/arch-legacy-blue2.svg | 57 ++ media/logos/legacy/arch-legacy-noodle-blue.png | Bin 0 -> 13223 bytes media/logos/legacy/arch-legacy-noodle-blue.svg | 217 +++++++ media/logos/legacy/arch-legacy-noodle-box.png | Bin 0 -> 12060 bytes media/logos/legacy/arch-legacy-noodle-box.svg | 775 ++++++++++++++++++++++++ media/logos/legacy/arch-legacy-noodle-cup.png | Bin 0 -> 9971 bytes media/logos/legacy/arch-legacy-noodle-cup.svg | 474 +++++++++++++++ media/logos/legacy/arch-legacy-noodle-white.png | Bin 0 -> 11340 bytes media/logos/legacy/arch-legacy-noodle-white.svg | 217 +++++++ media/logos/legacy/arch-legacy-ribbon1.png | Bin 0 -> 11628 bytes media/logos/legacy/arch-legacy-ribbon2.png | Bin 0 -> 12390 bytes media/logos/legacy/arch-legacy-ribbon3.png | Bin 0 -> 15590 bytes media/logos/legacy/arch-legacy-ribbon4.png | Bin 0 -> 16747 bytes media/logos/legacy/arch-legacy-ribbon5.png | Bin 0 -> 4986 bytes media/logos/legacy/arch-legacy-ribbon6.png | Bin 0 -> 15700 bytes media/logos/legacy/arch-legacy-wombat-lg.png | Bin 0 -> 114926 bytes media/logos/legacy/arch-legacy-wombat.png | Bin 0 -> 7761 bytes 38 files changed, 2922 insertions(+) create mode 100644 media/logos/archlinux-logo-black-1200dpi.png create mode 100644 media/logos/archlinux-logo-black-90dpi.png create mode 100644 media/logos/archlinux-logo-black-scalable.svg create mode 100644 media/logos/archlinux-logo-dark-1200dpi.png create mode 100644 media/logos/archlinux-logo-dark-90dpi.png create mode 100644 media/logos/archlinux-logo-dark-scalable.svg create mode 100644 media/logos/archlinux-logo-light-1200dpi.png create mode 100644 media/logos/archlinux-logo-light-90dpi.png create mode 100644 media/logos/archlinux-logo-light-scalable.svg create mode 100644 media/logos/archlinux-logo-white-1200dpi.png create mode 100644 media/logos/archlinux-logo-white-90dpi.png create mode 100644 media/logos/archlinux-logo-white-scalable.svg create mode 100644 media/logos/legacy/arch-legacy-aqua-blue.png create mode 100644 media/logos/legacy/arch-legacy-aqua-blue.svg create mode 100644 media/logos/legacy/arch-legacy-aqua-white.png create mode 100644 media/logos/legacy/arch-legacy-aqua-white.svg create mode 100644 media/logos/legacy/arch-legacy-aqua.png create mode 100644 media/logos/legacy/arch-legacy-aqua.svg create mode 100644 media/logos/legacy/arch-legacy-blue1.png create mode 100644 media/logos/legacy/arch-legacy-blue1.svg create mode 100644 media/logos/legacy/arch-legacy-blue2.png create mode 100644 media/logos/legacy/arch-legacy-blue2.svg create mode 100644 media/logos/legacy/arch-legacy-noodle-blue.png create mode 100644 media/logos/legacy/arch-legacy-noodle-blue.svg create mode 100644 media/logos/legacy/arch-legacy-noodle-box.png create mode 100644 media/logos/legacy/arch-legacy-noodle-box.svg create mode 100644 media/logos/legacy/arch-legacy-noodle-cup.png create mode 100644 media/logos/legacy/arch-legacy-noodle-cup.svg create mode 100644 media/logos/legacy/arch-legacy-noodle-white.png create mode 100644 media/logos/legacy/arch-legacy-noodle-white.svg create mode 100644 media/logos/legacy/arch-legacy-ribbon1.png create mode 100644 media/logos/legacy/arch-legacy-ribbon2.png create mode 100644 media/logos/legacy/arch-legacy-ribbon3.png create mode 100644 media/logos/legacy/arch-legacy-ribbon4.png create mode 100644 media/logos/legacy/arch-legacy-ribbon5.png create mode 100644 media/logos/legacy/arch-legacy-ribbon6.png create mode 100644 media/logos/legacy/arch-legacy-wombat-lg.png create mode 100644 media/logos/legacy/arch-legacy-wombat.png diff --git a/media/logos/archlinux-logo-black-1200dpi.png b/media/logos/archlinux-logo-black-1200dpi.png new file mode 100644 index 00000000..a3082c39 Binary files /dev/null and b/media/logos/archlinux-logo-black-1200dpi.png differ diff --git a/media/logos/archlinux-logo-black-90dpi.png b/media/logos/archlinux-logo-black-90dpi.png new file mode 100644 index 00000000..6948b795 Binary files /dev/null and b/media/logos/archlinux-logo-black-90dpi.png differ diff --git a/media/logos/archlinux-logo-black-scalable.svg b/media/logos/archlinux-logo-black-scalable.svg new file mode 100644 index 00000000..10d6c4af --- /dev/null +++ b/media/logos/archlinux-logo-black-scalable.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/archlinux-logo-dark-1200dpi.png b/media/logos/archlinux-logo-dark-1200dpi.png new file mode 100644 index 00000000..24a5cefa Binary files /dev/null and b/media/logos/archlinux-logo-dark-1200dpi.png differ diff --git a/media/logos/archlinux-logo-dark-90dpi.png b/media/logos/archlinux-logo-dark-90dpi.png new file mode 100644 index 00000000..f3757c61 Binary files /dev/null and b/media/logos/archlinux-logo-dark-90dpi.png differ diff --git a/media/logos/archlinux-logo-dark-scalable.svg b/media/logos/archlinux-logo-dark-scalable.svg new file mode 100644 index 00000000..5a80cc4d --- /dev/null +++ b/media/logos/archlinux-logo-dark-scalable.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/archlinux-logo-light-1200dpi.png b/media/logos/archlinux-logo-light-1200dpi.png new file mode 100644 index 00000000..79e0a0f1 Binary files /dev/null and b/media/logos/archlinux-logo-light-1200dpi.png differ diff --git a/media/logos/archlinux-logo-light-90dpi.png b/media/logos/archlinux-logo-light-90dpi.png new file mode 100644 index 00000000..95803309 Binary files /dev/null and b/media/logos/archlinux-logo-light-90dpi.png differ diff --git a/media/logos/archlinux-logo-light-scalable.svg b/media/logos/archlinux-logo-light-scalable.svg new file mode 100644 index 00000000..5fd0716f --- /dev/null +++ b/media/logos/archlinux-logo-light-scalable.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/archlinux-logo-white-1200dpi.png b/media/logos/archlinux-logo-white-1200dpi.png new file mode 100644 index 00000000..50e700cf Binary files /dev/null and b/media/logos/archlinux-logo-white-1200dpi.png differ diff --git a/media/logos/archlinux-logo-white-90dpi.png b/media/logos/archlinux-logo-white-90dpi.png new file mode 100644 index 00000000..86679601 Binary files /dev/null and b/media/logos/archlinux-logo-white-90dpi.png differ diff --git a/media/logos/archlinux-logo-white-scalable.svg b/media/logos/archlinux-logo-white-scalable.svg new file mode 100644 index 00000000..70eb2dfe --- /dev/null +++ b/media/logos/archlinux-logo-white-scalable.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-aqua-blue.png b/media/logos/legacy/arch-legacy-aqua-blue.png new file mode 100644 index 00000000..9637ce72 Binary files /dev/null and b/media/logos/legacy/arch-legacy-aqua-blue.png differ diff --git a/media/logos/legacy/arch-legacy-aqua-blue.svg b/media/logos/legacy/arch-legacy-aqua-blue.svg new file mode 100644 index 00000000..f4c80109 --- /dev/null +++ b/media/logos/legacy/arch-legacy-aqua-blue.svg @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-aqua-white.png b/media/logos/legacy/arch-legacy-aqua-white.png new file mode 100644 index 00000000..25fe9001 Binary files /dev/null and b/media/logos/legacy/arch-legacy-aqua-white.png differ diff --git a/media/logos/legacy/arch-legacy-aqua-white.svg b/media/logos/legacy/arch-legacy-aqua-white.svg new file mode 100644 index 00000000..60b554fa --- /dev/null +++ b/media/logos/legacy/arch-legacy-aqua-white.svg @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-aqua.png b/media/logos/legacy/arch-legacy-aqua.png new file mode 100644 index 00000000..881e1709 Binary files /dev/null and b/media/logos/legacy/arch-legacy-aqua.png differ diff --git a/media/logos/legacy/arch-legacy-aqua.svg b/media/logos/legacy/arch-legacy-aqua.svg new file mode 100644 index 00000000..30860912 --- /dev/null +++ b/media/logos/legacy/arch-legacy-aqua.svg @@ -0,0 +1,103 @@ + + + + \ No newline at end of file diff --git a/media/logos/legacy/arch-legacy-blue1.png b/media/logos/legacy/arch-legacy-blue1.png new file mode 100644 index 00000000..3ed6c248 Binary files /dev/null and b/media/logos/legacy/arch-legacy-blue1.png differ diff --git a/media/logos/legacy/arch-legacy-blue1.svg b/media/logos/legacy/arch-legacy-blue1.svg new file mode 100644 index 00000000..5a6f2c71 --- /dev/null +++ b/media/logos/legacy/arch-legacy-blue1.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-blue2.png b/media/logos/legacy/arch-legacy-blue2.png new file mode 100644 index 00000000..8b5b791e Binary files /dev/null and b/media/logos/legacy/arch-legacy-blue2.png differ diff --git a/media/logos/legacy/arch-legacy-blue2.svg b/media/logos/legacy/arch-legacy-blue2.svg new file mode 100644 index 00000000..48b28338 --- /dev/null +++ b/media/logos/legacy/arch-legacy-blue2.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-noodle-blue.png b/media/logos/legacy/arch-legacy-noodle-blue.png new file mode 100644 index 00000000..b24d34cf Binary files /dev/null and b/media/logos/legacy/arch-legacy-noodle-blue.png differ diff --git a/media/logos/legacy/arch-legacy-noodle-blue.svg b/media/logos/legacy/arch-legacy-noodle-blue.svg new file mode 100644 index 00000000..7b6485b8 --- /dev/null +++ b/media/logos/legacy/arch-legacy-noodle-blue.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-noodle-box.png b/media/logos/legacy/arch-legacy-noodle-box.png new file mode 100644 index 00000000..1162ed64 Binary files /dev/null and b/media/logos/legacy/arch-legacy-noodle-box.png differ diff --git a/media/logos/legacy/arch-legacy-noodle-box.svg b/media/logos/legacy/arch-legacy-noodle-box.svg new file mode 100644 index 00000000..8f17f00a --- /dev/null +++ b/media/logos/legacy/arch-legacy-noodle-box.svg @@ -0,0 +1,775 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-noodle-cup.png b/media/logos/legacy/arch-legacy-noodle-cup.png new file mode 100644 index 00000000..b4f93078 Binary files /dev/null and b/media/logos/legacy/arch-legacy-noodle-cup.png differ diff --git a/media/logos/legacy/arch-legacy-noodle-cup.svg b/media/logos/legacy/arch-legacy-noodle-cup.svg new file mode 100644 index 00000000..8d6a0442 --- /dev/null +++ b/media/logos/legacy/arch-legacy-noodle-cup.svg @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-noodle-white.png b/media/logos/legacy/arch-legacy-noodle-white.png new file mode 100644 index 00000000..a12ee21c Binary files /dev/null and b/media/logos/legacy/arch-legacy-noodle-white.png differ diff --git a/media/logos/legacy/arch-legacy-noodle-white.svg b/media/logos/legacy/arch-legacy-noodle-white.svg new file mode 100644 index 00000000..03e1b15a --- /dev/null +++ b/media/logos/legacy/arch-legacy-noodle-white.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/logos/legacy/arch-legacy-ribbon1.png b/media/logos/legacy/arch-legacy-ribbon1.png new file mode 100644 index 00000000..fb8e7720 Binary files /dev/null and b/media/logos/legacy/arch-legacy-ribbon1.png differ diff --git a/media/logos/legacy/arch-legacy-ribbon2.png b/media/logos/legacy/arch-legacy-ribbon2.png new file mode 100644 index 00000000..66635999 Binary files /dev/null and b/media/logos/legacy/arch-legacy-ribbon2.png differ diff --git a/media/logos/legacy/arch-legacy-ribbon3.png b/media/logos/legacy/arch-legacy-ribbon3.png new file mode 100644 index 00000000..c3c00b85 Binary files /dev/null and b/media/logos/legacy/arch-legacy-ribbon3.png differ diff --git a/media/logos/legacy/arch-legacy-ribbon4.png b/media/logos/legacy/arch-legacy-ribbon4.png new file mode 100644 index 00000000..33a78edf Binary files /dev/null and b/media/logos/legacy/arch-legacy-ribbon4.png differ diff --git a/media/logos/legacy/arch-legacy-ribbon5.png b/media/logos/legacy/arch-legacy-ribbon5.png new file mode 100644 index 00000000..abf7cce4 Binary files /dev/null and b/media/logos/legacy/arch-legacy-ribbon5.png differ diff --git a/media/logos/legacy/arch-legacy-ribbon6.png b/media/logos/legacy/arch-legacy-ribbon6.png new file mode 100644 index 00000000..9f275f22 Binary files /dev/null and b/media/logos/legacy/arch-legacy-ribbon6.png differ diff --git a/media/logos/legacy/arch-legacy-wombat-lg.png b/media/logos/legacy/arch-legacy-wombat-lg.png new file mode 100644 index 00000000..0661b6f5 Binary files /dev/null and b/media/logos/legacy/arch-legacy-wombat-lg.png differ diff --git a/media/logos/legacy/arch-legacy-wombat.png b/media/logos/legacy/arch-legacy-wombat.png new file mode 100644 index 00000000..67e1afac Binary files /dev/null and b/media/logos/legacy/arch-legacy-wombat.png differ -- cgit v1.2.3-54-g00ecf From dd9f1e3e91db5ede16900fc9257f921b37538410 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:19:29 -0700 Subject: Updated error page semantics Signed-off-by: Dan McGee --- templates/403.html | 8 ++++---- templates/404.html | 8 ++++---- templates/500.html | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/403.html b/templates/403.html index c853fef1..6b5fc084 100644 --- a/templates/403.html +++ b/templates/403.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block content %} -
-

403 - Access Forbidden

- Sorry, the page you've requested is not available. -
+
+

403 - Access Forbidden

+

Sorry, the page you've requested is not available.

+
{% endblock %} diff --git a/templates/404.html b/templates/404.html index 9e389ba9..33271c66 100644 --- a/templates/404.html +++ b/templates/404.html @@ -2,9 +2,9 @@ {% block title %}Arch Linux - Page Not Found{% endblock %} {% block content %} -
-

404 - Page Not Found

- Sorry, the page you've requested does not exist. -
+
+

404 - Page Not Found

+

Sorry, the page you've requested does not exist.

+
{% endblock %} diff --git a/templates/500.html b/templates/500.html index 9566fc29..7f040638 100644 --- a/templates/500.html +++ b/templates/500.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block content %} -
-

500 - Internal Server Error

- Something has gone horribly wrong. Back away slowly. -
+
+

500 - Internal Server Error

+

Something has gone horribly wrong. Back away slowly.

+
{% endblock %} -- cgit v1.2.3-54-g00ecf From 958bc6311392849d0bcbfe834dd95f2e49817ce8 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:19:58 -0700 Subject: Add alphabetical sorting to mirrorlists Also unify the sorting at the model-level for donors and remove the now duplicate sorting in the admin for mirrors. Signed-off-by: Dan McGee --- main/admin.py | 1 - main/models.py | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/main/admin.py b/main/admin.py index 0585e5c3..ec10d9cd 100644 --- a/main/admin.py +++ b/main/admin.py @@ -55,7 +55,6 @@ class MirrorAdmin(admin.ModelAdmin): form = MirrorAdminForm list_display = ('name', 'tier', 'country', 'active', 'public', 'isos', 'admin_email', 'supported_protocols') list_filter = ('tier', 'country', 'active', 'public') - ordering = ['country', 'name'] search_fields = ('name',) inlines = [ MirrorUrlInlineAdmin, diff --git a/main/models.py b/main/models.py index 1f938cc5..8dc05a53 100644 --- a/main/models.py +++ b/main/models.py @@ -72,6 +72,10 @@ class Mirror(models.Model): rsync_user = models.CharField(max_length=50, blank=True, default='') rsync_password = models.CharField(max_length=50, blank=True, default='') notes = models.TextField(blank=True) + + class Meta: + ordering = ('country', 'name') + def __unicode__(self): return self.name @@ -106,10 +110,13 @@ class Meta: class Donor(models.Model): id = models.AutoField(primary_key=True) name = models.CharField(max_length=255, unique=True) + def __unicode__(self): return self.name + class Meta: db_table = 'donors' + ordering = ['name'] class News(models.Model): id = models.AutoField(primary_key=True) -- cgit v1.2.3-54-g00ecf From 55f562a19bf015644ac35fb7704cd19cba09f0aa Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:40:52 -0700 Subject: Redesigned base template * content now above sidebar text in source code * new dev navbar * descriptive href titles * added body class block * cleaned up footer Signed-off-by: Dan McGee --- templates/base.html | 143 +++++++++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 63 deletions(-) diff --git a/templates/base.html b/templates/base.html index cc5fadd2..922ce9fd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,73 +1,90 @@ - - {% block title %}Arch Linux{% endblock %} - - - - - - {% block head %} - {% endblock %} - - -
- - + + + +
+ +
+

+

+

+

+

+

+

+

+

+

+

+
+ +
+ +
+ + Velocity Network - It's about time + We would like to express our thanks to SevenL Networks for their generous contribution + AirVM.com - Your Green Technology Partner + +
{% endblock %} -- cgit v1.2.3-54-g00ecf From b26e0d1fd66d7b74e3da5f1e62757401811b46ab Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 12:00:40 -0700 Subject: Redesigned Package Details page * better semantics * removed unnecessary CSS * form accessibility * dynamic/descriptive href titles throughout Signed-off-by: Dan McGee --- templates/packages/details.html | 258 ++++++++++++++++++++++------------------ 1 file changed, 145 insertions(+), 113 deletions(-) diff --git a/templates/packages/details.html b/templates/packages/details.html index 78209d83..19a4b2bc 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -1,134 +1,166 @@ {% extends "base.html" %} {% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package Details{% endblock %} + {% block content %} -
-

{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

-
-
    -
  • SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})
    • -
  • SVN Entries (trunk)
    • -
  • Bug Reports
    • -
  • +
    + +

    Package Details: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}

    + +
    + + + + {% if user.is_authenticated %} +
    +
    +

    +   

    +
    + {% endif %} + +
    + + + + + + + + + + {% ifnotequal pkg.pkgname pkg.pkgbase %} + + + {% endifnotequal %} + + + + + + + + + + + {% with pkg.maintainers as maints %} + + {% endwith %} + + + + + + + + + + + + + +
    Architecture:{{ pkg.arch.name }}
    Repository:{{ pkg.repo.name|capfirst }}
    Base Package Name:{{ pkg.pkgbase }}
    Description:{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}
    Upstream URL:{% if pkg.url %}{{ pkg.url }}{% endif %}
    License:{{ pkg.license }}
    Maintainers:{% if maints %} + {% for m in maints %} + {{ m.get_full_name }}
    + {% endfor %} + {% else %}Orphan{% endif %} +
    Package Size:{{ pkg.compressed_size|filesizeformat }}
    Installed Size:{{ pkg.installed_size|filesizeformat }}
    Build Date:{{ pkg.build_date }} UTC
    Last Updated:{{ pkg.last_update|date:"Y-m-d" }}
    + +
    + + {% with pkg.get_depends as deps %} +
    + +

    + Dependencies ({{deps|length}})

    + + {% if deps %} +
      + {% for depend in deps %} + {% ifequal depend.pkg None %} +
    • {{ depend.dep.depname }} (virtual)
      • + {% else %} +
    • {{ depend.dep.depname }} + {{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %} + (testing){% endif %}
      • + {% endifequal %} + {% endfor %}
    -
    - - - - - - - - {% ifnotequal pkg.pkgname pkg.pkgbase %} - - - {% endifnotequal %} - - - - - - - - - - - {% with pkg.maintainers as maints %} - - {% endwith %} - - - - - - - - - - - - - -
    Architecture:{{ pkg.arch.name }}
    Repository:{{ pkg.repo.name|capfirst }}
    Base Package Name:{{ pkg.pkgbase }}
    Description:{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}
    Upstream URL:{% if pkg.url %}{{ pkg.url }}{% endif %}
    License:{{ pkg.license }}
    Maintainer:{% if maints %} - {% for m in maints %} - {{ m.get_full_name }}
    - {% endfor %} - {% else %}Orphan{% endif %} -
    Package Size:{{ pkg.compressed_size|filesizeformat }}
    Installed Size:{{ pkg.installed_size|filesizeformat }}
    Build Date:{{ pkg.build_date }} UTC
    Last Updated:{{ pkg.last_update|date:"Y-m-d" }}
    -
    - - - - - -
    - {% with pkg.get_depends as deps %} -
    -

    Dependencies ({{deps|length}}):

    - {% if deps %} -
      - {% for depend in deps %} - {% ifequal depend.pkg None %} -
    • {{ depend.dep.depname }} (virtual)
      • - {% else %} -
    • {{ depend.dep.depname }}{{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %} (testing){% endif %}
      • - {% endifequal %} - {% endfor %} -
    - {% endif %} -
    - {% endwith %} -     		- {% with pkg.get_requiredby as rqdby %} -
    -

    Required By ({{rqdby|length}}):

    - {% if rqdby %} -
      - {% for req in rqdby %} -
    • {{ req.pkgname }}{% if req.repo.testing %} (testing){% endif %}
      • - {% endfor %} -
    - {% endif %} -
    - {% endwith %} -
    -
    -

    Files:

    -

    - View File List -

    -
    -
    + {% endif %} + +
    + {% endwith %} + + {% with pkg.get_requiredby as rqdby %} +
    + +

    + Required By ({{rqdby|length}})

    + + {% if rqdby %} +
      + {% for req in rqdby %} +
    • {{ req.pkgname }} + {% if req.repo.testing %} (testing){% endif %}
      • + {% endfor %} +
    + {% endif %} + +
    + {% endwith %} + +
    + +

    + Package Contents

    + + + +
    + +
+
+ {% load cdn %}{% jquery %} {% endblock %} - -- cgit v1.2.3-54-g00ecf From d7d0b26593348e17fa85889c4adbf72c1680bc4c Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:56:56 -0700 Subject: Redesigned flag page * form accessibility * descriptive href titles * better semantics Signed-off-by: Dan McGee --- templates/packages/flag.html | 56 +++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/templates/packages/flag.html b/templates/packages/flag.html index 1071fdf8..1e85be89 100644 --- a/templates/packages/flag.html +++ b/templates/packages/flag.html @@ -2,28 +2,40 @@ {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %} {% block content %} -
- {% if confirmed %} -

Thank you. Maintainers have been notified.

- {% else %} -

If you notice that one of Arch's packages is out of date (ie, there is a - newer stable release available), then please notify us using the - form below.

-

The message box portion of the flag utility is optional, and meant for - short messages only. If you need more than 200 characters for your - message, then file a bug report, email the maintainer directly, or send an - email to the arch-general mailing list with your additional text.

- -

Note: Please do not use this facility if the package is - broken! Use the bug tracker - instead.

+
+{% if confirmed %} +

Package Flagged

+ +

Thank you, the maintainers have been notified about {{ pkg.pkgname }}.

+ +

You can return to the package details page for + {{pkg.pkgname}}.

+{% else %} +

Flag Package: {{ pkg.pkgname }}

+ +

If you notice a package is out of date (i.e., there is a newer + stable release available), then please notify us using + the form below.

+ +

The message box portion of the flag utility is optional, and meant + for short messages only. If you need more than 200 characters for your + message, then file a bug report, email the maintainer directly, or send + an email to the arch-general mailing list + with your additional text.

+ +

Note: Please do not use this facility if the + package is broken! Use the bug tracker instead.

+

Please confirm your flag request for {{pkg.pkgname}}:

-
- - {{form}} -
- -
- {% endif %} + +
+
+ {{ form.as_p }} +
+

+
+{% endif %}
{% endblock %} -- cgit v1.2.3-54-g00ecf From 5c8f957904c1fb3cb1d7835e24048ca0263ab291 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:54:42 -0700 Subject: Redesigned flaghelp page * better semantics * consistent appearance with archweb theme * descriptive href titles Signed-off-by: Dan McGee --- templates/packages/flaghelp.html | 52 ++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html index c376175e..d8ca643b 100644 --- a/templates/packages/flaghelp.html +++ b/templates/packages/flaghelp.html @@ -1,27 +1,37 @@ - - Flagging Packages - - - -
-

If you notice that one of Arch's packages is out of date (ie, - there is a newer stable release available), then please - notify us by using the Flag button in the Package - Details screen. This will notify the maintainer responsible - for that package so they can update it.

+ + Flagging Packages + + + + -

The message box portion of the flag utility is optional, and - meant for short messages only. If you need more than 200 characters - for your message, then file a bug report, email the maintainer - directly, or send an email to the arch-general mailing list with - your additional text.

+

Flagging Packages

-

Note: Please do not use this facility if the - package is broken! Use the - bugtracker instead.

-
- +

If you notice that a package is out-of-date (i.e., there is a newer + stable release available), then please notify us by + using the Flag button in the Package Details + screen. This will notify the maintainer(s) responsible for that + package so they can update it.

+ +

The message box portion of the flag utility is optional, and meant + for short messages only. If you need more than 200 characters for your + message, then file a bug report, email the maintainer directly, or send + an email to the arch-general mailing list + with your additional text.

+ +

Note: Please do not use this facility if the + package is broken! Use the bugtracker instead.

+ + -- cgit v1.2.3-54-g00ecf From 23c99a74723b50d3a9af8886ebaae4e4cc9236c1 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:17:08 -0700 Subject: Redesigned login and logout pages Signed-off-by: Dan McGee --- templates/registration/login.html | 31 +++++++++++++++---------------- templates/registration/logout.html | 7 +++---- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/templates/registration/login.html b/templates/registration/login.html index b3b264c3..2f626566 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,23 +1,22 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Developer Login{% endblock %} {% block content %} +
-
-

Developer Login

-{% if form.has_errors %} -

Your username and password didn't match. Please try again.

-{% endif %} -

+

Developer Login

-
- - - - - -
{{ form.username }}
{{ form.password }}
-
-
+ {% if form.has_errors %} + + {% endif %} -{% endblock %} +
+
+ Enter login credentials + {{ form.as_p }} +

+
+
+
+{% endblock %} diff --git a/templates/registration/logout.html b/templates/registration/logout.html index 2b829869..f8e07621 100644 --- a/templates/registration/logout.html +++ b/templates/registration/logout.html @@ -1,10 +1,9 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Logout successful{% endblock %} {% block content %} - -
-You've been logged out. +
+

Logout successful.

- {% endblock %} -- cgit v1.2.3-54-g00ecf From 780c19c209e59f0c2a105200dca32b3ce0e3ec76 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:17:47 -0700 Subject: Redesigned mirrorlist generator page Signed-off-by: Dan McGee --- templates/mirrors/index.html | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/templates/mirrors/index.html b/templates/mirrors/index.html index 73949c6f..b347a086 100644 --- a/templates/mirrors/index.html +++ b/templates/mirrors/index.html @@ -1,24 +1,21 @@ {% extends "base.html" %} {% load package_extras %} -{% block title %}Arch Linux - Generate Mirrorlist{% endblock %} +{% block title %}Arch Linux - Pacman Mirrorlist Generator{% endblock %} {% block content %} -
-

Generate Custom Mirrorlist

-
- - - - {% td_input mirrorlist_form.arch %} - - - - {% td_input mirrorlist_form.country %} - - - - -
Architecture
Country
+
+ +

Pacman Mirrorlist Generator

+ +

The following form can generate a custom up-to-date + pacman mirrorlist based on geography. + Simply replace the contents of /etc/pacman.d/mirrorlist with + the generated code.

+ + + {{ mirrorlist_form.as_p }} +

{% endblock %} -- cgit v1.2.3-54-g00ecf From 7aa129155ff44c0058471358d6a561149ff7d1f0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 May 2010 13:24:33 -0500 Subject: Touch up download page a tad more Signed-off-by: Dan McGee --- templates/public/download.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/public/download.html b/templates/public/download.html index a8d358a2..051d9960 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -19,16 +19,12 @@

Release Info


Links and Instructions:
- Downloading Instructions + Readme and Instructions
Arch Linux Install Guide -
- - Using Install Images on a USB Stick -

BitTorrent Download (recommended)

-- cgit v1.2.3-54-g00ecf From 465a74eddb0df7fa8312c8ca2e65596812470922 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:18:45 -0700 Subject: Updated generic form for accessibility Signed-off-by: Dan McGee --- templates/general_form.html | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/templates/general_form.html b/templates/general_form.html index 776f3672..d499919a 100644 --- a/templates/general_form.html +++ b/templates/general_form.html @@ -1,25 +1,23 @@ {% extends "base.html" %} +{% block title %}Arch Linux - {{title}}{% endblock %} {% block content %} -
-

{{title}}

- {% if description %}{{description}}{% endif %} -
- +
+ +

{{title}}

+ + {% if description %}{{description}}{% endif %} + + +
{% for field in form %} -
- - - +


+ {{field.help_text}} {% else %}: {% endif %} + {{field}} {% if field.required %}*{% endif%}

{% endfor %} - - - -
- {{field.label}}: -
{{field.help_text}}		{{field}}
- -
-
-
+ +

+ + +
{% endblock %} -- cgit v1.2.3-54-g00ecf From 06f52613522adebd9228221a4fa36ab5746f4fdd Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:24:37 -0700 Subject: Updated template page semantics Signed-off-by: Dan McGee --- templates/public/blank.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 %} -
-

Download Arch Linux

-

+
+

Sample page title

-

{% endblock %} - -- cgit v1.2.3-54-g00ecf From 3945c52682702a9b4b62a46e667f2c3307f06907 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:25:02 -0700 Subject: Redesigned News Pages Signed-off-by: Dan McGee --- templates/news/add.html | 39 ++++++++++++++------------ templates/news/delete.html | 29 +++++++++++-------- templates/news/list.html | 69 ++++++++++++++++++++++++++++++---------------- templates/news/view.html | 29 ++++++++++++------- 4 files changed, 103 insertions(+), 63 deletions(-) diff --git a/templates/news/add.html b/templates/news/add.html index ef3f211c..38b5b21d 100644 --- a/templates/news/add.html +++ b/templates/news/add.html @@ -1,22 +1,25 @@ {% extends "base.html" %} -{% block title %}Arch Linux - {% if form.instance.id %}Edit{% else %}Add{% endif %} News{% endblock %} +{% block title %}Arch Linux - News: {% if form.instance.id %}Edit{% else %}Add{% endif %} Article{% endblock %} {% block content %} -
- {% if form.instance.id %} -

Edit News

- {% else %} -

Add News

- {% endif %} -
- - {{form}} - - - -
- -
-
-
+
+ + {% if form.instance.id %} +

News: Edit Article

+ {% else %} +

News: Add Article

+ {% endif %} + +
+
+ {{ form.as_p }} +
+ {% if form.instance.id %} +

+ {% else %} +

+ {% endif %} +
+ +
{% endblock %} diff --git a/templates/news/delete.html b/templates/news/delete.html index c3824a26..6a2fa1e8 100644 --- a/templates/news/delete.html +++ b/templates/news/delete.html @@ -2,15 +2,22 @@ {% block title %}Arch Linux - Delete News{% endblock %} {% block content %} -
-

Confirm Delete

-
- You are about to delete the news item '{{news}}'. -

- Are you sure? -

-
-     -
-
+
+ +

News: Delete Entry Confirmation

+ +

You are about to delete the following news item:

+ +
+ {{news}} +
+ +

Are you sure?

+ +
+

+
+ +
{% endblock %} diff --git a/templates/news/list.html b/templates/news/list.html index a35c41e0..cadc24a2 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,28 +1,49 @@ {% extends "base.html" %} {% block title %}Arch Linux - News{% endblock %} + {% block content %} -
- {% if perms.main.add_news %} - - {% endif %} -

News Updates

- - {% for item in news_list %} - - - - - - {% endfor %} -
{{ item.postdate }}{{ item.title }} - {% if perms.main.change_news %} - edit - {% endif %} - {% if perms.main.delete_news %} - delete - {% endif %} -
-
+
+ +

News Archives

+ + {% if perms.main.add_news %} + + {% endif %} + + + + + + + + {% if perms.main.change_news %} + + {% endif %} + + + + {% for item in news_list %} + + + + + {% if perms.main.change_news %} + + {% endif %} + + {% endfor %} + +
PublishedTitleAuthor
{{ item.postdate }}{{ item.title }}{{ item.author.get_full_name }} + Edit + {% endif %} + {% if perms.main.delete_news %} +   Delete +
+ +
{% endblock %} diff --git a/templates/news/view.html b/templates/news/view.html index 2f7c3d87..1b82bc08 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -1,14 +1,23 @@ {% extends "base.html" %} -{% block title %}Arch Linux - {{ news.title }}{% endblock %} +{% block title %}Arch Linux - News: {{ news.title }}{% endblock %} {% block content %} -
-
- {{ news.author.get_full_name }}
- {{ news.postdate }} -
-

{{ news.title }}

-

- {{ news.content|safe|linebreaks }} -
+
+ +

News: {{ news.title }}

+ + {% if perms.main.change_news %} + + {% endif %} + +

{{ news.postdate }} - {{ news.author.get_full_name }}

+ + {{ news.content|safe|linebreaks }} + +
{% endblock %} -- cgit v1.2.3-54-g00ecf From 035fff33289e20407edd68ec61089aea1de1a36e Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:25:52 -0700 Subject: Redesigned artwork page with updated image paths Signed-off-by: Dan McGee --- templates/public/art.html | 193 +++++++++++++++++++++++++++++----------------- 1 file changed, 122 insertions(+), 71 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 %} -
-

Arch Linux Logos and Artwork

-

Official Packages

-

Official logos, artwork, and more are available from the Extra repository. Currently, these packages are:

+
+ +

Arch Linux Logos and Artwork

+ +

Logos for Press Usage

+ +

The following Arch Linux logos are available for press and other use, subject to + the restrictions of our trademark policy.

+ +

Two-color standard version
+ Also available in print-quality + PNG and scalable + SVG formats.

+ + Arch Linux PNG logo @ 90dpi + +

Two-color inverted version (for dark backgrounds)
+ Also available in print-quality + PNG and scalable + SVG formats.

+ + Arch Linux PNG logo @ 90dpi + +

One-color standard version
+ Also available in print-quality + PNG and scalable + SVG formats.

+ + Arch Linux PNG logo @ 90dpi + +

One-colour inverted version (for dark backgrounds)
+ Also available in print-quality + PNG and scalable + SVG formats.

+ + Arch Linux PNG logo @ 90dpi + +

Logos and Artwork for the Community

+ +

Official logos and artwork are also available directly from the + repositories. Currently, these packages are:

+
    -
  • archlinux-artwork - official logos, icons and CD labels
    • -
  • archlinux-wallpaper - a variety of desktop wallpapers for standard and widescreen resolutions
    • -
  • archlinux-themes-gdm - GDM login themes
    • -
  • archlinux-themes-kde - KDE themes and icons
    • -
  • archlinux-themes-kdm - KDM login themes
    • -
  • archlinux-themes-ksplash - Ksplash themes
    • -
  • archlinux-themes-slim - SLiM login themes
    • +
  • archlinux-artwork - official logos, icons and CD labels
    • +
  • archlinux-wallpaper - a variety of desktop wallpapers + for standard and widescreen resolutions
    • +
  • archlinux-themes-kde - KDE themes and icons
    • +
  • archlinux-themes-kdm - KDM login themes
    • +
  • archlinux-themes-slim - SLiM login themes
-

Alternatively, you can download the source files via FTP.

+ +

Alternatively, you can download the source files via FTP.

+

Former Logos

-

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.

-

Original Ribbon Logos

-

- Ribbon Logo 1 - Ribbon Logo 2 - Ribbon Logo Black -

-

- Ribbon Logo Binary 1 - Ribbon Logo Binary 2 - Ribbon Logo Binary Black -

-

"Arch Blue" Logos

-

- - Arch Blue Full - - - - Arch Blue Compact - - -

-

"Arch Aqua" Logos

-

- - Arch Aqua - - - Arch Aqua Blue - - - Arch Aqua White - -

-

Release-specific Logos

-

- - Arch Wombat - -

-

- - Arch Noodle Blue - - - Arch Noodle White - - - Arch Box of Noodles - - - Arch Cup of Noodles - -

-
-{% endblock %} +

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 + tradermarks@archlinux.org with any questions.

+ +

Original Ribbon Series

+ +
+ Arch Ribbon Logo 1 + Arch Ribbon Logo 2 + Arch Ribbon Logo 5 +
+ +
+ Arch Ribbon Logo 3 + Arch Ribbon Logo 4 + Arch Ribbon Logo 6 +
+ +

"Arch Blue" Series

+ +
+ + Arch Blue + + Arch Blue Vertical +
+ +

"Arch Aqua" Series

+ +
+ + Arch Aqua + + Arch Aqua Blue + + Arch Aqua White +
+ +

Release-specific Series

+ +
+ + Arch Wombat + + Arch Noodle Blue + + Arch Noodle White + + Arch Box of Noodles + + Arch Cup of Noodles +
+ +
+{% endblock %} -- cgit v1.2.3-54-g00ecf From 49651ce0d5ca09f7e63b3a179b0017e8e3aed477 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:26:38 -0700 Subject: Redesigned developer profiles Signed-off-by: Dan McGee --- templates/public/developer_list.html | 112 +++++++++++++++++++---------------- 1 file changed, 60 insertions(+), 52 deletions(-) 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 @@ - - +
{% for dev in dev_list %} {% with dev.get_profile as prof %} - - - + + + + {% endwith %} {% endfor %} -
- Image for {{ prof.alias }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:{{ dev.get_full_name }}
Alias:{{ prof.alias }}
Email:{{ prof.public_email }}
Other Contact:{{ prof.other_contact }}
Roles:{{ prof.roles }}
-
Website:{% if prof %}{{ prof.website }}{% endif %}
Occupation:{{ prof.occupation }}
YOB:{% if prof.yob %}{{ prof.yob }}{% endif %}
Location:{{ prof.location }}
Languages:{{ prof.languages }}
Interests:{{ prof.interests }}
Favorite Distros:{{ prof.favorite_distros }}
-
+ Image for {{ prof.alias }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name:{{ dev.get_full_name }}
Alias:{{ prof.alias }}
Email:{{ prof.public_email }}
Other Contact:{{ prof.other_contact }}
Roles:{{ prof.roles }}
+
Website:{% if prof %} + {{ prof.website }}{% endif %}
Occupation:{{ prof.occupation }}
YOB:{% if prof.yob %}{{ prof.yob }}{% endif %}
Location:{{ prof.location }}
Languages:{{ prof.languages }}
Interests:{{ prof.interests }}
Favorite Distros:{{ prof.favorite_distros }}
+
+ -- cgit v1.2.3-54-g00ecf From d5f065fe531d8672ec162caa10873804184ec25d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 May 2010 14:03:48 -0500 Subject: Revamp donate page Signed-off-by: Dan McGee --- media/archweb.css | 11 ++-- templates/public/donate.html | 126 ++++++++++++++++++++++++++----------------- 2 files changed, 84 insertions(+), 53 deletions(-) diff --git a/media/archweb.css b/media/archweb.css index d981bdf1..f274c8a8 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -146,10 +146,13 @@ form#newsform input[type=text], form#newsform textarea { width: 75%; } /* donate: donor list */ -div#donor-list ul { margin: 0.5em 0; padding: 0; list-style: none; } -div#donor-list li { margin: 0; padding: 0; font-size: 0.8em; } -div#donor-list br { clear: left; } -div.donor-slice { float: left; width: 16em; } +div#donor-list ul { width: 100%; } +div#donor-list li { + float: left; + /* max 4 columns, but possibly fewer if screen size doesn't allow for more */ + width: 25%; + min-width: 20em; +} /* download page */ #arch-downloads h3 { border-bottom: 1px dotted #aaa; } 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 %} -
-

Donate to Arch Linux

-

- 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. -

- There are many ways to help Arch Linux. If technical development, +

+ +

Donate to Arch Linux

+ +

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.

+ +

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. -

- Many thanks! -

-
+ help us by dropping a few bucks our way.

+ +

Many thanks!

+ +

Monetary donations

+ +

Financial contributions are accepted via PayPal. + Funds are used for server hardware upgrades, conventions, schwag giveaways and more.

+ +
-
- - - - - - - - - - - - + +

+

+

+

+

+

+

+

+

+

+

-
-

Sponsors and Contributions

-

We'd like to thank Velocity Network for contributing space in a server rack, bandwidth, and electricity for our main server for the last couple of years.

-
- velocity network - it's about time -
-

We also wish to extend a special Thank You to SevenL Networks 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.

-
- We would like to express our thanks to SevenL Networks for their generous contribution -
-

More thanks go to AirVM.com for contributing a VMWare-based Virtual Machine.

-
- AirVM.com - Your Green Technology Partner + +

Commercial sponsors and contributions

+ +

We'd like to thank Velocity Network for contributing space + in a server rack, bandwidth, and electricity for our main server.

+ + + +

We also wish to extend a special Thank You to SevenL Networks + 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.

+ + + +

More thanks go to AirVM.com for contributing a VMWare-based Virtual Machine.

+ + + +

Past donors

+ +
+
    + {% for donor in donors %} +
  • {{ donor.name }}
    • {% endfor %} +
-

Past Donors

-
    - {% for donor in donors %} -
  • {{ donor.name }}
    • {% endfor %} -
-
+
+

A huge thanks to you all for your contributions!

{% endblock %} - -- cgit v1.2.3-54-g00ecf From 1341dbdab80e67572ba75fc00f653e5852cc41bb Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 May 2010 14:21:30 -0500 Subject: Revamp download page Signed-off-by: Dan McGee --- templates/public/download.html | 252 ++++++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 104 deletions(-) diff --git a/templates/public/download.html b/templates/public/download.html index 051d9960..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 %} -
-

Release Info

-
-

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`.

- - Current Release: 2010.05
- Included Kernel: 2.6.33.4
- Resources: - Bug Tracker - - - Mailing List -
-
- Links and Instructions:
- - Readme and Instructions - -
- - Arch Linux Install Guide - -
-

BitTorrent Download (recommended)

-
-

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.

- -

Netinstall ISOs

-

- i686 -
- x86_64 -
- Dual Arch -

- -

Core ISOs

-

- i686 -
- x86_64 -
- Dual Arch -

- -
-

Buy A CD

-
- These suppliers donate a small percentage of each CD purchased to - the Arch Linux project: - - - -
- - Purchase CD from OSDisc -
- - Purchase CD from Shop Linux Online -
- You can also purchase Arch on CD from these suppliers: - +
+ +

Arch Linux Downloads

+ + {% with "2010.05" as version %} +

Release Info

+ +

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`.

+ + + +

Links and Instructions:

+ + + +

BitTorrent Download (recommended)

+ +

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.

+ +
+ + + + + + + + + + + + + +
Formati686 CPUx86-64 CPUDual ArchitectureDescription
- Purchase CD from LinuxCD + Netinstall Image + + Download + + Download + + Download + + Downloads and installs packages versions via FTP for absolute freshness. +
+ Core Image + + Download + + Download + + Download + + Core packages are included on the media. Good for basic off-line installation. +
+ {% endwith %} + +

Get Arch Linux on CD

+ +

The following suppliers donate a portion of their proceeds to the + Arch Linux project:

+ + + +

Arch Linux CDs are also available for purchase from these suppliers:

+ + + + +

HTTP/FTP Direct Downloads

+ +

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.

+ +

Checksums

+ +

File integrity checksums for the latest releases can be found below:

+ + + + + + + + + + + + + -

Server Location

Download

+ {% for mirror_url in mirror_url_list %} + {% ifchanged mirror_url.mirror.country %} +
{{mirror_url.mirror.country}} + {% endifchanged %} + {% ifchanged mirror_url.mirror.name %}
-
- - -

HTTP/FTP Download

-
-

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.

-

Checksums

-

- SHA1 -
- MD5 -

- - - - - -

Mirror Sites

- {% for mirror_url in mirror_url_list %} - {% ifchanged mirror_url.mirror.country %} -

{{mirror_url.mirror.country}}

- {% endifchanged %} - {% ifchanged mirror_url.mirror.name %} -
{{mirror_url.mirror.name}} - {% endifchanged %} - ({{mirror_url.protocol.protocol}}) - {% endfor %} +
{{mirror_url.mirror.name}} + {% endifchanged %} + {{mirror_url.protocol.protocol|upper}} + {% endfor %}
-

If you want to become an Official Arch Linux Mirror please follow - the instructions listed here. -

-
+ + + +

If you want to become an Official Arch Linux Mirror please follow the + instructions listed here.

+
-

{% endblock %} - -- cgit v1.2.3-54-g00ecf From 7657c5978269a9b8c734a58ec197159e70678ebf Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:35:14 -0700 Subject: Redesigned TU profiles, semantics, page title Signed-off-by: Dan McGee --- templates/public/userlist.html | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 %} -
-

Arch Linux {{user_type}}

-

{{description}}

+
+ +

Arch Linux {{user_type}}

+ +

{{description}}

+ {% with users as dev_list %} {% include 'public/developer_list.html' %} {% endwith %} +
-

{% endblock %} - -- cgit v1.2.3-54-g00ecf From 08f886380ca53a9fade73fd3079a968f27316f74 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:36:19 -0700 Subject: Redesigned dev mirrorlist page, proper django cycling, semantics Signed-off-by: Dan McGee --- templates/devel/mirrorlist.html | 66 +++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/templates/devel/mirrorlist.html b/templates/devel/mirrorlist.html index bd09d7f2..5084ccac 100644 --- a/templates/devel/mirrorlist.html +++ b/templates/devel/mirrorlist.html @@ -2,34 +2,42 @@ {% block title %}Arch Linux - Mirror Overview{% endblock %} {% block content %} -
- - - - - - - - - - - - - - {% for mirror in mirror_list %} - - - - - - - - - - - - - {% endfor %} -
NameTierCountryAdmin EmailPublicActiveISOsProtocolsRsync IPsNotes
{{mirror.name}}{{mirror.get_tier_display}}{{mirror.country}}{{mirror.admin_email}}{{mirror.public|yesno}}{{mirror.active|yesno}}{{mirror.isos|yesno}}{{mirror.supported_protocols}}{{mirror.rsync_ips.count}}{{mirror.notes}}
+
+ +

Mirror List

+ + + + + + + + + + + + + + + + + + {% for mirror in mirror_list %} + + + + + + + + + + + + + {% endfor %} + +
ServerTierCountryAdmin EmailPublicActiveISOsProtocolsRsync IPsNotes
{{mirror.name}}{{mirror.get_tier_display}}{{mirror.country}}{{mirror.admin_email}}{{mirror.public|yesno}}{{mirror.active|yesno}}{{mirror.isos|yesno}}{{mirror.supported_protocols}}{{mirror.rsync_ips.count}}{{mirror.notes}}
+
{% endblock %} -- cgit v1.2.3-54-g00ecf From 1c8e8eb5e642c712b5564b5cb4616b74297cf99e Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:37:52 -0700 Subject: Updated form semantics for accessibility Signed-off-by: Dan McGee --- templates/devel/profile.html | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/templates/devel/profile.html b/templates/devel/profile.html index 5b5a586b..178a59aa 100644 --- a/templates/devel/profile.html +++ b/templates/devel/profile.html @@ -1,21 +1,18 @@ {% extends "base.html" %} +{% block title %}Arch Linux - Edit Profile{% endblock %} {% block content %} -
-

Developer Profile

-
- - - - - - {{form}} - - - -
Username:{{ user.username }}
- -
-
-
+
+ +

Developer Profile

+ +
+
+ Username: {{ user.username }} + {{ form.as_p }} +
+

+
+ +
{% endblock %} -- cgit v1.2.3-54-g00ecf From 663aa383ffb28ba9e6d5ee2f770b47ba3ed97e99 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:58:29 -0700 Subject: Redesigned Signoffs page * descriptive href titles * better semantics (page titles, etc) * added tbody for prettier printing * proper django cycling Signed-off-by: Dan McGee --- templates/packages/signoffs.html | 43 ++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index cb6a848e..930b606e 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -2,9 +2,13 @@ {% block title %}Arch Linux - Package Signoffs{% endblock %} {% block content %} - {% if packages %} -
- +{% if packages %} +
+ +

Package Signoffs

+ +
+ @@ -14,28 +18,33 @@ - {% for pkg,target in packages %} - + + + {% for pkg,target in packages %} + - + - + {% endfor %} -
Arch PackageApproved Signoff
{{ pkg.arch.name }}{{ pkg.pkgname }}{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} {{ pkg.last_update }} {{ target }}{{ pkg.approved_for_signoff|yesno:"Yes,No" }} + {{ pkg.approved_for_signoff|yesno:"Yes,No" }}
    - {% for signoff in pkg.signoffs %} -
  • {{signoff.packager}}
    • - {% endfor %} -
  • - Signoff -
    • +
  • Signoff +
    • + {% for signoff in pkg.signoffs %} +
  • + {{signoff.packager}}
    • + {% endfor %}
-
- {% endif %} + + +
+{% endif %} {% endblock %} - -- cgit v1.2.3-54-g00ecf From 903c457b2a461c594d9b08adbe882b534794334c Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Thu, 18 Mar 2010 07:54:49 -0700 Subject: Cleaned up form controls, now using platform/browser defaults Signed-off-by: Dan McGee --- media/archweb.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/media/archweb.css b/media/archweb.css index f274c8a8..71173c94 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -13,7 +13,7 @@ @import url('http://cinderwick.ca/archnavbar/archnavbar.css'); /* simple reset */ -* { margin: 0; padding: 0; border: 0; line-height: 1.4; } +* { margin: 0; padding: 0; line-height: 1.4; } /* general styling */ body { min-width: 650px; background: #eef; color: #444; font: normal 100% sans-serif; text-align: center; } @@ -26,6 +26,7 @@ blockquote { margin: 1.5em 2em; } input { vertical-align: middle; } .clear { clear: both; } hr { border: none; border-top: 1px solid #888; } +img { border: 0; } /* scale fonts down to a sane default (16 * .812 = 13px) */ #content { font-size: 0.812em; } @@ -74,11 +75,9 @@ table.pretty2 td { padding: 0.35em; border: 1px dotted #bbb; } /* forms and input styling */ form p { margin: 0.5em 0; } +fieldset { border: 0; } label { width: 12em; vertical-align: top; display: inline-block; font-weight: bold; } -input, textarea, select { background: #ffc; border: 1px solid #cca; } input[type=text], input[type=password], textarea { padding: 0.10em; } -input[type=submit], input[type=button] { background: #6af; color: #fff; border: 1px solid #37c; font-weight: bold; margin: 0; padding: 0.10em 0.25em; } -input[type=submit]:hover, input[type=button]:hover { background: #38d; border-color: #04a; } form.general-form label, form.general-form .form-help { width: 10em; vertical-align: top; display: inline-block; } form.general-form input[type=text], form.general-form textarea { width: 45%; } -- cgit v1.2.3-54-g00ecf From 67f22221b22a7521719e5dca82403a1a67de80b0 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:23:51 -0700 Subject: Redesigned feeds page, added additional feeds from sub-sites Signed-off-by: Dan McGee --- templates/public/feeds.html | 124 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 98 insertions(+), 26 deletions(-) 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 %} -
-

RSS Feeds

-

+
+ +

RSS Feeds

+

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.

-

Grab the news item feed RSS Feed + +

News and Activity Feeds

+ +

Grab the news item feed to keep up-to-date with the latest news from the Arch Linux development staff.

-

If you are interested in - all package updates RSS Feed, + +

The Arch Wiki: Recent changes feed + is also available to track document changes from the Arch Wiki.

+ +

Package Feeds

+ +

If you are interested in all package updates, 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 @@

RSS Feeds

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.

- - - - - {% for repo in repos %} - - {% endfor %} - - {% for arch in arches %} - - - - {% for repo in repos %} - + +
ArchitectureAll Repos{{ repo }}
{{ arch }}Feed RSS FeedFeed RSS Feed
+ + + + + {% for repo in repos %} + + {% endfor %} + + + + {% for arch in arches %} + + + + {% for repo in repos %} + + {% endfor %} + {% endfor %} - - {% endfor %} +
ArchitectureAll Repos{{ repo }}
{{ arch }}FeedFeed
-
-

-{% endblock %} +

A Newest Packages feed is also available from + the Arch User + Repository (AUR).

+ +

Development Feeds

+ +

Subscribe to any of the following to track bug tickets and feature + requests from the Arch Linux Bugtracker:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProjectRecently Opened TasksRecently Edited TasksRecently Closed Tasks
All ProjectsFeedFeedFeed
Arch LinuxFeedFeedFeed
Release EngineeringFeedFeedFeed
Pacman DevelopmentFeedFeedFeed
Community PackagesFeedFeedFeed
AURFeedFeedFeed
+ +
+{% endblock %} -- cgit v1.2.3-54-g00ecf From ebf292292f7ac8a4e69f9f8078c1dfbd2a5954b9 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 12:02:32 -0700 Subject: Redesigned Package Search page * moved non-tabular data out of tables * added tbody for pretty printing * form accessibility * descriptive href titles throughout * code cleanup (removing unnecessary line breaks, styling, etc.) * renamed page to Package Database * add descriptive text to bottom of database pages Signed-off-by: Dan McGee --- templates/packages/search.html | 235 ++++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 109 deletions(-) diff --git a/templates/packages/search.html b/templates/packages/search.html index 4f7bc776..2c85f0bc 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% load package_extras %} -{% block title %}Arch Linux - Package Search{% endblock %} +{% block title %}Arch Linux - Package Database{% endblock %} + {% block head %} @@ -9,129 +10,145 @@ {% endblock %} {% block content %} -
-

Search Criteria

-
- - - - - - - - - - - - - {% td_input search_form.arch %} - {% td_input search_form.repo %} - {% td_input search_form.q %} - {% td_input search_form.maintainer%} - {% td_input search_form.last_update %} - {% td_input search_form.flagged %} - {% td_input search_form.limit %} - - -
ArchRepositoryKeywordsMaintainerLast UpdateFlaggedPer Page
-
+ + +{% if package_list %} +
+ + {% if paginator %} +
+ +

{{paginator.count}} packages found. + Page {{page_obj.number}} of {{paginator.num_pages}}.

+ +

+ {% if page_obj.has_previous %} + + {% else %} + < Prev + {% endif %} + {% if page_obj.has_next %} + + {% else %} + Next > + {% endif %} +

+
-

+ {% endif %} + +
- {% if package_list %} -
- - - {% if paginator %} +
+ - - - + {% if user.is_authenticated %} + + {% endif %} + + + + + + - {% endif %} - - {% if user.is_authenticated %} - - {% endif %} - - - - - - - - + + {% for pkg in package_list %} - + {% if user.is_authenticated %} {% endif %} - - {% if pkg.needupdate %} - - {% else %} + + {% if pkg.needupdate %} + + {% else %} - {% endif %} - + {% endif %} + {% endfor %} - {% if paginator %} - - - - - - {% endif %} +
- {{paginator.count}} packages found. - Page {{page_obj.number}} of {{paginator.num_pages}}. - - {% if page_obj.has_previous %} - - <<< Previous - - {% else %} - <<< Previous - {% endif %} - - {% if page_obj.has_next %} - - Next >>> - - {% else %} - Next >>> - {% endif %} -  ArchRepoNameVersionDescriptionLast Updated
 ArchRepoNameVersionDescriptionLast Updated
{{ pkg.arch.name }} {{ pkg.repo.name|capfirst }}{{ pkg.pkgname }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgname }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgver }}-{{ pkg.pkgrel }}{{ pkg.pkgdesc }}{{ pkg.pkgdesc }} {{ pkg.last_update|date:"Y-m-d" }}
- {{paginator.count}} packages found. - Page {{page_obj.number}} of {{paginator.num_pages}}. - - {% if page_obj.has_previous %} - - <<< Previous - - {% else %} - <<< Previous - {% endif %} - - {% if page_obj.has_next %} - - Next >>> - - {% else %} - Next >>> - {% endif %} -
- {% if user.is_authenticated %} -
- - + + {% if paginator %} +
+ +

{{paginator.count}} packages found. Page {{page_obj.number}} of {{paginator.num_pages}}.

+ +

+ {% if page_obj.has_previous %} + + {% else %} + < Prev + {% endif %} + {% if page_obj.has_next %} + + {% else %} + Next > + {% endif %} +

+
{% endif %} - -
- {% endif %} -{% endblock %} + {% if user.is_authenticated %} +

+

+ {% endif %} + + + +
+ +
+

You are browsing the Arch Linux package database. From here you can find + detailed information about packages located in the official supported repositories. + For unsupported packages, browse the Arch User Repository (AUR).

+
+{% endif %} +{% endblock %} -- cgit v1.2.3-54-g00ecf From c31d474f6d6720614d225da6f3683428ba85d8a3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 17 May 2010 13:36:34 -0500 Subject: Kill td_input template and tag --- packages/templatetags/package_extras.py | 4 ---- templates/forms/td_input.html | 5 ----- 2 files changed, 9 deletions(-) delete mode 100644 templates/forms/td_input.html diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index 38c92c22..ff66a9f2 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -30,7 +30,3 @@ def do_buildsortqs(parser, token): "%r tag's argument should be in quotes" % tagname) return BuildQueryStringNode(sortfield[1:-1]) -@register.inclusion_tag('forms/td_input.html') -def td_input(form_element): - return {'form_element': form_element} - diff --git a/templates/forms/td_input.html b/templates/forms/td_input.html deleted file mode 100644 index 38ff5a13..00000000 --- a/templates/forms/td_input.html +++ /dev/null @@ -1,5 +0,0 @@ - - {{form_element.errors}} - {{form_element}} - {{form_element.help_text}} - -- cgit v1.2.3-54-g00ecf From 5813ec18197dc76c99f85f8fc1d1c41ed7f396e3 Mon Sep 17 00:00:00 2001 From: Thayer Williams Date: Tue, 16 Mar 2010 11:52:37 -0700 Subject: Filelists: Touch up the HTML of file list views Remove some unnecessary classes and touch up the direct and AJAX views. Signed-off-by: Dan McGee --- templates/packages/files-list.html | 11 +++++------ templates/packages/files.html | 16 +++++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html index dee18ecd..c45e0f10 100644 --- a/templates/packages/files-list.html +++ b/templates/packages/files-list.html @@ -1,10 +1,9 @@ -

Files:

{% if files.count %} - -- cgit v1.2.3-54-g00ecf