From 5897fba6d3242cc7188d05f8f3be7362a8383761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Sat, 21 May 2011 02:28:51 -0300
Subject: More rebranding!

---
 packages/templatetags/package_extras.py | 31 +++++++------------------------
 settings.py                             |  2 +-
 templates/packages/details.html         |  2 --
 templates/packages/flag_confirmed.html  |  2 +-
 templates/packages/flaghelp.html        |  7 ++++---
 templates/packages/opensearch.xml       |  2 +-
 templates/packages/stale_relations.html |  2 +-
 templates/public/svn.html               | 33 +++------------------------------
 templates/releng/add.html               | 26 +++++++++++++-------------
 templates/releng/results.html           |  6 +-----
 templates/releng/thanks.html            |  2 +-
 11 files changed, 33 insertions(+), 82 deletions(-)

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index e089b723..77ba79ba 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -48,37 +48,20 @@ def userpkgs(user):
         )
     return ''
 
-
-def svn_link(package, svnpath):
-    '''Helper function for the two real SVN link methods.'''
-    parts = (package.repo.svn_root, package.pkgbase, svnpath)
-    linkbase = "http://projects.archlinux.org/svntogit/%s.git/tree/%s/%s/"
-    return linkbase % tuple(urlquote(part) for part in parts)
-
-@register.simple_tag
-def svn_arch(package):
-    repo = package.repo.name.lower()
-    return svn_link(package, "repos/%s-%s" % (repo, package.arch.name))
-
-@register.simple_tag
-def svn_trunk(package):
-    return svn_link(package, "trunk")
-
 @register.simple_tag
 def bugs_list(package):
     data = {
-        'project': package.repo.bugs_project,
-        'string': package.pkgname,
+        '@action': 'search'
+        'title': package.pkgname,
     }
-    return "https://bugs.archlinux.org/?%s" % urlencode(data)
+    return "https://bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data)
 
 @register.simple_tag
 def bug_report(package):
     data = {
-        'project': package.repo.bugs_project,
-        'product_category': package.repo.bugs_category,
-        'item_summary': '[%s]' % package.pkgname,
+        '@template': 'item',
+        'keyword': 'packages',
+        'title': '[%s]' % package.pkgname,
     }
-    return "https://bugs.archlinux.org/newtask?%s" % urlencode(data)
-
+    return "https://bugs.parabolagnulinux.org/bugs/issue?" % urlencode(data) 
 # vim: set ts=4 sw=4 et:
diff --git a/settings.py b/settings.py
index c9ea4178..e9285560 100644
--- a/settings.py
+++ b/settings.py
@@ -125,6 +125,6 @@ if DEBUG_TOOLBAR:
     INSTALLED_APPS = list(INSTALLED_APPS) + [ 'debug_toolbar' ]
 
 # URL to fetch a current list of available ISOs
-ISO_LIST_URL = 'http://releng.archlinux.org/isos/'
+ISO_LIST_URL = 'http://repo.parabolagnulinux.org/isos/'
 
 # vim: set ts=4 sw=4 et:
diff --git a/templates/packages/details.html b/templates/packages/details.html
index a8b2346e..f1b16e4c 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -15,8 +15,6 @@
         <div id="actionlist">
         <h4>Package Actions</h4>
             <ul class="small">
-                <li><a href="{% svn_arch pkg %}" title="View SVN entries in the {{pkg.repo|lower}}-{{pkg.arch}} branch">SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})</a></li>
-                <li><a href="{% svn_trunk pkg %}" title="View SVN entries on trunk">SVN Entries (trunk)</a></li>
                 <li><a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a></li>
                 <li><a href="{% bug_report pkg %}" title="Report bug for {{ pkg.pkgname }}">Report a Bug</a></li>
                 {% if pkg.flag_date %}
