diff options
| -rw-r--r-- | devel/views.py | 9 | ||||
| -rw-r--r-- | media/arch.css | 13 | ||||
| -rw-r--r-- | media/rss.png | bin | 0 -> 725 bytes | |||
| -rw-r--r-- | media/sevenl_button.png | bin | 0 -> 9028 bytes | |||
| -rw-r--r-- | media/vnet_button.png | bin | 0 -> 5923 bytes | |||
| -rw-r--r-- | public/views.py | 18 | ||||
| -rw-r--r-- | templates/devel/siteindex.html | 60 | ||||
| -rw-r--r-- | templates/public/index.html | 12 | ||||
| -rw-r--r-- | urls.py | 1 |
9 files changed, 34 insertions, 79 deletions
diff --git a/devel/views.py b/devel/views.py index 0a4074e0..9ba4f2cb 100644 --- a/devel/views.py +++ b/devel/views.py @@ -65,15 +65,6 @@ def change_profile(request): return render_to_response('devel/profile.html', RequestContext(request, {'form': form})) -def siteindex(request): - news = News.objects.order_by('-postdate', '-id')[:10] - pkgs = Package.objects.exclude(repo__name__iexact='testing').order_by( - '-last_update')[:15] - repos = Repo.objects.all() - return render_to_response('devel/siteindex.html', - RequestContext(request, - {'news_updates': news, 'pkg_updates': pkgs, 'repos': repos})) - def mirrorlist(request): mirrors = Mirror.objects.all() return render_to_response('devel/mirrorlist.html', diff --git a/media/arch.css b/media/arch.css index 04810ce1..92c2b938 100644 --- a/media/arch.css +++ b/media/arch.css @@ -66,6 +66,17 @@ body { border: 1px solid #eee4cb; padding: 10px; } +#updates { + font-size: small; + /*position: relative;*/ + top: 0px; + background: #f6efe0; + border: 1px solid #eee4cb; + padding: 10px; +} +#updates a.testing, #updates a.community-testing { + font-style: italic; +} #ads { z-index: 0; position: absolute; @@ -143,7 +154,7 @@ div.listing { #search { float: right; position: relative; - top: -1em; + top: -2em; font-size: 0.8em; } #search input { diff --git a/media/rss.png b/media/rss.png Binary files differnew file mode 100644 index 00000000..c9164592 --- /dev/null +++ b/media/rss.png diff --git a/media/sevenl_button.png b/media/sevenl_button.png Binary files differnew file mode 100644 index 00000000..131b4dc8 --- /dev/null +++ b/media/sevenl_button.png diff --git a/media/vnet_button.png b/media/vnet_button.png Binary files differnew file mode 100644 index 00000000..1104315f --- /dev/null +++ b/media/vnet_button.png diff --git a/public/views.py b/public/views.py index 1f8e6880..4a4e01e7 100644 --- a/public/views.py +++ b/public/views.py @@ -3,17 +3,19 @@ from archweb.main.models import AltForum, Arch, Donor, MirrorUrl, News from archweb.main.models import Package, Repo, ExternalProject from django.db.models import Q from django.shortcuts import render_to_response +from django.template import RequestContext from django.views.generic import list_detail + def index(request): - # get the most recent 10 news items - news = News.objects.order_by('-postdate', '-id')[:10] - pkgs = Package.objects.order_by('-last_update')[:15] - repos = Repo.objects.order_by('name') - arches = Arch.objects.exclude(name__iexact='any').order_by('name') - return render_to_response('public/index.html', - {'news_updates':news,'pkg_updates':pkgs, - 'repos':repos, 'arches': arches, 'path':request.path}) + context = { + 'news': News.objects.order_by('-postdate', '-id')[:10], + 'pkgs': Package.objects.exclude(repo__name__iexact='testing').order_by( + '-last_update')[:15], + 'repos': Repo.objects.all() + } + return render_to_response('public/index.html', RequestContext(request, + context)) def about(request): return render_to_response('public/about.html') diff --git a/templates/devel/siteindex.html b/templates/devel/siteindex.html deleted file mode 100644 index ac0df767..00000000 --- a/templates/devel/siteindex.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "base.html" %} - -{% block content_left %} - <div class="box-smalltext"> - <h3>Latest News</h2> - {% for news in news_updates %} - <span style="float:right;">{{ news.postdate }}</span> - <a href="{{ news.get_absolute_url }}">{{ news.title }}</a> - <br /> - {% endfor %} - <br /> - <span style="float:left;font-size:x-small"><a href="/news/">More News...</a></span> - <br /> - </div> - <br /> - <div class="box-smalltext"> - <table width="100%"> - <tr> - <td colspan="2"><h3>Recent Updates</h3></td> - </tr> - {% 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.arch.name }}</td> - </tr> - {% endfor %} - <tr> - <td colspan="2" style="text-align:left;font-size:x-small"><br /><a href="/packages/?sort=-last_update">More Updates...</a></td> - </tr> - </table> - </div> - <br /> -{% endblock %} - -{% block content_right %} - <div id="search"> - <form method="get" action="/packages/"> - <p><b>Package Search:</b> <input type="text" name="q" size="20" maxlength="200" /></p> - </form> - </div> - <br clear="all" /> - <h3>Dev Links:</h3> - <ul class="links"> - <li><a href="/devel/">Dev Dashboard</a></li> - <li><a href="/news/">News</a></li> - <li><a href="/packages/signoffs/">Signoffs</a></li> - <li><a href="/todo/">Todos</a></li> - <li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li> - <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki:HOWTO_Be_A_Packager">Package Maintainer's Guide</a></li> - <li><a href="/devel/profile/">Profile</a></li> - </ul> - <h3>Main Site Links:</h3> - <ul class="links"> - <li><a href="http://bugs.archlinux.org">Bug Tracker</a></li> - <li><a href="http://repos.archlinux.org/">SVN</a></li> - <li><a href="http://projects.archlinux.org">Projects</a></li> - <li><a href="http://www.archlinux.org/developers/">Developer List</a></li> - <li><a href="http://www.archlinux.org/fellows/">Fellows List</a></li> - </ul> -{% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index e092e289..4e5612d9 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -69,6 +69,18 @@ </table> </div> <br /> + {% if user.is_authenticated %} + <h3>Dev Links:</h3> + <ul class="links"> + <li><a href="/devel/">Dev Dashboard</a></li> + <li><a href="/news/">News</a></li> + <li><a href="/packages/signoffs/">Signoffs</a></li> + <li><a href="/todo/">Todos</a></li> + <li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li> + <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki:HOWTO_Be_A_Packager">Package Maintainer's Guide</a></li> + <li><a href="/devel/profile/">Profile</a></li> + </ul> + {% endif %} <h3>Documentation:</h3> <ul class="links"> <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide">Installation Guide</a></li> @@ -46,7 +46,6 @@ urlpatterns = patterns('', (r'^devel/$', 'archweb.devel.views.index'), (r'^devel/notify/$', 'archweb.devel.views.change_notify'), (r'^devel/profile/$', 'archweb.devel.views.change_profile'), - (r'^$', 'archweb.devel.views.siteindex'), (r'^devel/newuser/$', 'archweb.devel.views.new_user_form'), |
