summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-03-01 18:55:09 -0600
committerDan McGee <dan@archlinux.org>2010-04-18 23:14:53 -0500
commit1709def7f196e863de990ce3d55de63f7a349268 (patch)
treec3cc4ab24dfaabb078f2dbcec52adb6f30271c1d
parent94b735a181cef2a42d19a2bde55d48727a0ce35a (diff)
downloadarchweb-1709def7f196e863de990ce3d55de63f7a349268.tar.gz
archweb-1709def7f196e863de990ce3d55de63f7a349268.zip
Remove International Communities
Add link to wiki instead. Also remove AltForum model and associated dealings. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--main/admin.py9
-rw-r--r--main/models.py11
-rw-r--r--public/tests.py4
-rw-r--r--public/views.py8
-rw-r--r--templates/public/index.html2
-rw-r--r--templates/public/moreforums.html37
-rw-r--r--urls.py1
7 files changed, 3 insertions, 69 deletions
diff --git a/main/admin.py b/main/admin.py
index 4e71c4e0..64f28207 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -3,16 +3,10 @@ from django import forms
from django.contrib import admin
from django.contrib.auth.models import User
from django.contrib.auth.admin import UserAdmin
-from main.models import (AltForum, Arch, Donor,
+from main.models import (Arch, Donor,
Mirror, MirrorProtocol, MirrorUrl, MirrorRsync,
Package, Repo, UserProfile, ExternalProject)
-class AltForumAdmin(admin.ModelAdmin):
- list_display = ('language', 'name')
- list_filter = ('language',)
- ordering = ['name']
- search_fields = ('name',)
-
class DonorAdmin(admin.ModelAdmin):
ordering = ['name']
search_fields = ('name',)
@@ -90,7 +84,6 @@ class UserProfileAdmin(UserAdmin):
admin.site.register(User, UserProfileAdmin)
-admin.site.register(AltForum, AltForumAdmin)
admin.site.register(Donor, DonorAdmin)
admin.site.register(Mirror, MirrorAdmin)
diff --git a/main/models.py b/main/models.py
index 45c65406..c5279640 100644
--- a/main/models.py
+++ b/main/models.py
@@ -103,17 +103,6 @@ class MirrorRsync(models.Model):
class Meta:
verbose_name = 'Mirror Rsync IP'
-class AltForum(models.Model):
- id = models.AutoField(primary_key=True)
- language = models.CharField(max_length=255)
- url = models.CharField(max_length=255)
- name = models.CharField(max_length=255)
- def __unicode__(self):
- return self.name
- class Meta:
- db_table = 'alt_forums'
- verbose_name = 'AltForum'
-
class Donor(models.Model):
id = models.AutoField(primary_key=True)
name = models.CharField(max_length=255, unique=True)
diff --git a/public/tests.py b/public/tests.py
index c792343d..022560b2 100644
--- a/public/tests.py
+++ b/public/tests.py
@@ -35,10 +35,6 @@ class PublicTest(TestCase):
response = self.client.get('/download/')
self.assertEqual(response.status_code, 200)
- def test_moreforums(self):
- response = self.client.get('/moreforums/')
- 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 79dae55c..77fb6405 100644
--- a/public/views.py
+++ b/public/views.py
@@ -1,4 +1,4 @@
-from main.models import AltForum, Arch, Donor, MirrorUrl, News
+from main.models import Arch, Donor, MirrorUrl, News
from main.models import Package, Repo, ExternalProject
from . import utils
@@ -68,12 +68,6 @@ def download(request):
template_object_name="mirror_url",
extra_context={"path": request.path})
-def moreforums(request):
- return list_detail.object_list(request,
- AltForum.objects.order_by('language', 'name'),
- template_name="public/moreforums.html",
- template_object_name="forum")
-
def feeds(request):
context = {
'arches': Arch.objects.all(),
diff --git a/templates/public/index.html b/templates/public/index.html
index e80909d9..3310cae4 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -114,7 +114,7 @@
<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="/moreforums/">International Communities</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>
<h3>Development:</h3>
diff --git a/templates/public/moreforums.html b/templates/public/moreforums.html
deleted file mode 100644
index 91ab4209..00000000
--- a/templates/public/moreforums.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Arch Linux - International Communities{% endblock %}
-{% block content %}
-<div class="box">
- <h2 class="title">International Communities</h2>
- <br /><br />
- <p>
- <a href="http://www.archlinux.org/">www.archlinux.org</a> is the home of
- the official Arch Linux website, forums, and wiki. However, several
- unofficial community-run sites are available for international users who
- would rather communicate in their own language. You can find a list of
- these communities below.
- </p>
- <p>
- Please note that the official <a href="http://wiki.archlinux.org/">Wiki</a>
- also supports internationalized content. In addition, we have <a
- href="http://bbs.archlinux.org/viewforum.php?id=30">a forum</a> where
- you can post in your native language. These tools can be used in addition
- to, in parallel with, or as a part of the international communities listed
- below.
- </p>
- <table cellspacing="20">
- {% for forum in forum_list %}
- <tr>
- <td width="200">{{ forum.language }}</td>
- <td><a href="{{ forum.url }}">{{ forum.name }}</a></td>
- </tr>
- {% endfor %}
- </table>
- <br />
- If you host a community you would like linked on this page, please open a
- <a href="http://bugs.archlinux.org/">Bug Ticket</a> with the category "web
- site", and a relevant description.
-</div>
-<br /><br />
-{% endblock %}
-
diff --git a/urls.py b/urls.py
index 01a37da7..f9559d3f 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'^moreforums/$', 'public.views.moreforums', {}, 'page-forums'),
(r'^projects/$', 'public.views.projects', {}, 'page-projects'),
(r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'),