From 91258365885c21df2c74c86ea270e476337f67da Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 26 May 2017 15:42:10 +0900 Subject: [PATCH] Use module_name everywhere; module_folder is redundant hyphen cannot be used as python module name, so the default cookiecutter example does not work completely. Once module_name is fixed, module_name and module_folder are now always same and module_folder is now unnecessary. Thus this commit also drops module_folder. Change-Id: I28a5f7bd349d73627874e1466c72cc66e918f77b --- README.rst | 9 ++++----- cookiecutter.json | 5 ++--- {{cookiecutter.repo_name}}/.gitignore | 2 +- {{cookiecutter.repo_name}}/README.rst | 4 ++-- {{cookiecutter.repo_name}}/doc/source/conf.py | 6 +++--- {{cookiecutter.repo_name}}/doc/source/index.rst | 4 ++-- {{cookiecutter.repo_name}}/manage.py | 2 +- {{cookiecutter.repo_name}}/package.json | 6 +++--- {{cookiecutter.repo_name}}/tox.ini | 8 ++++---- .../__init__.py | 0 .../api/__init__.py | 0 .../api/client.py | 0 .../api/rest_api.py | 2 +- .../content/__init__.py | 0 .../content/{{cookiecutter.panel}}s/__init__.py | 0 .../content/{{cookiecutter.panel}}s/panel.py | 2 +- .../content/{{cookiecutter.panel}}s/tests.py | 0 .../content/{{cookiecutter.panel}}s/urls.py | 0 ...ashboard}}_{{cookiecutter.panel_group}}_panelgroup.py | 2 +- ...cutter.panel_group}}_{{cookiecutter.panel}}s_panel.py | 2 +- .../enabled/__init__.py | 0 .../karma.conf.js | 0 .../{{cookiecutter.api_module}}.service.js | 0 .../{{cookiecutter.panel_group}}.module.js | 0 .../{{cookiecutter.panel_group}}.module.spec.js | 0 .../{{cookiecutter.panel_group}}.scss | 0 .../{{cookiecutter.panel}}s/actions/actions.module.js | 0 .../{{cookiecutter.panel}}s/actions/create.service.js | 0 .../{{cookiecutter.panel}}s/actions/delete.service.js | 0 .../{{cookiecutter.panel}}s/actions/update.service.js | 0 .../{{cookiecutter.panel}}s/details/details.module.js | 0 .../{{cookiecutter.panel}}s/details/drawer.html | 0 .../details/overview.controller.js | 0 .../{{cookiecutter.panel}}s/details/overview.html | 0 .../{{cookiecutter.panel}}s/panel.html | 0 .../{{cookiecutter.panel}}s/workflow/info.help.html | 0 .../{{cookiecutter.panel}}s/workflow/recipe.help.html | 0 .../{{cookiecutter.panel}}s/workflow/workflow.service.js | 0 .../workflow/{{cookiecutter.panel}}-model.js | 0 .../{{cookiecutter.panel}}s.module.js | 0 .../{{cookiecutter.panel}}s.module.spec.js | 0 .../{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.scss | 0 .../{{cookiecutter.panel}}s.service.js | 0 .../{{cookiecutter.panel}}s.service.spec.js | 0 .../test/__init__.py | 0 .../test/integration_tests/__init__.py | 0 .../test/settings.py | 6 +++--- .../version.py | 0 48 files changed, 29 insertions(+), 31 deletions(-) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/api/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/api/client.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/api/rest_api.py (98%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/content/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/content/{{cookiecutter.panel}}s/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/content/{{cookiecutter.panel}}s/panel.py (93%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/content/{{cookiecutter.panel}}s/tests.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/content/{{cookiecutter.panel}}s/urls.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/enabled/_90_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_panelgroup.py (95%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/enabled/_91_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_{{cookiecutter.panel}}s_panel.py (89%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/enabled/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/karma.conf.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.api_module}}.service.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.spec.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.scss (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/actions.module.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/create.service.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/delete.service.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/update.service.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/details.module.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/drawer.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.controller.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/panel.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/info.help.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/recipe.help.html (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/workflow.service.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/{{cookiecutter.panel}}-model.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.spec.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.scss (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.spec.js (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/test/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/test/integration_tests/__init__.py (100%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/test/settings.py (88%) rename {{cookiecutter.repo_name}}/{{{cookiecutter.module_folder}} => {{cookiecutter.module_name}}}/version.py (100%) diff --git a/README.rst b/README.rst index d6c0c9f..e195cc6 100644 --- a/README.rst +++ b/README.rst @@ -29,13 +29,12 @@ Generate a Python package project:: This command prompts interactive input. Please check these parameters:: * "repo_group": The name for the git repo group. e.g. "openstack" -* "repo_name": The name for the git repo. e.g. "cafe-ui", +* "repo_name": The name for the git repo. e.g. "cafe-ui", This is used as python package name too. * "launchpad_project": The name of the project on launchpad. e.g. "cafe-ui", * "project_short_description": The short descriptions for your UI. e.g. "Cafe User Interface", * "help_name": The name for the help. e.g. "Cafe-UI", * "call_by_name": The name of this UI to write texts such as README or Help. e.g. "Cafe UI", -* "module_name": The name of the python module. e.g. "cafe-ui" -* "module_folder": The name for the module folder. e.g. "cafe_ui", +* "module_name": The name of the python module. e.g. "cafe_ui" * "dashboard": The slug of the "dashboard" you want to add this plugin into. e.g. "project", * "panel_group": The slug for the "panel_group". e.g. "cafe", * "panel_group_name": The caption for the "panel_group". e.g. "Cafe", @@ -52,8 +51,8 @@ Run with OpenStack Horizon:: cd pip install - cp //enabled/_90_project__panelgroup.py /openstack_dashboard/local/enabled - cp //enabled/_91_project__s.py /openstack_dashboard/local/enabled + cp //enabled/_90_project__panelgroup.py /openstack_dashboard/local/enabled + cp //enabled/_91_project__s.py /openstack_dashboard/local/enabled then reboot the Horizon. diff --git a/cookiecutter.json b/cookiecutter.json index de2b1aa..4ba8b3b 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -5,8 +5,7 @@ "project_short_description": "Cafe User Interface", "help_name": "Cafe-UI", "call_by_name": "Cafe UI", - "module_name": "cafe-ui", - "module_folder": "cafe_ui", + "module_name": "cafe_ui", "dashboard": "project", "panel_group": "cafe", "panel_group_name": "Cafe", @@ -14,4 +13,4 @@ "panel_func": "Drink", "api_module": "cafe", "api_name": "Cafe" -} \ No newline at end of file +} diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.repo_name}}/.gitignore index 96ec0de..603b904 100644 --- a/{{cookiecutter.repo_name}}/.gitignore +++ b/{{cookiecutter.repo_name}}/.gitignore @@ -6,7 +6,7 @@ doc/source/sourcecode node_modules npm-debug.log releasenotes/build -{{ cookiecutter.module_folder }}/test/.secret_key_store +{{ cookiecutter.module_name }}/test/.secret_key_store .coverage* .jshintrc .project diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst index 7176684..e5cd7a7 100644 --- a/{{cookiecutter.repo_name}}/README.rst +++ b/{{cookiecutter.repo_name}}/README.rst @@ -53,8 +53,8 @@ Install {{ cookiecutter.call_by_name }} with all dependencies in your virtual en And enable it in Horizon:: - ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_folder }}/enabled/_90_project_{{ cookiecutter.panel_group }}_panelgroup.py openstack_dashboard/local/enabled - ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_folder }}/enabled/_91_project_{{ cookiecutter.panel_group }}_{{ cookiecutter.panel }}s_panel.py openstack_dashboard/local/enabled + ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_name }}/enabled/_90_project_{{ cookiecutter.panel_group }}_panelgroup.py openstack_dashboard/local/enabled + ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_name }}/enabled/_91_project_{{ cookiecutter.panel_group }}_{{ cookiecutter.panel }}s_panel.py openstack_dashboard/local/enabled To run horizon with the newly enabled {{ cookiecutter.call_by_name }} plugin run:: diff --git a/{{cookiecutter.repo_name}}/doc/source/conf.py b/{{cookiecutter.repo_name}}/doc/source/conf.py index d90c42c..9223223 100644 --- a/{{cookiecutter.repo_name}}/doc/source/conf.py +++ b/{{cookiecutter.repo_name}}/doc/source/conf.py @@ -35,9 +35,9 @@ sys.path.insert(0, ROOT) # This is required for ReadTheDocs.org, but isn't a bad idea anyway. os.environ.setdefault('DJANGO_SETTINGS_MODULE', - '{{ cookiecutter.module_folder }}.test.settings') + '{{ cookiecutter.module_name }}.test.settings') -from {{ cookiecutter.module_folder }} \ +from {{ cookiecutter.module_name }} \ import version as ui_ver @@ -67,7 +67,7 @@ def write_autodoc_index(): return modlist RSTDIR = os.path.abspath(os.path.join(BASE_DIR, "sourcecode")) - SRCS = [('{{ cookiecutter.module_folder }}', ROOT), ] + SRCS = [('{{ cookiecutter.module_name }}', ROOT), ] EXCLUDED_MODULES = () CURRENT_SOURCES = {} diff --git a/{{cookiecutter.repo_name}}/doc/source/index.rst b/{{cookiecutter.repo_name}}/doc/source/index.rst index 773d1d7..5df2c89 100644 --- a/{{cookiecutter.repo_name}}/doc/source/index.rst +++ b/{{cookiecutter.repo_name}}/doc/source/index.rst @@ -53,8 +53,8 @@ Install {{ cookiecutter.call_by_name }} with all dependencies in your virtual en And enable it in Horizon:: - ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_folder }}/enabled/_90_project_{{ cookiecutter.panel_group }}_panelgroup.py openstack_dashboard/local/enabled - ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_folder }}/enabled/_91_project_{{ cookiecutter.panel_group }}_{{ cookiecutter.panel }}s_panel.py openstack_dashboard/local/enabled + ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_name }}/enabled/_90_project_{{ cookiecutter.panel_group }}_panelgroup.py openstack_dashboard/local/enabled + ln -s ../{{ cookiecutter.repo_name }}/{{ cookiecutter.module_name }}/enabled/_91_project_{{ cookiecutter.panel_group }}_{{ cookiecutter.panel }}s_panel.py openstack_dashboard/local/enabled To run horizon with the newly enabled {{ cookiecutter.call_by_name }} plugin run:: diff --git a/{{cookiecutter.repo_name}}/manage.py b/{{cookiecutter.repo_name}}/manage.py index 2c4d28a..e23fa80 100755 --- a/{{cookiecutter.repo_name}}/manage.py +++ b/{{cookiecutter.repo_name}}/manage.py @@ -19,5 +19,5 @@ from django.core.management import execute_from_command_line # noqa if __name__ == "__main__": os.environ.setdefault("DJANGO_SETTINGS_MODULE", - "{{ cookiecutter.module_folder }}.test.settings") + "{{ cookiecutter.module_name }}.test.settings") execute_from_command_line(sys.argv) diff --git a/{{cookiecutter.repo_name}}/package.json b/{{cookiecutter.repo_name}}/package.json index 8ff3c3a..d708358 100644 --- a/{{cookiecutter.repo_name}}/package.json +++ b/{{cookiecutter.repo_name}}/package.json @@ -25,8 +25,8 @@ "dependencies": {}, "scripts": { "postinstall": "if [ ! -d .tox ] || [ ! -d .tox/py27 ]; then tox -epy27 --notest; fi", - "lint": "eslint --no-color {{ cookiecutter.module_folder }}/static", - "lintq": "eslint --quiet {{ cookiecutter.module_folder }}/static", - "test": "karma start {{ cookiecutter.module_folder }}/karma.conf.js --single-run" + "lint": "eslint --no-color {{ cookiecutter.module_name }}/static", + "lintq": "eslint --quiet {{ cookiecutter.module_name }}/static", + "test": "karma start {{ cookiecutter.module_name }}/karma.conf.js --single-run" } } diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini index 209decf..d5859af 100644 --- a/{{cookiecutter.repo_name}}/tox.ini +++ b/{{cookiecutter.repo_name}}/tox.ini @@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir} install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = python manage.py test {posargs} --settings={{cookiecutter.module_folder}}.test.settings +commands = python manage.py test {posargs} --settings={{cookiecutter.module_name}}.test.settings [testenv:pep8] commands = flake8 {posargs} @@ -25,7 +25,7 @@ commands = {posargs} [testenv:cover] commands = coverage erase - coverage run {toxinidir}/manage.py test {{cookiecutter.module_folder}} --settings={{cookiecutter.module_folder}}.test.settings {posargs} --exclude-dir={{cookiecutter.module_folder}}/test/integration_tests {posargs} + coverage run {toxinidir}/manage.py test {{cookiecutter.module_name}} --settings={{cookiecutter.module_name}}.test.settings {posargs} --exclude-dir={{cookiecutter.module_name}}/test/integration_tests {posargs} coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml' coverage html --omit '.tox/cover/*' -d 'cover/htmlcov' @@ -33,7 +33,7 @@ commands = basepython = python2.7 commands = pip install django>=1.8,<1.9 - python manage.py test {posargs} --settings={{cookiecutter.module_folder}}.test.settings + python manage.py test {posargs} --settings={{cookiecutter.module_name}}.test.settings [testenv:eslint] whitelist_externals = npm @@ -56,7 +56,7 @@ commands = echo "nexecute `npm run test`" [testenv:docs] -setenv = DJANGO_SETTINGS_MODULE={{cookiecutter.module_folder}}.test.settings +setenv = DJANGO_SETTINGS_MODULE={{cookiecutter.module_name}}.test.settings commands = python setup.py build_sphinx [testenv:releasenotes] diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/api/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/api/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/api/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/api/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/api/client.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/api/client.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/api/client.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/api/client.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/api/rest_api.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/api/rest_api.py similarity index 98% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/api/rest_api.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/api/rest_api.py index 1a63201..ce424a1 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/api/rest_api.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/api/rest_api.py @@ -12,7 +12,7 @@ from django.views import generic -from {{cookiecutter.module_folder}}.api import client +from {{cookiecutter.module_name}}.api import client from openstack_dashboard.api.rest import urls from openstack_dashboard.api.rest import utils as rest_utils diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/panel.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/panel.py similarity index 93% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/panel.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/panel.py index f0835ac..3fe938c 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/panel.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/panel.py @@ -15,7 +15,7 @@ import horizon # This panel will be loaded from horizon, because specified in enabled file. # To register REST api, import below here. -from {{cookiecutter.module_folder}}.api import rest_api # noqa +from {{cookiecutter.module_name}}.api import rest_api # noqa class {{cookiecutter.panel_func}}s(horizon.Panel): diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/tests.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/tests.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/tests.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/tests.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/urls.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/content/{{cookiecutter.panel}}s/urls.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/content/{{cookiecutter.panel}}s/urls.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/_90_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_panelgroup.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/_90_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_panelgroup.py similarity index 95% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/_90_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_panelgroup.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/_90_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_panelgroup.py index 6656b29..cea35ca 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/_90_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_panelgroup.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/_90_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_panelgroup.py @@ -19,7 +19,7 @@ PANEL_GROUP_NAME = _('{{cookiecutter.panel_group_name}}') # The slug of the dashboard the PANEL_GROUP associated with. Required. PANEL_GROUP_DASHBOARD = '{{cookiecutter.dashboard}}' -ADD_INSTALLED_APPS = ['{{cookiecutter.module_folder}}'] +ADD_INSTALLED_APPS = ['{{cookiecutter.module_name}}'] ADD_ANGULAR_MODULES = [ 'horizon.dashboard.{{cookiecutter.panel_group}}' diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/_91_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_{{cookiecutter.panel}}s_panel.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/_91_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_{{cookiecutter.panel}}s_panel.py similarity index 89% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/_91_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_{{cookiecutter.panel}}s_panel.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/_91_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_{{cookiecutter.panel}}s_panel.py index 519d8f6..16833df 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/_91_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_{{cookiecutter.panel}}s_panel.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/_91_{{cookiecutter.dashboard}}_{{cookiecutter.panel_group}}_{{cookiecutter.panel}}s_panel.py @@ -18,4 +18,4 @@ PANEL_GROUP = '{{cookiecutter.panel_group}}' PANEL_DASHBOARD = '{{cookiecutter.dashboard}}' # Python panel class of the PANEL to be added. -ADD_PANEL = '{{cookiecutter.module_folder}}.content.{{cookiecutter.panel}}s.panel.{{cookiecutter.panel_func}}s' +ADD_PANEL = '{{cookiecutter.module_name}}.content.{{cookiecutter.panel}}s.panel.{{cookiecutter.panel_func}}s' diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/enabled/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/enabled/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/karma.conf.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/karma.conf.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/karma.conf.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/karma.conf.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.api_module}}.service.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.api_module}}.service.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.api_module}}.service.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.api_module}}.service.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.spec.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.spec.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.spec.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.module.spec.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.scss b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.scss similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.scss rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel_group}}.scss diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/actions.module.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/actions.module.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/actions.module.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/actions.module.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/create.service.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/create.service.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/create.service.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/create.service.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/delete.service.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/delete.service.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/delete.service.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/delete.service.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/update.service.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/update.service.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/update.service.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/actions/update.service.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/details.module.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/details.module.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/details.module.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/details.module.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/drawer.html b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/drawer.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/drawer.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/drawer.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.controller.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.controller.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.controller.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.controller.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.html b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/details/overview.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/panel.html b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/panel.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/panel.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/panel.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/info.help.html b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/info.help.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/info.help.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/info.help.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/recipe.help.html b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/recipe.help.html similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/recipe.help.html rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/recipe.help.html diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/workflow.service.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/workflow.service.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/workflow.service.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/workflow.service.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/{{cookiecutter.panel}}-model.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/{{cookiecutter.panel}}-model.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/{{cookiecutter.panel}}-model.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/workflow/{{cookiecutter.panel}}-model.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.spec.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.spec.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.spec.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.module.spec.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.scss b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.scss similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.scss rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.scss diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.spec.js b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.spec.js similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.spec.js rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/static/dashboard/{{cookiecutter.panel_group}}/{{cookiecutter.panel}}s/{{cookiecutter.panel}}s.service.spec.js diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/test/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/test/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/test/integration_tests/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/integration_tests/__init__.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/test/integration_tests/__init__.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/integration_tests/__init__.py diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/test/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/settings.py similarity index 88% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/test/settings.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/settings.py index aa34a59..4f64344 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/test/settings.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/test/settings.py @@ -19,14 +19,14 @@ from openstack_dashboard.test.settings import * # noqa HORIZON_CONFIG.pop('dashboards', None) HORIZON_CONFIG.pop('default_dashboard', None) -# Update the dashboards with {{cookiecutter.module_folder}} -import {{cookiecutter.module_folder}}.enabled +# Update the dashboards with {{cookiecutter.module_name}} +import {{cookiecutter.module_name}}.enabled import openstack_dashboard.enabled from openstack_dashboard.utils import settings settings.update_dashboards( [ - {{cookiecutter.module_folder}}.enabled, + {{cookiecutter.module_name}}.enabled, openstack_dashboard.enabled, ], HORIZON_CONFIG, diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/version.py b/{{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/version.py similarity index 100% rename from {{cookiecutter.repo_name}}/{{cookiecutter.module_folder}}/version.py rename to {{cookiecutter.repo_name}}/{{cookiecutter.module_name}}/version.py