summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-03-01 19:04:41 -0600
committerDan McGee <dan@archlinux.org>2010-04-18 23:27:27 -0500
commitec59440262596a03e2b374f96d24e295df56c9b8 (patch)
tree999a6f3bf90ebbedafdff38734c60ece35b2fb87
parentd9e4a36fc96f7a0dd4b455189ee2ed45db005966 (diff)
Remove Arch-Based Projects
Add a link to the wiki instead. Also remove ExternalProject model and associated dealings. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--main/admin.py3
-rw-r--r--main/models.py8
-rw-r--r--public/tests.py3
-rw-r--r--public/views.py8
-rw-r--r--templates/public/index.html2
-rw-r--r--templates/public/projects.html28
-rw-r--r--urls.py1
7 files changed, 3 insertions, 50 deletions
diff --git a/main/admin.py b/main/admin.py
index 64f28207..0585e5c3 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -5,7 +5,7 @@ from django.contrib.auth.models import User
from django.contrib.auth.admin import UserAdmin
from main.models import (Arch, Donor,
Mirror, MirrorProtocol, MirrorUrl, MirrorRsync,
- Package, Repo, UserProfile, ExternalProject)
+ Package, Repo, UserProfile)
class DonorAdmin(admin.ModelAdmin):
ordering = ['name']
@@ -92,6 +92,5 @@ admin.site.register(MirrorProtocol)
admin.site.register(Package, PackageAdmin)
admin.site.register(Arch)
admin.site.register(Repo, RepoAdmin)
-admin.site.register(ExternalProject)
# vim: set ts=4 sw=4 et:
diff --git a/main/models.py b/main/models.py
index c5279640..5e376ec9 100644
--- a/main/models.py
+++ b/main/models.py
@@ -335,12 +335,4 @@ class TodolistPkg(models.Model):
db_table = 'todolist_pkgs'
unique_together = (('list','pkg'),)
-class ExternalProject(models.Model):
- url = models.URLField(verify_exists=False)
- name = models.CharField(max_length=64)
- description = models.CharField(max_length=128)
-
- def __unicode__(self):
- return self.name
-
# vim: set ts=4 sw=4 et:
diff --git a/public/tests.py b/public/tests.py
index 022560b2..565d57ec 100644
--- a/public/tests.py
+++ b/public/tests.py
@@ -35,6 +35,3 @@ class PublicTest(TestCase):
response = self.client.get('/download/')
self.assertEqual(response.status_code, 200)
- def test_projects(self):
- response = self.client.get('/projects/')
- self.assertEqual(response.status_code, 200)
diff --git a/public/views.py b/public/views.py
index 77fb6405..51e55d12 100644
--- a/public/views.py
+++ b/public/views.py
@@ -1,5 +1,5 @@
from main.models import Arch, Donor, MirrorUrl, News
-from main.models import Package, Repo, ExternalProject
+from main.models import Package, Repo
from . import utils
from django.contrib.auth.models import User
@@ -18,12 +18,6 @@ def index(request):
return render_to_response('public/index.html', context,
context_instance=RequestContext(request))
-def projects(request):
- return list_detail.object_list(request,
- ExternalProject.objects.all(),
- template_name="public/projects.html",
- template_object_name="project")
-
def userlist(request, type='Developers'):
users = User.objects.order_by('username')
if type == 'Developers':
diff --git a/templates/public/index.html b/templates/public/index.html
index 3310cae4..27d74828 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -113,7 +113,7 @@
<li><a href="http://wiki.archlinux.org/index.php/IRC_Channels">IRC Channels</a></li>
<li><a href="http://planet.archlinux.org">Planet Arch</a></li>
<li><a href="/static/magazine/">Magazines</a></li>
- <li><a href="/projects/">Arch-Based Projects</a></li>
+ <li><a href="http://wiki.archlinux.org/index.php/Arch_Related_Projects">Arch-Based Projects</a></li>
<li><a href="http://wiki.archlinux.org/index.php/International_Communities">International Communities</a></li>
<li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review">Press</a></li>
</ul>
diff --git a/templates/public/projects.html b/templates/public/projects.html
deleted file mode 100644
index 5fd1fa24..00000000
--- a/templates/public/projects.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Arch Linux - Projects{% endblock %}
-{% block content %}
-<div class="box">
- <h2 class="title">Arch Related Projects</h2>
- <br /><br />
- <p>There are a few Arch-based projects or communities that have sprung up
- over the years. Here's a list of the ones we know about.</p>
- <table cellspacing="20">
- {% for project in project_list %}
- <tr>
- <td><a href="{{project.url}}">{{project.name}}</a></td>
- <td>{{project.description}}</td>
- </tr>
- {% endfor %}
- </table>
- <br />
- <div class="smalltext">
- If you have an Arch related project you would like linked, please open
- a <a href="http://bugs.archlinux.org/">Bug Ticket</a> with the category
- "web site", and a relevant description.<br /> Also please let us know if you
- think any of the projects above is defunct so we can keep it new and
- exciting.
- </div>
-</div>
-<br /><br />
-{% endblock %}
-
diff --git a/urls.py b/urls.py
index f9559d3f..ecdc31e9 100644
--- a/urls.py
+++ b/urls.py
@@ -109,7 +109,6 @@ urlpatterns = patterns('',
(r'^fellows/$', 'public.views.userlist', { 'type':'Fellows' }, 'page-fellows'),
(r'^donate/$', 'public.views.donate', {}, 'page-donate'),
(r'^download/$', 'public.views.download', {}, 'page-download'),
- (r'^projects/$', 'public.views.projects', {}, 'page-projects'),
(r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'),
# Some django internals we use