Remove International Communities
Add link to wiki instead. Also remove AltForum model and associated dealings. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
94b735a181
commit
1709def7f1
@ -3,16 +3,10 @@
|
||||
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)
|
||||
|
@ -103,17 +103,6 @@ def __unicode__(self):
|
||||
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)
|
||||
|
@ -35,10 +35,6 @@ def test_download(self):
|
||||
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)
|
||||
|
@ -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(),
|
||||
|
@ -114,7 +114,7 @@ <h3>Community Links:</h3>
|
||||
<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>
|
||||
|
@ -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 %}
|
||||
|
1
urls.py
1
urls.py
@ -109,7 +109,6 @@
|
||||
(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'),
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user