Merge "Separate static_settings.py from settings.py"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
5be0e93e50
@ -22,25 +22,7 @@ import sys
|
||||
|
||||
import django
|
||||
from django.utils import html_parser
|
||||
import xstatic.main
|
||||
import xstatic.pkg.angular
|
||||
import xstatic.pkg.angular_bootstrap
|
||||
import xstatic.pkg.angular_smart_table
|
||||
import xstatic.pkg.bootstrap_datepicker
|
||||
import xstatic.pkg.bootstrap_scss
|
||||
import xstatic.pkg.d3
|
||||
import xstatic.pkg.font_awesome
|
||||
import xstatic.pkg.hogan
|
||||
import xstatic.pkg.jasmine
|
||||
import xstatic.pkg.jquery
|
||||
import xstatic.pkg.jquery_migrate
|
||||
import xstatic.pkg.jquery_quicksearch
|
||||
import xstatic.pkg.jquery_tablesorter
|
||||
import xstatic.pkg.jquery_ui
|
||||
import xstatic.pkg.jsencrypt
|
||||
import xstatic.pkg.qunit
|
||||
import xstatic.pkg.rickshaw
|
||||
import xstatic.pkg.spin
|
||||
from openstack_dashboard.static_settings import STATICFILES_DIRS # noqa
|
||||
|
||||
from horizon.test import patches
|
||||
|
||||
@ -156,54 +138,6 @@ STATICFILES_FINDERS = (
|
||||
'compressor.finders.CompressorFinder',
|
||||
)
|
||||
|
||||
STATICFILES_DIRS = [
|
||||
('horizon/lib/angular',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
|
||||
('horizon/lib/angular',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular_bootstrap).base_dir),
|
||||
('horizon/lib/smart-table',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular_smart_table).base_dir),
|
||||
('horizon/lib/bootstrap_datepicker',
|
||||
xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
|
||||
('bootstrap',
|
||||
xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
|
||||
('horizon/lib/font-awesome',
|
||||
xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
|
||||
('horizon/lib/jasmine-1.3.1',
|
||||
xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_migrate).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter).base_dir),
|
||||
('horizon/lib/jsencrypt',
|
||||
xstatic.main.XStatic(xstatic.pkg.jsencrypt).base_dir),
|
||||
('horizon/lib/qunit',
|
||||
xstatic.main.XStatic(xstatic.pkg.qunit).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
|
||||
]
|
||||
|
||||
if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
|
||||
# The 1.10.x versions already contain the 'ui' directory.
|
||||
STATICFILES_DIRS.append(
|
||||
('horizon/lib/jquery-ui',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
|
||||
else:
|
||||
# Newer versions dropped the directory, add it to keep the path the same.
|
||||
STATICFILES_DIRS.append(
|
||||
('horizon/lib/jquery-ui/ui',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
|
||||
|
||||
LOGGING = {
|
||||
'version': 1,
|
||||
'disable_existing_loggers': False,
|
||||
|
||||
@ -22,27 +22,10 @@ import sys
|
||||
import warnings
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
import xstatic.main
|
||||
import xstatic.pkg.angular
|
||||
import xstatic.pkg.angular_bootstrap
|
||||
import xstatic.pkg.angular_smart_table
|
||||
import xstatic.pkg.bootstrap_datepicker
|
||||
import xstatic.pkg.bootstrap_scss
|
||||
import xstatic.pkg.d3
|
||||
import xstatic.pkg.font_awesome
|
||||
import xstatic.pkg.hogan
|
||||
import xstatic.pkg.jasmine
|
||||
import xstatic.pkg.jquery
|
||||
import xstatic.pkg.jquery_migrate
|
||||
import xstatic.pkg.jquery_quicksearch
|
||||
import xstatic.pkg.jquery_tablesorter
|
||||
import xstatic.pkg.jquery_ui
|
||||
import xstatic.pkg.jsencrypt
|
||||
import xstatic.pkg.qunit
|
||||
import xstatic.pkg.rickshaw
|
||||
import xstatic.pkg.spin
|
||||
|
||||
from openstack_dashboard import exceptions
|
||||
from openstack_dashboard.static_settings import STATICFILES_DIRS # noqa
|
||||
|
||||
|
||||
warnings.formatwarning = lambda message, category, *args, **kwargs: \
|
||||
'%s: %s' % (category.__name__, message)
|
||||
@ -150,55 +133,6 @@ STATICFILES_FINDERS = (
|
||||
'compressor.finders.CompressorFinder',
|
||||
)
|
||||
|
||||
STATICFILES_DIRS = [
|
||||
('horizon/lib/angular',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
|
||||
('horizon/lib/angular',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular_bootstrap).base_dir),
|
||||
('horizon/lib/smart-table',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular_smart_table).base_dir),
|
||||
('horizon/lib/bootstrap_datepicker',
|
||||
xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
|
||||
('bootstrap',
|
||||
xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
|
||||
('horizon/lib/font-awesome',
|
||||
xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
|
||||
('horizon/lib/jasmine-1.3.1',
|
||||
xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_migrate).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter).base_dir),
|
||||
('horizon/lib/jsencrypt',
|
||||
xstatic.main.XStatic(xstatic.pkg.jsencrypt).base_dir),
|
||||
('horizon/lib/qunit',
|
||||
xstatic.main.XStatic(xstatic.pkg.qunit).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
|
||||
]
|
||||
|
||||
|
||||
if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
|
||||
# The 1.10.x versions already contain the 'ui' directory.
|
||||
STATICFILES_DIRS.append(
|
||||
('horizon/lib/jquery-ui',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
|
||||
else:
|
||||
# Newer versions dropped the directory, add it to keep the path the same.
|
||||
STATICFILES_DIRS.append(
|
||||
('horizon/lib/jquery-ui/ui',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
|
||||
|
||||
COMPRESS_PRECOMPILERS = (
|
||||
('text/scss', 'django_pyscss.compressor.DjangoScssFilter'),
|
||||
)
|
||||
|
||||
90
openstack_dashboard/static_settings.py
Normal file
90
openstack_dashboard/static_settings.py
Normal file
@ -0,0 +1,90 @@
|
||||
# Copyright 2012 Nebula, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
"""
|
||||
This file contains configuration for the locations of all the static file
|
||||
libraries, such as JavaScript and CSS libraries. Packagers for individual
|
||||
distributions can edit or replace this file, in order to change the paths
|
||||
to match their distribution's standards.
|
||||
"""
|
||||
|
||||
import xstatic.main
|
||||
import xstatic.pkg.angular
|
||||
import xstatic.pkg.angular_bootstrap
|
||||
import xstatic.pkg.angular_smart_table
|
||||
import xstatic.pkg.bootstrap_datepicker
|
||||
import xstatic.pkg.bootstrap_scss
|
||||
import xstatic.pkg.d3
|
||||
import xstatic.pkg.font_awesome
|
||||
import xstatic.pkg.hogan
|
||||
import xstatic.pkg.jasmine
|
||||
import xstatic.pkg.jquery
|
||||
import xstatic.pkg.jquery_migrate
|
||||
import xstatic.pkg.jquery_quicksearch
|
||||
import xstatic.pkg.jquery_tablesorter
|
||||
import xstatic.pkg.jquery_ui
|
||||
import xstatic.pkg.jsencrypt
|
||||
import xstatic.pkg.qunit
|
||||
import xstatic.pkg.rickshaw
|
||||
import xstatic.pkg.spin
|
||||
|
||||
|
||||
STATICFILES_DIRS = [
|
||||
('horizon/lib/angular',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
|
||||
('horizon/lib/angular',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular_bootstrap).base_dir),
|
||||
('horizon/lib/smart-table',
|
||||
xstatic.main.XStatic(xstatic.pkg.angular_smart_table).base_dir),
|
||||
('horizon/lib/bootstrap_datepicker',
|
||||
xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
|
||||
('bootstrap',
|
||||
xstatic.main.XStatic(xstatic.pkg.bootstrap_scss).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.d3).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
|
||||
('horizon/lib/font-awesome',
|
||||
xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
|
||||
('horizon/lib/jasmine-1.3.1',
|
||||
xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_migrate).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch).base_dir),
|
||||
('horizon/lib/jquery',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter).base_dir),
|
||||
('horizon/lib/jsencrypt',
|
||||
xstatic.main.XStatic(xstatic.pkg.jsencrypt).base_dir),
|
||||
('horizon/lib/qunit',
|
||||
xstatic.main.XStatic(xstatic.pkg.qunit).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.rickshaw).base_dir),
|
||||
('horizon/lib',
|
||||
xstatic.main.XStatic(xstatic.pkg.spin).base_dir),
|
||||
]
|
||||
|
||||
|
||||
if xstatic.main.XStatic(xstatic.pkg.jquery_ui).version.startswith('1.10.'):
|
||||
# The 1.10.x versions already contain the 'ui' directory.
|
||||
STATICFILES_DIRS.append(
|
||||
('horizon/lib/jquery-ui',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
|
||||
else:
|
||||
# Newer versions dropped the directory, add it to keep the path the same.
|
||||
STATICFILES_DIRS.append(
|
||||
('horizon/lib/jquery-ui/ui',
|
||||
xstatic.main.XStatic(xstatic.pkg.jquery_ui).base_dir))
|
||||
Loading…
Reference in New Issue
Block a user