Skip to content
This repository has been archived by the owner on Aug 13, 2022. It is now read-only.

Commit

Permalink
use asset function instead of referencing web folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@Guite
Guite committed Apr 6, 2016
1 parent 7d84b70 commit 505538f
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion ...tesModule/Resources/config-folder/templates/ZikulaMultisitesModule/Project/edit.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ parent() }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.EditFunctions.js')) }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.Validation.js')) }}
{{ pageAddAsset('javascript', 'web/typeahead.js/dist/typeahead.bundle.min.js') }}
{{ pageAddAsset('javascript', asset('typeahead.js/dist/typeahead.bundle.min.js')) }}
{% endblock %}

{% block title mode == 'create' ? __('Create project') : __('Edit project') %}
Expand Down
2 changes: 1 addition & 1 deletion ...isitesModule/Resources/config-folder/templates/ZikulaMultisitesModule/Site/edit.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ parent() }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.EditFunctions.js')) }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.Validation.js')) }}
{{ pageAddAsset('javascript', 'web/typeahead.js/dist/typeahead.bundle.min.js') }}
{{ pageAddAsset('javascript', asset('typeahead.js/dist/typeahead.bundle.min.js')) }}
{% endblock %}

{% block title mode == 'create' ? __('Create site') : __('Edit site') %}
Expand Down
2 changes: 1 addition & 1 deletion ...esModule/Resources/config-folder/templates/ZikulaMultisitesModule/Template/edit.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ parent() }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.EditFunctions.js')) }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.Validation.js')) }}
{{ pageAddAsset('javascript', 'web/typeahead.js/dist/typeahead.bundle.min.js') }}
{{ pageAddAsset('javascript', asset('typeahead.js/dist/typeahead.bundle.min.js')) }}
{% endblock %}

{% block title mode == 'create' ? __('Create template') : __('Edit template') %}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Zikula/MultisitesModule/Resources/views/Project/edit.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ parent() }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.EditFunctions.js')) }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.Validation.js')) }}
{{ pageAddAsset('javascript', 'web/typeahead.js/dist/typeahead.bundle.min.js') }}
{{ pageAddAsset('javascript', asset('typeahead.js/dist/typeahead.bundle.min.js')) }}
{% endblock %}

{% block title mode == 'create' ? __('Create project') : __('Edit project') %}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Zikula/MultisitesModule/Resources/views/Site/edit.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ parent() }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.EditFunctions.js')) }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.Validation.js')) }}
{{ pageAddAsset('javascript', 'web/typeahead.js/dist/typeahead.bundle.min.js') }}
{{ pageAddAsset('javascript', asset('typeahead.js/dist/typeahead.bundle.min.js')) }}
{% endblock %}

{% block title mode == 'create' ? __('Create site') : __('Edit site') %}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Zikula/MultisitesModule/Resources/views/Template/edit.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ parent() }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.EditFunctions.js')) }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.Validation.js')) }}
{{ pageAddAsset('javascript', 'web/typeahead.js/dist/typeahead.bundle.min.js') }}
{{ pageAddAsset('javascript', asset('typeahead.js/dist/typeahead.bundle.min.js')) }}
{% endblock %}

{% block title mode == 'create' ? __('Create template') : __('Edit template') %}
Expand Down
17 changes: 8 additions & 9 deletions src/modules/Zikula/MultisitesModule/Resources/views/base.html.twig
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{# purpose of this template: general base layout #}
{% block header %}
{{ pageAddAsset('stylesheet', 'web/bootstrap/css/bootstrap.min.css') }}
{{ pageAddAsset('stylesheet', 'web/bootstrap/css/bootstrap-theme.min.css') }}
{{ pageAddAsset('javascript', 'jquery') }}
{{ pageAddAsset('stylesheet', asset('bootstrap/css/bootstrap.min.css')) }}
{{ pageAddAsset('stylesheet', asset('bootstrap/css/bootstrap-theme.min.css')) }}
{{ pageAddAsset('javascript', 'jquery-ui') }}
{{ pageAddAsset('stylesheet', 'web/jquery-ui/themes/base/jquery-ui.min.css') }}
{{ pageAddAsset('javascript', 'web/bootstrap/js/bootstrap.min.js') }}
{{ pageAddAsset('stylesheet', asset('jquery-ui/themes/base/jquery-ui.min.css')) }}
{{ pageAddAsset('javascript', asset('bootstrap/js/bootstrap.min.js')) }}
{{ pageAddAsset('javascript', 'zikula') }}{# still required for Gettext #}
{{ pageAddAsset('javascript', 'web/bootstrap-media-lightbox/bootstrap-media-lightbox.min.js') }}
{{ pageAddAsset('stylesheet', 'web/bootstrap-media-lightbox/bootstrap-media-lightbox.css') }}
{{ pageAddAsset('stylesheet', 'web/bootstrap-jqueryui/bootstrap-jqueryui.min.css') }}
{{ pageAddAsset('javascript', 'web/bootstrap-jqueryui/bootstrap-jqueryui.min.js') }}
{{ pageAddAsset('javascript', asset('bootstrap-media-lightbox/bootstrap-media-lightbox.min.js')) }}
{{ pageAddAsset('stylesheet', asset('bootstrap-media-lightbox/bootstrap-media-lightbox.css')) }}
{{ pageAddAsset('stylesheet', asset('bootstrap-jqueryui/bootstrap-jqueryui.min.css')) }}
{{ pageAddAsset('javascript', asset('bootstrap-jqueryui/bootstrap-jqueryui.min.js')) }}
{{ pageAddAsset('javascript', zasset('@ZikulaMultisitesModule:js/ZikulaMultisitesModule.js')) }}
{{ polyfill(['forms', 'forms-ext']) }}

Expand Down

0 comments on commit 505538f

Please sign in to comment.