summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-03-02 01:49:37 +0100
committerDan McGee <dan@archlinux.org>2010-04-19 05:40:01 +0200
commitc4ddff2f485834e420cd0e67d5942ec5e1fc4e25 (patch)
tree563d7a1f8ec61eeddb15a25a6a6da6c73acea537
parentad33813bc14621911ea057b0143493a99048f4cb (diff)
downloadarchweb-c4ddff2f485834e420cd0e67d5942ec5e1fc4e25.tar.gz
archweb-c4ddff2f485834e420cd0e67d5942ec5e1fc4e25.tar.xz
Remove IRC Channels
And link to wiki instead. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--public/tests.py4
-rw-r--r--templates/public/index.html2
-rw-r--r--templates/public/irc.html72
-rw-r--r--urls.py1
4 files changed, 1 insertions, 78 deletions
diff --git a/public/tests.py b/public/tests.py
index 3f0c530..c792343 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_irc(self):
- response = self.client.get('/irc/')
- self.assertEqual(response.status_code, 200)
-
def test_moreforums(self):
response = self.client.get('/moreforums/')
self.assertEqual(response.status_code, 200)
diff --git a/templates/public/index.html b/templates/public/index.html
index cd2b6b2..e80909d 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -110,7 +110,7 @@
<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://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>
diff --git a/templates/public/irc.html b/templates/public/irc.html
deleted file mode 100644
index ea44ede..0000000
--- a/templates/public/irc.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Arch Linux - IRC Channels{% endblock %}
-{% block content %}
-<div class="box">
- <h2 class="title">IRC Channels</h2>
- <br /><br />
- <p>You can find Arch-related discussion on the following IRC channels.
- All channels are on <strong>irc.freenode.net</strong></p>
- <table cellspacing="20">
- <tr>
- <td><strong>#archlinux</strong></td>
- <td>The main discussion channel, mostly in English</td>
- </tr><tr>
- <td><strong>#archlinux64</strong></td>
- <td>x86_64 specific discussion channel, mostly in English</td>
- </tr><tr>
- <td><strong>#archlinux-bugs</strong></td>
- <td>Bug-centric discussion</td>
- </tr><tr>
- <td><strong>#archlinux-offtopic</strong></td>
- <td>Random offtopic discussions.</td>
- </tr><tr>
- <td><strong>#archlinux-pacman</strong></td>
- <td>Pacman development and discussion</td>
- </tr><tr>
- <td><strong>#archlinux-br</strong></td>
- <td>Discussion (Brazilian)</td>
- </tr><tr>
- <td><strong>#archlinux-cr</strong></td>
- <td>Discussion (Costa Rica)</td>
- </tr><tr>
- <td><strong>#archlinux.de</strong></td>
- <td>Discussion (German)</td>
- </tr><tr>
- <td><strong>#archlinux.dk</strong></td>
- <td>Discussion (Danish)</td>
- </tr><tr>
- <td><strong>#archlinux-es</strong></td>
- <td>Discussion (Spanish)</td>
- </tr><tr>
- <td><strong>#archlinuxfr</strong></td>
- <td>Discussion (French)</td>
- </tr><tr>
- <td><strong>#archlinux-gaelic</strong></td>
- <td>Discussion (Gaelic)</td>
- </tr><tr>
- <td><strong>#archlinux.hu</strong></td>
- <td>Discussion (Hungarian)</td>
- </tr><tr>
- <td><strong>#archlinux.it</strong></td>
- <td>Discussion (Italian)</td>
- </tr><tr>
- <td><strong>#archlinux-pl</strong></td>
- <td>Discussion (Polish)</td>
- </tr><tr>
- <td><strong>#archlinux.ro</strong></td>
- <td>Discussion (Romanian)</td>
- </tr><tr>
- <td><strong>#archlinux.se</strong></td>
- <td>Discussion (Swedish)</td>
- </tr><tr>
- <td><strong>#archlinux.tr</strong></td>
- <td>Discussion (Turkish)</td>
- </tr><tr>
- <td><strong>#archlinux.org.uk</strong></td>
- <td>Discussion (United Kingdom)</td>
- </tr>
- </table>
-</div>
-<br /><br />
-{% endblock %}
-
diff --git a/urls.py b/urls.py
index a84e8e1..01a37da 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'^irc/$', direct_to_template, {'template': 'public/irc.html'}, 'page-irc'),
(r'^moreforums/$', 'public.views.moreforums', {}, 'page-forums'),
(r'^projects/$', 'public.views.projects', {}, 'page-projects'),
(r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'),