diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | packages/templatetags/jinja2.py | 7 | ||||
| -rw-r--r-- | public/tests.py | 13 | ||||
| -rw-r--r-- | public/views.py | 2 | ||||
| -rw-r--r-- | settings.py | 2 | ||||
| -rw-r--r-- | templates/mirrors/mirror_details.html | 4 | ||||
| -rw-r--r-- | templates/mirrors/url_details.html | 2 | ||||
| -rw-r--r-- | templates/public/https.html | 4 | ||||
| -rw-r--r-- | urls.py | 2 |
9 files changed, 22 insertions, 16 deletions
@@ -1,10 +1,12 @@ *.pyc *.swp *.swo +*~ .DS_Store local_settings.py archweb.db archweb.db-* +database.db newrelic.key tags collected_static/ diff --git a/packages/templatetags/jinja2.py b/packages/templatetags/jinja2.py index 86bbd03e..a07f87bd 100644 --- a/packages/templatetags/jinja2.py +++ b/packages/templatetags/jinja2.py @@ -48,11 +48,11 @@ def wiki_link(package): @library.global_function def bugs_list(package): - url = "https://labs.parabola.nu/search/index/" if package.arch.name == 'mips64el': - url = url + "mips64el" + project = "mips64el" else: - url = url + "issue-tracker" + project = "issue-tracker" + url = "https://labs.parabola.nu/projects/%s/search" % project data = { 'titles_only': '1', 'issues': '1', @@ -81,6 +81,7 @@ def flag_unfree(package): else: url = url + "issue-tracker/issues/new" data = { + 'issue[tracker_id]': '4', # "freedom issue" 'issue[priority_id]': '1', # "freedom issue" 'issue[watcher_user_ids][]': '62', # "dev-list" 'issue[subject]': '[%s] Please put your reasons here (register first if you haven\'t)' % package.pkgname, diff --git a/public/tests.py b/public/tests.py index 565d57ec..49bbd2bb 100644 --- a/public/tests.py +++ b/public/tests.py @@ -17,10 +17,16 @@ class PublicTest(TestCase): def test_svn(self): response = self.client.get('/svn/') - self.assertEqual(response.status_code, 200) + # Parabola has no SVN. + self.assertEqual(response.status_code, 404) def test_developers(self): response = self.client.get('/developers/') + self.assertEqual(response.status_code, 301) + self.assertTrue(response['Location'].endswith('/hackers/')) + + def test_hackers(self): + response = self.client.get('/hackers/') self.assertEqual(response.status_code, 200) def test_fellows(self): @@ -33,5 +39,6 @@ class PublicTest(TestCase): def test_download(self): response = self.client.get('/download/') - self.assertEqual(response.status_code, 200) - + self.assertEqual(response.status_code, 302) + self.assertEqual(response['Location'], + 'https://wiki.parabola.nu/Get_Parabola') diff --git a/public/views.py b/public/views.py index 1197322d..0b245071 100644 --- a/public/views.py +++ b/public/views.py @@ -83,7 +83,7 @@ def _mirror_urls(): @cache_control(max_age=307) def download(request): - return HttpResponseRedirect('https://wiki.parabola.nu/get') + return HttpResponseRedirect('https://wiki.parabola.nu/Get_Parabola') @cache_control(max_age=307) def feeds(request): diff --git a/settings.py b/settings.py index d0738e7b..5ee17af3 100644 --- a/settings.py +++ b/settings.py @@ -164,7 +164,7 @@ PGP_SERVER = 'pgp.mit.edu:11371' ISO_LIST_URL = 'https://repo.parabola.nu/iso/' # URL to the PXE netboot instructions -PXEBOOT_URL = 'http://repo.parabola.nu/pxeboot/' +PXEBOOT_URL = 'https://repo.parabola.nu/pxeboot/' # URL for SVN access for fetching commit messages (note absence of packages or # community bit on the end, repo.svn_root is appended) diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index bd302d61..ffaacfe6 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -63,10 +63,6 @@ <td>{% if mirror.alternate_email %}<a href="mailto:{{ mirror.alternate_email }}">{{ mirror.alternate_email }}</a>{% else %}None{% endif %}</td> </tr> <tr> - <th>Flyspray Issue:</th> - <td>{% if mirror.bug %}{% bug_link mirror.bug %}{% endif %}</td> - </tr> - <tr> <th>Notes:</th> <td class="wrap">{{ mirror.notes|linebreaks }}</td> </tr> diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html index 557a1b79..c47e0508 100644 --- a/templates/mirrors/url_details.html +++ b/templates/mirrors/url_details.html @@ -4,7 +4,7 @@ {% load mirror_status %} {% load flags %} -{% block title %}Arch Linux - {{ url.url }} - URL Details{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ url.url }} - URL Details{% endblock %} {% block head %}<link rel="stylesheet" type="text/css" href="{% static "flags/fam.css" %}" media="screen, projection" />{% endblock %} diff --git a/templates/public/https.html b/templates/public/https.html index 88056346..9d54646a 100644 --- a/templates/public/https.html +++ b/templates/public/https.html @@ -11,7 +11,7 @@ is the <em>only</em> page on the whole site that can be accessed without a secure connection, all other pages will redirect to the secure version.</p> - <h2><a href="https://parabola.nu">Enter the secure site</a></h2> + <h2><a href="https://www.parabola.nu/">Enter the secure site</a></h2> <h3>But my browser says the secure site is untrusted</h3> @@ -42,7 +42,7 @@ <h2>I just want to get the installer ISOs</h2> <p>You can proceed to our - <a href="{% wiki_url 'get' %}">ISOs download page</a> on + <a href="{% wiki_url 'Get Parabola' %}">ISOs download page</a> on <a href="{% wiki_url %}">our wiki</a>.</p> </div> @@ -103,7 +103,7 @@ legacy_urls = ( ('^todolists/$', '/todo/'), ('^docs/en/guide/install/arch-install-guide.html', - 'https://wiki.parabola.nu/Installation_guide'), + 'https://wiki.parabola.nu/Installation_Guide'), ('^docs/en/', 'https://wiki.parabola.nu/'), ('^docs/', |