6 files changed, 43 insertions, 15 deletions
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 07406fa2..dc185fe1 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -23,6 +23,7 @@
                 <li>
                     <a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a> /
                     <a href="{% bug_report pkg %}" title="Report new bug for {{ pkg.pkgname }}">Add New Bug</a>
+                  / <a href="{% flag_unfree pkg %}" title="Report {{ pkg.pkgname }} as unfree">Report as unfree</a>
                 </li>
                 <li><a href="{% get_wiki_link pkg %}" title="Search wiki for {{ pkg.pkgname }}">Search Wiki</a></li>
                 {% if pkg.flag_date %}
@@ -38,11 +39,15 @@
                 <li><a href="unflag/all/" title="Unflag all matching pkgbase">Click here to unflag all split packages</a></li>
                 {% endif %}
                 {% else %}
+                {% if pkg.repo.name != "Core" and pkg.repo.name != "Extra" and pkg.repo.name != "Testing" and pkg.repo.name != "Community" and pkg.repo.name != "Community-Testing" and pkg.repo.name != "Multilib" and pkg.repo.name != "Multilib-testing" or pkg.arch.name == "mips64el" %}
                 <li><a href="flag/" title="Flag {{ pkg.pkgname }} as out-of-date">Flag Package Out-of-Date</a>
                 <a href="/packages/flaghelp/"
                     title="Get help on package flagging"
                     onclick="return !window.open('/packages/flaghelp/','FlagHelp',
                     'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a></li>
+                {% elif pkg.arch.name == "i686" or pkg.arch.name == "x86_64" %}
+                <li>This package comes from Arch</li>
+                {% endif %}
                 {% endif %}
                 <li><a href="download/" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li>
             </ul>
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index d70b4209..0ff5e2ee 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -9,6 +9,35 @@
 <div class="box">
     <h2>Package Differences by Architecture</h2>
     <div class="filter-criteria">
+        <h3>Select architectures</h3>
+        <form id="arch_selector" method="get" action=".">
+        <fieldset>
+            <legend>Select arches</legend>
+            <div><label for="arch_a" title="Architecture A">Architecture A</label>
+                 <select name="arch_a" id="arch_a">
+                 {% for arch in arches %}
+                     <option
+                     {% if arch == arch_a %}
+                         selected="selected"
+                     {% endif  %}
+                     >{{ arch }}</option>
+                 {% endfor %}
+                 </select>
+            </div>
+            <div><label for="arch_b" title="Architecture B">Architecture B</label>
+                 <select name="arch_b" id="arch_b">
+                 {% for arch in arches %}
+                     <option
+                     {% if arch == arch_b %}
+                         selected="selected"
+                     {% endif  %}
+                     >{{ arch }}</option>
+                 {% endfor %}
+                 </select>
+            </div>
+            <div><label>&nbsp;</label><input type="submit" title="Show difference between selected architectures"></div>
+        </fieldset>
+        </form>
         <h3>Filter Differences View</h3>
         <form id="diff_filter" method="post" action=".">
         <fieldset>
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 063e1d1e..b9737bb9 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -23,8 +23,8 @@
     <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 href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
-        title="Visit the arch-general mailing list">arch-general mailing list</a>
+    an email to the <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/dev"
+        title="Visit the dev mailing list">dev mailing list</a>
     with your additional text.</p>
 
     <p><strong>Note:</strong> Do <em>not</em> use this facility if the
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index 51ace2fd..146e6ade 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -24,8 +24,8 @@
         <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="{{ MAILMAN_BASE_URL }}/mailman/listinfo/arch-general"
-            title="Visit the arch-general mailing list">arch-general mailing list</a>
+        an email to the <a target="_blank" href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/dev"
+            title="Visit the dev mailing list">dev mailing list</a>
         with your additional text.</p>
 
         <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
diff --git a/templates/packages/removed.html b/templates/packages/removed.html
index 2d730130..7f6600ee 100644
--- a/templates/packages/removed.html
+++ b/templates/packages/removed.html
@@ -18,10 +18,7 @@
         {% endfor %}
     </ul>
     {% else %}
-    <p>Unfortunately, this package cannot be found in any other repositories.
-    Try using the <a href="{% url 'packages-search' %}?name={{ update.pkgname|urlencode }}">package search page</a>,
-    or try <a href="https://aur.archlinux.org/packages.php?K={{ update.pkgname|urlencode }}">searching the AUR</a>
-    to see if the package can be found there.</p>
+    <p>Unfortunately, this package cannot be found in any other repositories.</p>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/templates/packages/search.html b/templates/packages/search.html
index ec913ed6..074445d8 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -103,18 +103,15 @@
 {% else %}
 <div class="box">
     <p>We couldn't find any packages matching your query. Try searching again
-    using different criteria, or try
-    {% if search_form.q.data %}
-    <a href="https://aur.archlinux.org/packages.php?K={{ search_form.q.data|urlencode }}">searching the AUR</a>
-    {% else %}searching the <a href="https://aur.archlinux.org/">AUR</a>{% endif %}
-    to see if the package can be found there.</p>
+    using different criteria.</p>
 </div>
 {% endif %}
 
 <div id="pkglist-about" class="box">
     <p>You are browsing the {{ BRANDING_DISTRONAME }} package database. From here you can find
     detailed information about packages located in the official supported repositories.
-    For unsupported packages, browse the <a href="https://aur.archlinux.org/"
-        title="AUR package database">Arch User Repository (AUR).</a></p>
+    If you need the sourceball from where a package is built, you can look at our <a
+        href="https://repo.parabolagnulinux.org/sources/packages"
+        title="Sourceballed packages">sources repo</a>.</p>
 </div>
 {% endblock %}