zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow all static files to be loaded from dist

Browse Source
This commit is contained in:
Joe Fiorini
2015-02-27 11:21:32 -05:00
parent 7694ed2ea4
commit f2b4590545
7 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -15,7 +15,7 @@ awx/*.log
tower/tower_warnings.log tower/tower_warnings.log
celerybeat-schedule celerybeat-schedule
awx/ui/static/docs awx/ui/static/docs
awx/ui/static/dist awx/ui/dist
# Python & setuptools # Python & setuptools
__pycache__ __pycache__

11
MANIFEST.in
View File

@@ -2,10 +2,7 @@ recursive-include awx *.py
recursive-include awx/static *.ico recursive-include awx/static *.ico
recursive-include awx/templates *.html recursive-include awx/templates *.html
recursive-include awx/api/templates *.md recursive-include awx/api/templates *.md
recursive-include awx/ui *.html recursive-include awx/ui/dist *
recursive-include awx/ui/static *.css *.ico *.png *.gif *.jpg *.gz
recursive-include awx/ui/static *.eot *.svg *.ttf *.woff *.otf
recursive-include awx/ui/static/lib *
recursive-include awx/playbooks *.yml recursive-include awx/playbooks *.yml
recursive-include awx/lib/site-packages * recursive-include awx/lib/site-packages *
recursive-include config * recursive-include config *
@@ -14,12 +11,7 @@ recursive-include config/rpm *
recursive-exclude awx devonly.py* recursive-exclude awx devonly.py*
recursive-exclude awx/api/tests * recursive-exclude awx/api/tests *
recursive-exclude awx/main/tests * recursive-exclude awx/main/tests *
recursive-exclude awx/ui/static/lib/ansible *
recursive-exclude awx/settings local_settings.py* recursive-exclude awx/settings local_settings.py*
include awx/ui/static/dist/tower.concat.js
include awx/ui/static/dist/tower.concat.map
include awx/ui/static/dist/tower.concat.js.gz
include awx/ui/static/js/config.js
include tools/scripts/request_tower_configuration.sh include tools/scripts/request_tower_configuration.sh
include tools/scripts/ansible-tower include tools/scripts/ansible-tower
include tools/munin_monitors/* include tools/munin_monitors/*
@@ -27,4 +19,3 @@ include tools/sosreport/*
include COPYING include COPYING
prune awx/public prune awx/public
prune awx/projects prune awx/projects
prune awx/ui/static/lib/jstree/_*

10
Makefile
View File

@@ -91,7 +91,7 @@ clean-grunt:
# Remove UI build files # Remove UI build files
clean-ui: clean-ui:
rm -rf awx/ui/static/dist rm -rf awx/ui/dist
rm -rf awx/ui/static/docs rm -rf awx/ui/static/docs
# Remove temporary build files, compiled Python files. # Remove temporary build files, compiled Python files.
@@ -277,7 +277,7 @@ package.json: packaging/grunt/package.template
sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' $< > $@ sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' $< > $@
sync_ui: node_modules Brocfile.js sync_ui: node_modules Brocfile.js
$(NODE) tools/ui/timepiece.js awx/ui/static/dist $(NODE) tools/ui/timepiece.js awx/ui/dist
# Update local npm install # Update local npm install
node_modules: package.json node_modules: package.json
@@ -285,14 +285,14 @@ node_modules: package.json
touch $@ touch $@
devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js
$(BROCCOLI) build awx/ui/static/dist -- --debug $(BROCCOLI) build awx/ui/dist -- --debug
# Build minified JS/CSS. # Build minified JS/CSS.
minjs: node_modules clean-ui Brocfile.js minjs: node_modules clean-ui Brocfile.js
$(BROCCOLI) build awx/ui/static/dist -- --silent --no-debug --no-tests --compress $(BROCCOLI) build awx/ui/dist -- --silent --no-debug --no-tests --compress
minjs_ci: node_modules clean-ui Brocfile.js minjs_ci: node_modules clean-ui Brocfile.js
$(BROCCOLI) build awx/ui/static/dist -- --no-debug --compress $(BROCCOLI) build awx/ui/dist -- --no-debug --compress
# Check .js files for errors and lint # Check .js files for errors and lint
jshint: node_modules Gruntfile.js jshint: node_modules Gruntfile.js

1
awx/settings/defaults.py
View File

@@ -64,6 +64,7 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'ui', 'dist'),
os.path.join(BASE_DIR, 'static'), os.path.join(BASE_DIR, 'static'),
) )

9
awx/ui/static/js/system-status/index.js
View File

@@ -1,9 +0,0 @@
import conversionService from './conversions.service'
import smartStatusGraph from './smart-status.directive'
import controller from './smart-status.controller'
export default
angular.module('systemStatus', [])
.service('conversions', conversionService)
.directive('smartStatusGraph', smartStatusGraph)
.controller('smartStatusLoad', controller);

6
awx/ui/templates/ui/index.html
View File

@@ -16,14 +16,14 @@
<link rel="stylesheet" href="{{ STATIC_URL }}lib/codemirror/addon/lint/lint.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}lib/codemirror/addon/lint/lint.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}lib/novus-nvd3/nv.d3.css" type="text/css"> <link rel="stylesheet" href="{{ STATIC_URL }}lib/novus-nvd3/nv.d3.css" type="text/css">
<link rel="stylesheet" href="{{ STATIC_URL }}dist/tower.min.css" type="text/css"> <link rel="stylesheet" href="{{ STATIC_URL }}tower.min.css" type="text/css">
<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" /> <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" />
<script> <script>
var $basePath = "{{ STATIC_URL }}"; var $basePath = "{{ STATIC_URL }}";
</script> </script>
<script src="{{ STATIC_URL }}dist/tower.concat.js"></script> <script src="{{ STATIC_URL }}tower.concat.js"></script>
</head> </head>
<body> <body>
@@ -239,7 +239,7 @@
<div id="login-modal-dialog" style="display: none;"></div> <div id="login-modal-dialog" style="display: none;"></div>
<div id="help-modal-dialog" style="display: none;"></div> <div id="help-modal-dialog" style="display: none;"></div>
<div id="license-modal-dialog" style="display: none;"></div> <div id="license-modal-dialog" style="display: none;"></div>
<div id="about-modal-dialog" style="display: none;" ng-include=" 'static/partials/cowsay-about.html ' "></div> <div id="about-modal-dialog" style="display: none;" ng-include=" '{{ STATIC_URL }}partials/cowsay-about.html ' "></div>
<div id="custom-script-dialog" style="display:none;" > </div> <div id="custom-script-dialog" style="display:none;" > </div>
<div id='configure-tower-dialog' style="display:none" > <div id='configure-tower-dialog' style="display:none" >
<div id="configure-jobs" ></div> <div id="configure-jobs" ></div>

4
awx/ui/tests/karma.conf.js
View File

@@ -12,10 +12,10 @@ module.exports = function(config) {
frameworks: ['mocha', 'chai', 'sinon-chai', 'chai-as-promised'], frameworks: ['mocha', 'chai', 'sinon-chai', 'chai-as-promised'],
// list of files / patterns to load in the browser // list of files / patterns to load in the browser
files: [ files: [
'../static/dist/tower.concat.js', '../dist/tower.concat.js',
'../static/lib/angular-mocks/angular-mocks.js', '../static/lib/angular-mocks/angular-mocks.js',
'../static/lib/ember-cli-test-loader/test-loader.js', '../static/lib/ember-cli-test-loader/test-loader.js',
'../static/dist/tests/**/*.js', '../dist/tests/**/*.js',
'../tests/unit.js' '../tests/unit.js'
], ],