Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

2 files changed, 189 insertions, 90 deletions

diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json
index 60db1635..c309095e 100644
--- a/main/fixtures/groups.json
+++ b/main/fixtures/groups.json
@@ -11,39 +11,73 @@
                     "package"
                 ], 
                 [
+                    "add_news", 
+                    "news", 
+                    "news"
+                ], 
+                [
+                    "change_news", 
+                    "news", 
+                    "news"
+                ], 
+                [
+                    "add_signoff", 
+                    "packages", 
+                    "signoff"
+                ], 
+                [
+                    "change_signoff", 
+                    "packages", 
+                    "signoff"
+                ], 
+                [
+                    "add_signoffspecification", 
+                    "packages", 
+                    "signoffspecification"
+                ], 
+                [
+                    "change_signoffspecification", 
+                    "packages", 
+                    "signoffspecification"
+                ], 
+                [
                     "add_todolist", 
-                    "main", 
+                    "todolists", 
                     "todolist"
                 ], 
                 [
                     "change_todolist", 
-                    "main", 
+                    "todolists", 
                     "todolist"
                 ], 
                 [
-                    "add_todolistpkg", 
-                    "main", 
-                    "todolistpkg"
+                    "add_todolistpackage", 
+                    "todolists", 
+                    "todolistpackage"
                 ], 
                 [
-                    "change_todolistpkg", 
-                    "main", 
-                    "todolistpkg"
+                    "change_todolistpackage", 
+                    "todolists", 
+                    "todolistpackage"
                 ], 
                 [
-                    "delete_todolistpkg", 
-                    "main", 
-                    "todolistpkg"
-                ], 
-                [
-                    "add_news", 
-                    "news", 
-                    "news"
-                ], 
+                    "delete_todolistpackage", 
+                    "todolists", 
+                    "todolistpackage"
+                ]
+            ]
+        }
+    }, 
+    {
+        "pk": 2, 
+        "model": "auth.group", 
+        "fields": {
+            "name": "Trusted Users", 
+            "permissions": [
                 [
-                    "change_news", 
-                    "news", 
-                    "news"
+                    "change_package", 
+                    "main", 
+                    "package"
                 ], 
                 [
                     "add_signoff", 
@@ -64,6 +98,31 @@
                     "change_signoffspecification", 
                     "packages", 
                     "signoffspecification"
+                ], 
+                [
+                    "add_todolist", 
+                    "todolists", 
+                    "todolist"
+                ], 
+                [
+                    "change_todolist", 
+                    "todolists", 
+                    "todolist"
+                ], 
+                [
+                    "add_todolistpackage", 
+                    "todolists", 
+                    "todolistpackage"
+                ], 
+                [
+                    "change_todolistpackage", 
+                    "todolists", 
+                    "todolistpackage"
+                ], 
+                [
+                    "delete_todolistpackage", 
+                    "todolists", 
+                    "todolistpackage"
                 ]
             ]
         }
@@ -133,25 +192,30 @@
         }
     }, 
     {
-        "pk": 6, 
+        "pk": 4, 
         "model": "auth.group", 
         "fields": {
-            "name": "Package Relation Maintainers", 
+            "name": "User Admins", 
             "permissions": [
                 [
-                    "add_packagerelation", 
-                    "packages", 
-                    "packagerelation"
+                    "add_user", 
+                    "auth", 
+                    "user"
                 ], 
                 [
-                    "change_packagerelation", 
-                    "packages", 
-                    "packagerelation"
+                    "change_user", 
+                    "auth", 
+                    "user"
                 ], 
                 [
-                    "delete_packagerelation", 
-                    "packages", 
-                    "packagerelation"
+                    "add_userprofile", 
+                    "devel", 
+                    "userprofile"
+                ], 
+                [
+                    "change_userprofile", 
+                    "devel", 
+                    "userprofile"
                 ]
             ]
         }
@@ -313,6 +377,21 @@
                     "module"
                 ], 
                 [
+                    "add_release", 
+                    "releng", 
+                    "release"
+                ], 
+                [
+                    "change_release", 
+                    "releng", 
+                    "release"
+                ], 
+                [
+                    "delete_release", 
+                    "releng", 
+                    "release"
+                ], 
+                [
                     "add_source", 
                     "releng", 
                     "source"
@@ -346,89 +425,49 @@
         }
     }, 
     {
-        "pk": 2, 
+        "pk": 6, 
         "model": "auth.group", 
         "fields": {
-            "name": "Trusted Users", 
+            "name": "Package Relation Maintainers", 
             "permissions": [
                 [
-                    "change_package", 
-                    "main", 
-                    "package"
-                ], 
-                [
-                    "add_todolist", 
-                    "main", 
-                    "todolist"
-                ], 
-                [
-                    "change_todolist", 
-                    "main", 
-                    "todolist"
-                ], 
-                [
-                    "add_todolistpkg", 
-                    "main", 
-                    "todolistpkg"
-                ], 
-                [
-                    "change_todolistpkg", 
-                    "main", 
-                    "todolistpkg"
-                ], 
-                [
-                    "delete_todolistpkg", 
-                    "main", 
-                    "todolistpkg"
-                ], 
-                [
-                    "add_signoff", 
-                    "packages", 
-                    "signoff"
-                ], 
-                [
-                    "change_signoff", 
+                    "add_packagerelation", 
                     "packages", 
-                    "signoff"
+                    "packagerelation"
                 ], 
                 [
-                    "add_signoffspecification", 
+                    "change_packagerelation", 
                     "packages", 
-                    "signoffspecification"
+                    "packagerelation"
                 ], 
                 [
-                    "change_signoffspecification", 
+                    "delete_packagerelation", 
                     "packages", 
-                    "signoffspecification"
+                    "packagerelation"
                 ]
             ]
         }
     }, 
     {
-        "pk": 4, 
+        "pk": 8, 
         "model": "auth.group", 
         "fields": {
-            "name": "User Admins", 
+            "name": "Download Page Releases", 
             "permissions": [
                 [
-                    "add_user", 
-                    "auth", 
-                    "user"
-                ], 
-                [
-                    "change_user", 
-                    "auth", 
-                    "user"
+                    "add_release", 
+                    "releng", 
+                    "release"
                 ], 
                 [
-                    "add_userprofile", 
-                    "devel", 
-                    "userprofile"
+                    "change_release", 
+                    "releng", 
+                    "release"
                 ], 
                 [
-                    "change_userprofile", 
-                    "devel", 
-                    "userprofile"
+                    "delete_release", 
+                    "releng", 
+                    "release"
                 ]
             ]
         }
diff --git a/main/fixtures/repos.json b/main/fixtures/repos.json
index f480000d..655be64a 100644
--- a/main/fixtures/repos.json
+++ b/main/fixtures/repos.json
@@ -12,6 +12,18 @@
         }
     }, 
     {
+        "pk": 11, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 41, 
+            "staging": true, 
+            "name": "Community-Staging", 
+            "bugs_project": 5, 
+            "svn_root": "community", 
+            "testing": false
+        }
+    }, 
+    {
         "pk": 6, 
         "model": "main.repo", 
         "fields": {
@@ -48,6 +60,30 @@
         }
     }, 
     {
+        "pk": 13, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 10, 
+            "staging": true, 
+            "name": "Gnome-Unstable", 
+            "bugs_project": 1, 
+            "svn_root": "packages", 
+            "testing": false
+        }
+    }, 
+    {
+        "pk": 12, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 10, 
+            "staging": true, 
+            "name": "KDE-Unstable", 
+            "bugs_project": 1, 
+            "svn_root": "packages", 
+            "testing": false
+        }
+    }, 
+    {
         "pk": 7, 
         "model": "main.repo", 
         "fields": {
@@ -60,6 +96,18 @@
         }
     }, 
     {
+        "pk": 14, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 46, 
+            "staging": true, 
+            "name": "Multilib-Staging", 
+            "bugs_project": 5, 
+            "svn_root": "community", 
+            "testing": false
+        }
+    }, 
+    {
         "pk": 8, 
         "model": "main.repo", 
         "fields": {
@@ -72,6 +120,18 @@
         }
     }, 
     {
+        "pk": 10, 
+        "model": "main.repo", 
+        "fields": {
+            "bugs_category": 10, 
+            "staging": true, 
+            "name": "Staging", 
+            "bugs_project": 1, 
+            "svn_root": "packages", 
+            "testing": false
+        }
+    }, 
+    {
         "pk": 3, 
         "model": "main.repo", 
         "fields": {