diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-02-25 11:49:14 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-02-26 10:29:27 +0100 |
| commit | 53a267a6862f641db789f53040ef2ba83ce43989 (patch) | |
| tree | 545d51e0237e6045dcc28a0527b77e62c4c58e06 | |
| parent | fce42fd0435c97f4fcdc4a12666f517d67238210 (diff) | |
| download | hyperkitty-53a267a6862f641db789f53040ef2ba83ce43989.tar.gz hyperkitty-53a267a6862f641db789f53040ef2ba83ce43989.tar.xz hyperkitty-53a267a6862f641db789f53040ef2ba83ce43989.zip | |
Use rjsmin instead of jsmin for licensing reasons
| -rw-r--r-- | hyperkitty.spec | 6 | ||||
| -rw-r--r-- | hyperkitty/templates/base.html | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/hyperkitty.spec b/hyperkitty.spec index ebc01ea..757ddb6 100644 --- a/hyperkitty.spec +++ b/hyperkitty.spec @@ -26,6 +26,9 @@ BuildRequires: django-gravatar2 BuildRequires: django-rest-framework >= 2.0.0 BuildRequires: django-social-auth >= 0.7.1 BuildRequires: django-crispy-forms +BuildRequires: django-assets +BuildRequires: python-rjsmin +BuildRequires: python-cssmin %if 0%{fedora} && 0%{fedora} < 18 BuildRequires: Django BuildRequires: Django-south @@ -40,6 +43,9 @@ Requires: django-rest-framework >= 2.0.0 Requires: mailman >= 3.0.0b2 Requires: kittystore Requires: django-crispy-forms +Requires: django-assets +Requires: python-rjsmin +Requires: python-cssmin %if 0%{fedora} && 0%{fedora} < 18 Requires: Django >= 1.4 Requires: Django-south diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index 38d04ec..c564468 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -73,7 +73,7 @@ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script> <script>window.jQuery || document.write('<script src="{{ STATIC_URL }}libs/jquery/jquery-1.8.3.min.js"><\/script>')</script> <script src="{{ STATIC_URL }}libs/jquery/jquery-ui-1.10.0.custom.min.js"></script> - {% assets filters="jsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/protovis-d3.1.js", "js/hyperkitty.js" %} + {% assets filters="rjsmin", output="gen/hyperkitty.js", "libs/bootstrap/bootstrap.min.js", "libs/jquery.expander.js", "libs/protovis-d3.1.js", "js/hyperkitty.js" %} <script src="{{ ASSET_URL }}"></script> {% endassets %} {% block additionaljs %} {% endblock %} diff --git a/requirements.txt b/requirements.txt index 0f775ac..b1efdbd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ kittystore South django-crispy-forms django-assets -jsmin +rjsmin cssmin |