diff --git a/templates/packages/flag_confirmed.html b/templates/packages/flag_confirmed.html
index 02c24f72..baa466dd 100644
--- a/templates/packages/flag_confirmed.html
+++ b/templates/packages/flag_confirmed.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Arch Linux - Package Flagged - {{ package.pkgname }}{% endblock %}
+{% block title %}Parabola - Package Flagged - {{ package.pkgname }}{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index d96ccd43..4a9d1cdf 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -25,12 +25,13 @@
         <p>The message box portion of the flag utility is optional, and meant
         for short messages only. If you need more than 200 characters for your
         message, then file a bug report, email the maintainer directly, or send
-        an email to the <a target="_blank" href="http://mailman.archlinux.org/mailman/listinfo/arch-general"
-            title="Visit the arch-general mailing list">arch-general mailing list</a>
+        an email to the <a target="_blank"
+            href="http://list.parabolagnulinux.org/listinfo.cgi/dev-parabolagnulinux.org"
+            title="Visit the parabola dev mailing list">parabola mailing list</a>
         with your additional text.</p>
 
         <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
-        package is broken! Use the <a target="_blank" href="https://bugs.archlinux.org"
+        package is broken! Use the <a target="_blank" href="https://bugs.parabolagnulinux.org"
             title="Parabola Bugtracker">bugtracker</a> instead.</p>
 
     </body>
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index ea040788..e54507ee 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -2,7 +2,7 @@
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
 	<ShortName>Parabola Packages</ShortName>
 	<Description>Search the Parabola package repositories.</Description>
-	<Tags>linux archlinux package software</Tags>
+	<Tags>gnu linuxlibre parabola package software</Tags>
 	<Image height="16" width="16" type="image/x-icon">{{domain}}/media/favicon.ico</Image>
 	<Language>en-us</Language>
 	<InputEncoding>UTF-8</InputEncoding>
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
index d51f7e44..6cff8d3d 100644
--- a/templates/packages/stale_relations.html
+++ b/templates/packages/stale_relations.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Arch Linux - Stale Package Relations{% endblock %}
+{% block title %}Parabola - Stale Package Relations{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
diff --git a/templates/public/svn.html b/templates/public/svn.html
index 10a58ba6..80367eaf 100644
--- a/templates/public/svn.html
+++ b/templates/public/svn.html
@@ -3,38 +3,11 @@
 {% block content %}
 <div class="box">
     <h2 class="title">SVN Repositories</h2>
-    <p>
-    The PKGBUILD files can be fetched via the ABS utility. To learn more
-    about ABS, see <a href="https://wiki.archlinux.org/index.php/ABS">the ABS wiki page</a>.
-    </p>
-	<p>The SVN repositories have been cloned into git repositories and can be
-	viewed via the cgit interface.
-	<a href="http://projects.archlinux.org/svntogit/packages.git/">All
-		packages</a> are available here except for
-	<a href="http://projects.archlinux.org/svntogit/community.git/">community
-		and multilib</a> which are available in a different repository.</p>
-    <p>
-    You can also get individual PKGBUILDs directly from SVN. This can be
-    especially useful if you need to compile an older version of a package.
-    <strong>DO NOT CHECK OUT THE ENTIRE SVN REPO</strong>. Your address may be
-    blocked.  Use the following commands to check out a specific package:
+    <p>Parabola doesn't use any SVN repositories. But you can find our <a
+        href="https://projects.parabolagnulinux.org" title="Projects
+        page">Projects</a> on git!
 	</p>
 
-    <pre>svn checkout --depth=empty svn://svn.archlinux.org/packages
-cd packages
-svn update &lt;your-package-name&gt;</pre>
-
-	For the community and multilib repositories, use the following commands
-	instead:
-    <pre>svn checkout --depth=empty svn://svn.archlinux.org/community
-cd community
-svn update &lt;your-package-name&gt;</pre>
-
-    <p>
-    Visit <a href="https://wiki.archlinux.org/index.php?title=Getting_PKGBUILDS_From_SVN">the wiki</a>
-    for more tips on checking out and updating svn PKGBUILDs.
-    </p>
-
 </div>
 <br /><br />
 {% endblock %}
diff --git a/templates/releng/add.html b/templates/releng/add.html
index 8488b40c..428812c9 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -1,22 +1,22 @@
 {% extends "base.html" %}
 
-{% block title %}Arch Linux - Test Result Entry{% endblock %}
+{% block title %}Parabola - Test Result Entry{% endblock %}
 
 {% block content %}
 <div class="box">
-    <h2>Arch Releng Testbuild Feedback Entry</h2>
+    <h2>Parabola Releng Testbuild Feedback Entry</h2>
 
-    <p>This page allows you to submit feedback after testing an Arch Linux installation
-    using a release engineering testbuild.  Mark all the options you used during the
-    installation; at the end you can specify whether everything went OK.  Be
-    sure to only denote a successful install after having checked the
-    installation properly.  Some options require you to check several things (such as
-    config files), this will be mentioned alongside the option.</p>
-    <p>There is also an overview of all feedback on the
-    <a href="{% url releng-test-overview %}">results page</a>.  Once we have
-    builds that are properly tested (enough successful feedback for all
-    important features of the ISO or a slightly earlier ISO), we can release new
-    official media.</p>
+    <p>This page allows you to submit feedback after testing an Parabola
+    installation using a release engineering testbuild. Mark all the
+    options you used during the installation; at the end you can specify
+    whether everything went OK. Be sure to only denote a successful
+    install after having checked the installation properly.  Some options
+    require you to check several things (such as config files), this will
+    be mentioned alongside the option.</p> <p>There is also an overview of
+    all feedback on the <a href="{% url releng-test-overview %}">results
+        page</a>. Once we have builds that are properly tested (enough
+    successful feedback for all important features of the ISO or a
+    slightly earlier ISO), we can release new official media.</p>
 
     <div id="releng-feedback"> <form action="" method="post">{% csrf_token %}
             {{ form.as_p }}
diff --git a/templates/releng/results.html b/templates/releng/results.html
index c3e7d99a..6f7d29f0 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Arch Linux - Release Engineering Testbuild Results{% endblock %}
+{% block title %}Parabola - Release Engineering Testbuild Results{% endblock %}
 
 {% block content %}
 <div class="box">
@@ -13,10 +13,6 @@
     if you have tested and used any ISOs. Both successful and failed results
     are encouraged and welcome.</p>
 
-    <p>For more information, see the <a
-    href="https://wiki.archlinux.org/index.php/DeveloperWiki:releng_testimages_feedback">documentation
-    on the wiki</a>.</p>
-
     <p>All ISOs referenced on this page are available from
     <a href="{{ iso_url }}">{{ iso_url }}</a>.</p>
 
diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html
index b261426d..984a056d 100644
--- a/templates/releng/thanks.html
+++ b/templates/releng/thanks.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Arch Linux - Feedback - Thanks!{% endblock %}
+{% block title %}Parabola - Feedback - Thanks!{% endblock %}
 
 {% block content %}
 <div class="box">
-- 
cgit v1.2.3-2-g168b