diff options
| -rw-r--r-- | devel/views.py | 24 | ||||
| -rw-r--r-- | templates/devel/about.html (renamed from templates/public/about.html) | 0 | ||||
| -rw-r--r-- | templates/devel/art.html (renamed from templates/public/art.html) | 0 | ||||
| -rw-r--r-- | templates/devel/blank.html (renamed from templates/public/blank.html) | 0 | ||||
| -rw-r--r-- | templates/devel/cvs.html (renamed from templates/public/cvs.html) | 0 | ||||
| -rw-r--r-- | templates/devel/denied.html (renamed from templates/public/denied.html) | 0 | ||||
| -rw-r--r-- | templates/devel/developers.html (renamed from templates/public/developers.html) | 0 | ||||
| -rw-r--r-- | templates/devel/donate.html (renamed from templates/public/donate.html) | 0 | ||||
| -rw-r--r-- | templates/devel/download.html (renamed from templates/public/download.html) | 0 | ||||
| -rw-r--r-- | templates/devel/irc.html (renamed from templates/public/irc.html) | 0 | ||||
| -rw-r--r-- | templates/devel/moreforums.html (renamed from templates/public/moreforums.html) | 0 | ||||
| -rw-r--r-- | templates/devel/press.html (renamed from templates/public/press.html) | 0 | ||||
| -rw-r--r-- | templates/devel/projects.html (renamed from templates/public/projects.html) | 0 | ||||
| -rw-r--r-- | templates/devel/siteindex.html (renamed from templates/public/index.html) | 0 | ||||
| -rw-r--r-- | templates/public/index.html.bak | 151 |
15 files changed, 12 insertions, 163 deletions
diff --git a/devel/views.py b/devel/views.py index 3b929e96..449190f2 100644 --- a/devel/views.py +++ b/devel/views.py @@ -75,20 +75,20 @@ def siteindex(request): news = News.objects.order_by('-postdate', '-id')[:10] pkgs = Package.objects.exclude(repo__name__exact='Testing').order_by('-last_update')[:15] repos = Repo.objects.order_by('name') - return render_response(request, 'public/index.html', {'news_updates':news,'pkg_updates':pkgs,'repos':repos}) + return render_response(request, 'devel/siteindex.html', {'news_updates':news,'pkg_updates':pkgs,'repos':repos}) def about(request): - return render_response(request, 'public/about.html') + return render_response(request, 'devel/about.html') def art(request): - return render_response(request, 'public/art.html') + return render_response(request, 'devel/art.html') def cvs(request): - return render_response(request, 'public/cvs.html') + return render_response(request, 'devel/cvs.html') def developers(request): devs = User.objects.order_by('username') - return render_response(request, 'public/developers.html', {'devs':devs}) + return render_response(request, 'devel/developers.html', {'devs':devs}) def donate(request): donor_count = Donator.objects.count() @@ -97,30 +97,30 @@ def donate(request): slice2 = Donator.objects.all()[(splitval):(splitval*2)] slice3 = Donator.objects.all()[(splitval*2):(donor_count-splitval)] slice4 = Donator.objects.all()[(donor_count-splitval):donor_count] - return render_response(request, 'public/donate.html', + return render_response(request, 'devel/donate.html', {'slice1':slice1,'slice2':slice2,'slice3':slice3,'slice4':slice4}) def download(request): mirrors = Mirror.objects.order_by('country', 'domain') - return render_response(request, 'public/download.html', {'mirrors':mirrors}) + return render_response(request, 'devel/download.html', {'mirrors':mirrors}) def irc(request): - return render_response(request, 'public/irc.html') + return render_response(request, 'devel/irc.html') def moreforums(request): - return render_response(request, 'public/moreforums.html') + return render_response(request, 'devel/moreforums.html') def press(request): - return render_response(request, 'public/press.html') + return render_response(request, 'devel/press.html') def projects(request): - return render_response(request, 'public/projects.html') + return render_response(request, 'devel/projects.html') def robots(request): return HttpResponse("User-agent: *\nDisallow: /\n", mimetype="text/plain") def denied(request): - return render_response(request, 'public/denied.html') + return render_response(request, 'devel/denied.html') # vim: set ts=4 sw=4 et: diff --git a/templates/public/about.html b/templates/devel/about.html index 0712b5d0..0712b5d0 100644 --- a/templates/public/about.html +++ b/templates/devel/about.html diff --git a/templates/public/art.html b/templates/devel/art.html index 4d1f7d1a..4d1f7d1a 100644 --- a/templates/public/art.html +++ b/templates/devel/art.html diff --git a/templates/public/blank.html b/templates/devel/blank.html index d1e7b71b..d1e7b71b 100644 --- a/templates/public/blank.html +++ b/templates/devel/blank.html diff --git a/templates/public/cvs.html b/templates/devel/cvs.html index 715d00d3..715d00d3 100644 --- a/templates/public/cvs.html +++ b/templates/devel/cvs.html diff --git a/templates/public/denied.html b/templates/devel/denied.html index c59c0f73..c59c0f73 100644 --- a/templates/public/denied.html +++ b/templates/devel/denied.html diff --git a/templates/public/developers.html b/templates/devel/developers.html index 6b1fe8b7..6b1fe8b7 100644 --- a/templates/public/developers.html +++ b/templates/devel/developers.html diff --git a/templates/public/donate.html b/templates/devel/donate.html index 9436b09a..9436b09a 100644 --- a/templates/public/donate.html +++ b/templates/devel/donate.html diff --git a/templates/public/download.html b/templates/devel/download.html index be840d3a..be840d3a 100644 --- a/templates/public/download.html +++ b/templates/devel/download.html diff --git a/templates/public/irc.html b/templates/devel/irc.html index f69be873..f69be873 100644 --- a/templates/public/irc.html +++ b/templates/devel/irc.html diff --git a/templates/public/moreforums.html b/templates/devel/moreforums.html index f8a13624..f8a13624 100644 --- a/templates/public/moreforums.html +++ b/templates/devel/moreforums.html diff --git a/templates/public/press.html b/templates/devel/press.html index b652c8dc..b652c8dc 100644 --- a/templates/public/press.html +++ b/templates/devel/press.html diff --git a/templates/public/projects.html b/templates/devel/projects.html index c669d048..c669d048 100644 --- a/templates/public/projects.html +++ b/templates/devel/projects.html diff --git a/templates/public/index.html b/templates/devel/siteindex.html index 75097127..75097127 100644 --- a/templates/public/index.html +++ b/templates/devel/siteindex.html diff --git a/templates/public/index.html.bak b/templates/public/index.html.bak deleted file mode 100644 index a41196df..00000000 --- a/templates/public/index.html.bak +++ /dev/null @@ -1,151 +0,0 @@ -{% extends "base.html" %} - -{% block head %} -<link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/news/" /> -<link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="/feeds/packages/" /> -{% endblock %} - -{% block content_left %} - <div id="about" class="box"> - <h2>Welcome to Arch!</h2> - <p> - You've reached the website for <strong>Arch Linux</strong>, a lightweight - and flexible linux distribution that tries to Keep It Simple. - </p><p> - Currently we have official packages optimized for the i686 and x86-64 - architectures. We complement our official package sets with a - <a href="http://aur.archlinux.org">community-operated package repository</a> - that grows in size and quality each and every day. - </p><p> - Our strong community is diverse and helpful, and we pride ourselves on - the range of skillsets and uses for Arch that stem from it. Please - check out our <a href="http://bbs.archlinux.org">forums</a> and - <a href="http://www.archlinux.org/mailman/listinfo/">mailing lists</a> - to get your feet wet. Also glance through our <a href="http://wiki.archlinux.org">wiki</a> - if you want to learn more about Arch. - </p><p style="text-align: right"> - <a href="/about/"><span style="font-size:x-small">Learn more...</span></a> - </p> - </div> - <br /><br /> - <div style="float:right;position:relative;bottom:-25px"> - <a href="/feeds/news/"><img src="/media/rss.png" alt="RSS Feed" /></a> - </div> - <h2 class="title">Latest News</h2> - <div> - {% for news in news_updates %} - <span style="float:right; font-size:x-small">{{ news.postdate }}</span> - <h4 class="news"><a href="{{ news.get_absolute_url }}">{{ news.title }}</a></h4> - <p class="news">{{ news.content|striptags|truncatewords:60 }}</p><br /><br /> - {% endfor %} - </div> -{% endblock %} - -{% block content_right %} - <div id="search"> - <form method="get" action="/packages/search/"> - <p>Package Search: <input type="text" name="q" size="20" maxlength="200" /></p> - </form> - </div> - <br /><br /> - <div id="updates"> - <div style="float:right"> - <a href="/feeds/packages/"><img src="/media/rss.png" alt="RSS Feed" /></a> - </div> - <h3>Recent Updates</h3> - <table width="100%"> - {% for pkg in pkg_updates %} - <tr> - <td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</a></td> - <td style="text-align:right">{{ pkg.category.category }}</td> - </tr> - {% endfor %} - </table> - </div> - <div class="greybox"> - <h3>Package Repositories</h3> - <table id="repolinks"> - {% for repo in repos %} - <tr> - <th><a href="/packages/?repo={{ repo.name }}">{{ repo.name }}</a></th> - <td>{{ repo.last_update }}</td> - </tr> - {% endfor %} - </table> - </div> - <br /> - <div class="greybox"> - <h3>Releases</h3> - <table id="releases"> - <tr> - <td><a href="/packages/?repo=Current">0.8</a></td> - <td><a href="/packages/?repo=Current">_________</a></td> - <td style="text-align:right"><em>pending</em></td> - </tr><tr> - <td><a href="/static/pkglists/list-0.7.2.txt">0.7.2</a></td> - <td><a href="/static/pkglists/list-0.7.2.txt">Gimmick</a></td> - <td style="text-align:right">2006-05-23</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.7.1.txt">0.7.1</a></td> - <td><a href="/static/pkglists/list-0.7.1.txt">Noodle</a></td> - <td style="text-align:right">2006-01-05</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.7.txt">0.7</a></td> - <td><a href="/static/pkglists/list-0.7.txt">Wombat</a></td> - <td style="text-align:right">2005-01-24</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.6.txt">0.6</a></td> - <td><a href="/static/pkglists/list-0.6.txt">Widget</a></td> - <td style="text-align:right">2004-03-01</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.5.txt">0.5</a></td> - <td><a href="/static/pkglists/list-0.5.txt">Nova</a></td> - <td style="text-align:right">2003-07-21</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.4.txt">0.4</a></td> - <td><a href="/static/pkglists/list-0.4.txt">Dragon</a></td> - <td style="text-align:right">2002-12-18</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.3.txt">0.3</a></td> - <td><a href="/static/pkglists/list-0.3.txt">Firefly</a></td> - <td style="text-align:right">2002-08-07</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.2.txt">0.2</a></td> - <td><a href="/static/pkglists/list-0.2.txt">Vega</a></td> - <td style="text-align:right">2002-04-17</td> - </tr><tr> - <td><a href="/static/pkglists/list-0.1.txt">0.1</a></td> - <td><a href="/static/pkglists/list-0.1.txt">Homer</a></td> - <td style="text-align:right">2002-03-11</td> - </tr> - </table> - </div> - <br /> - <h3>Documentation:</h3> - <ul class="links"> - <li><a href="/static/docs/arch-install-guide.html">Installation Guide</a></li> - </ul> - <h3>Support Arch:</h3> - <ul class="links"> - <li><a href="/donate/">Donate</a></li> - <li><a href="http://www.cafeshops.com/archlinux/">Arch Schwag</a></li> - <li><a href="/art/">Logos & Artwork</a></li> - </ul> - <h3>Community Links:</h3> - <ul class="links"> - <li><a href="http://www.archlinux.org/mailman/listinfo/">Mailing Lists</a></li> - <li><a href="/irc/">IRC Channels</a></li> - <li><a href="http://planet.archlinux.org">Planet Arch</a></li> - <li><a href="http://blog.archlinux.org">Development Blog</a></li> - <li><a href="/static/newsletters/">Newsletters</a></li> - <li><a href="/projects/">Arch-Based Projects</a></li> - <li><a href="/moreforums/">Non-English Forums</a></li> - <li><a href="/press/">Press</a></li> - </ul> - <h3>Development:</h3> - <ul class="links"> - <li><a href="/developers/">Developers</a></li> - <li><a href="http://bugs.archlinux.org">Bug Tracker</a></li> - <li><a href="/cvs/">CVS</a></li> - </ul> -{% endblock %} |