diff mbox

[Branch,~linaro-validation/lava-dashboard/trunk] Rev 393: prepare dashboard for using django.contrib.staticfiles

Message ID 20130131025315.11794.13465.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson Jan. 31, 2013, 2:53 a.m. UTC 
------------------------------------------------------------
revno: 393
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Thu 2013-01-31 15:52:51 +1300
message:
  prepare dashboard for using django.contrib.staticfiles
added:
  dashboard_app/static/dashboard_app/
renamed:
  dashboard_app/static/css/ => dashboard_app/static/dashboard_app/css/
  dashboard_app/static/images/ => dashboard_app/static/dashboard_app/images/
  dashboard_app/static/js/ => dashboard_app/static/dashboard_app/js/
modified:
  dashboard_app/extension.py
  setup.py


--
lp:lava-dashboard
https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk

You are subscribed to branch lp:lava-dashboard.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'dashboard_app/extension.py'
--- dashboard_app/extension.py	2013-01-11 17:08:32 +0000
+++ dashboard_app/extension.py	2013-01-31 02:52:51 +0000
@@ -79,6 +79,9 @@ 
         settings_module['DATAREPORT_DIRS'] = [
             os.path.join(root_dir, 'examples', 'reports'),
             os.path.join(root_dir, 'production', 'reports')]
+        prepend_label_apps = settings_module.get('STATICFILES_PREPEND_LABEL_APPS', [])
+        if self.app_name in prepend_label_apps:
+            prepend_label_apps.remove(self.app_name)
 
     def contribute_to_settings_ex(self, settings_module, settings_object):
         settings_module['DATAVIEW_DIRS'] = settings_object._settings.get(

=== added directory 'dashboard_app/static/dashboard_app'
=== renamed directory 'dashboard_app/static/css' => 'dashboard_app/static/dashboard_app/css'
=== renamed directory 'dashboard_app/static/images' => 'dashboard_app/static/dashboard_app/images'
=== renamed directory 'dashboard_app/static/js' => 'dashboard_app/static/dashboard_app/js'
=== modified file 'setup.py'
--- setup.py	2012-11-07 20:26:14 +0000
+++ setup.py	2013-01-31 02:52:51 +0000
@@ -49,7 +49,6 @@ 
     install_requires=[
         'Django >= 1.2',
         'django-restricted-resource >= 0.2.6',
-        'django-staticfiles == 0.3.4',
         'docutils >= 0.6',
         'lava-server >= 0.8',
         'linaro-dashboard-bundle >= 1.8',