Merge branch 'master-nomake'

4 files changed, 19 insertions, 32 deletions

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 191b9920..20c127c1 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -126,7 +126,11 @@ def get_wiki_link(package):
 
 @register.simple_tag
 def bugs_list(package):
-    url = "https://labs.parabola.nu/search/index/issue-tracker"
+    url = "https://labs.parabola.nu/search/index/"
+    if package.arch.name == 'mips64el':
+        url = url + "mips64el"
+    else:
+        url = url + "issue-tracker"
     data = {
         'titles_only': '1',
         'issues': '1',
@@ -137,7 +141,11 @@ def bugs_list(package):
 
 @register.simple_tag
 def bug_report(package):
-    url = "https://labs.parabola.nu/projects/issue-tracker/issues/new"
+    url = "https://labs.parabola.nu/projects/"
+    if package.arch.name == 'mips64el':
+        url = url + "mips64el/issues/new"
+    else:
+        url = url + "issue-tracker/issues/new"
     data = {
         'issue[subject]': '[%s] PLEASE ENTER SUMMARY' % package.pkgname,
     }
@@ -145,7 +153,11 @@ def bug_report(package):
 
 @register.simple_tag
 def flag_unfree(package):
-    url = "https://labs.parabola.nu/projects/issue-tracker/issues/new"
+    url = "https://labs.parabola.nu/projects/"
+    if package.arch.name == 'mips64el':
+        url = url + "mips64el/issues/new"
+    else:
+        url = url + "issue-tracker/issues/new"
     data = {
         'issue[priority_id]': '1', # "freedom issue"
         'issue[watcher_user_ids][]': '62', # "dev-list"
diff --git a/sitestatic/archnavbar/archnavbar.css b/sitestatic/archnavbar/archnavbar.css
index fa2cf658..a5de527d 100644
--- a/sitestatic/archnavbar/archnavbar.css
+++ b/sitestatic/archnavbar/archnavbar.css
@@ -6,7 +6,7 @@
 
 /* container for the entire bar */
 #archnavbar { height: 40px !important; padding: 10px 15px !important; background: #000 !important; border-bottom: 5px #787DAB solid !important; }
-#archnavbarlogo { background: url('archlogo.png') no-repeat !important; }
+#archnavbarlogo { float: left !important; margin: -5px 0 0 0 !important; padding: 0 !important; height: 50px !important; width: 324px !important; background: url('archlogo.png') no-repeat !important; }
 
 /* move the heading/paragraph text offscreen */
 #archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
@@ -20,6 +20,5 @@
 #archnavbar ul li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
 
 /* style the links */
-#archnavbar ul#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
+#archnavbar ul li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
 #archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; }
-
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index e2b88042..5dab07ce 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -6,31 +6,7 @@
  *   11px = 0.6875em
  */
 
-/*
- * ARCH GLOBAL NAVBAR
- * We're forcing all generic selectors with !important
- * to help prevent other stylesheets from interfering.
- */
-
-/* container for the entire bar */
-#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #000 !important; border-bottom: 5px #787DAB solid !important; }
-#archnavbarlogo { float: left !important; margin: -5px 0 0 0 !important; padding: 0 !important; height: 50px !important; width: 324px !important; background: url('archnavbar/archlogo.png') no-repeat !important; }
-
-/* move the heading text offscreen */
-#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
-
-/* make the link the same size as the logo */
-#archnavbarlogo a { display: block !important; height: 50px !important; width: 324px !important; }
-
-/* display the list inline, float it to the right and style it */
-#archnavbarlist { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
-#archnavbarlist li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
-
-/* style the links */
-#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
-#archnavbarlist li a:hover { color: white !important; text-decoration: underline !important; }
-
-/* END ARCH GLOBAL NAVBAR */
+@import url("archnavbar/archnavbar.css");
 
 /* simple reset */
 * {
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 321afdf7..dc185fe1 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -39,7 +39,7 @@
                 <li><a href="unflag/all/" title="Unflag all matching pkgbase">Click here to unflag all split packages</a></li>
                 {% endif %}
                 {% else %}
-                {% if pkg.arch.name == "mips64el" or pkg.repo.name == "Libre" or pkg.repo.name == "Pcr" %}
+                {% 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"