diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-05-06 20:21:14 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-05-06 20:21:14 +0000 |
commit | 38f279ae46364bf079dbaa30a5c6cb80a47dd718 (patch) | |
tree | c9fe9b138f148d909477da5500f4b286bb186aae /main | |
parent | 3d65a994502ff301f13ad153c5cd421c6bc1ea37 (diff) | |
parent | d71d0e9e9e97a1ca80bf2b81081b4b4db7fbea76 (diff) |
Merge branch 'master' of git://parabolagnulinux.org/parabolaweb
Diffstat (limited to 'main')
-rw-r--r-- | main/fixtures/groups.json | 50 | ||||
-rw-r--r-- | main/templatetags/cdn.py | 2 |
2 files changed, 51 insertions, 1 deletions
diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json index 385e321d..0a3c966c 100644 --- a/main/fixtures/groups.json +++ b/main/fixtures/groups.json @@ -34,6 +34,36 @@ "delete_todolistpkg", "main", "todolistpkg" + ], + [ + "add_news", + "news", + "news" + ], + [ + "change_news", + "news", + "news" + ], + [ + "add_signoff", + "packages", + "signoff" + ], + [ + "change_signoff", + "packages", + "signoff" + ], + [ + "add_signoffspecification", + "packages", + "signoffspecification" + ], + [ + "change_signoffspecification", + "packages", + "signoffspecification" ] ] } @@ -350,6 +380,26 @@ "delete_todolistpkg", "main", "todolistpkg" + ], + [ + "add_signoff", + "packages", + "signoff" + ], + [ + "change_signoff", + "packages", + "signoff" + ], + [ + "add_signoffspecification", + "packages", + "signoffspecification" + ], + [ + "change_signoffspecification", + "packages", + "signoffspecification" ] ] } diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py index 5b1b2d46..5cb12fcf 100644 --- a/main/templatetags/cdn.py +++ b/main/templatetags/cdn.py @@ -11,7 +11,7 @@ def jquery(): link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \ '%s/jquery.min.js' % version else: - link = '/media/jquery-%s.js' % version + link = '/media/jquery-%s.min.js' % version return '<script type="text/javascript" src="%s"></script>' % link @register.tag |