use asset function instead of referencing web folder

Guite · Apr 6, 2016 · a59d6b8 · a59d6b8
1 parent 9ba15c1
commit a59d6b8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/...ula/modulestudio/generator/cartridges/zclassic/controller/formtype/field/ColourType.xtend b/...ula/modulestudio/generator/cartridges/zclassic/controller/formtype/field/ColourType.xtend
@@ -52,7 +52,6 @@ class ColourType {
 
                 if ($firstTime) {
                     PageUtil::addVar('stylesheet', 'web/jquery-minicolors/jquery.minicolors.css');
-                    PageUtil::addVar('javascript', 'jquery');
                     PageUtil::addVar('javascript', 'web/jquery-minicolors/jquery.minicolors.min.js');
                 }
                 $firstTime = false;

diff --git a/...udio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.xtend b/...udio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Forms.xtend
@@ -102,7 +102,7 @@ class Forms {
                 {{ pageAddAsset('javascript', zasset('@«app.appName»:js/«app.appName».EditFunctions.js')) }}
                 {{ pageAddAsset('javascript', zasset('@«app.appName»:js/«app.appName».Validation.js')) }}
                 «IF (hasUserFieldsEntity || !getOutgoingJoinRelations.empty || !getIncomingJoinRelations.empty)»
-                    {{ pageAddAsset('javascript', 'web/typeahead.js/dist/typeahead.bundle.min.js') }}
+                    {{ pageAddAsset('javascript', asset('typeahead.js/dist/typeahead.bundle.min.js')) }}
                 «ENDIF»
             {% endblock %}
         «ENDIF»

diff --git a/...dio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Layout.xtend b/...dio.generator/src/org/zikula/modulestudio/generator/cartridges/zclassic/view/Layout.xtend
@@ -67,20 +67,19 @@ class Layout {
     def baseTemplate(Application it) '''
         {# 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 #}
             «IF hasUploads»
-                {{ pageAddAsset('javascript', 'web/bootstrap-media-lightbox/bootstrap-media-lightbox.min.js') }}
-                {{ pageAddAsset('stylesheet', 'web/bootstrap-media-lightbox/bootstrap-media-lightbox.css') }}
+                {{ pageAddAsset('javascript', asset('bootstrap-media-lightbox/bootstrap-media-lightbox.min.js')) }}
+                {{ pageAddAsset('stylesheet', asset('bootstrap-media-lightbox/bootstrap-media-lightbox.css')) }}
             «ENDIF»
             «IF hasViewActions || hasDisplayActions || hasEditActions»
-                {{ pageAddAsset('stylesheet', 'web/bootstrap-jqueryui/bootstrap-jqueryui.min.css') }}
-                {{ pageAddAsset('javascript', 'web/bootstrap-jqueryui/bootstrap-jqueryui.min.js') }}
+                {{ pageAddAsset('stylesheet', asset('bootstrap-jqueryui/bootstrap-jqueryui.min.css')) }}
+                {{ pageAddAsset('javascript', asset('bootstrap-jqueryui/bootstrap-jqueryui.min.js')) }}
             «ENDIF»
             {{ pageAddAsset('javascript', zasset('@«appName»:js/«appName».js')) }}
             {{ polyfill([«IF hasGeographical»'geolocation', «ENDIF»'forms', 'forms-ext']) }}

diff --git a/...src/org/zikula/modulestudio/generator/cartridges/zclassic/view/additions/BlocksView.xtend b/...src/org/zikula/modulestudio/generator/cartridges/zclassic/view/additions/BlocksView.xtend
@@ -176,10 +176,9 @@ class BlocksView {
         «IF targets('1.3.x')»
             {pageaddvar name='javascript' value='prototype'}
         «ELSE»
-            {{ pageAddAsset('stylesheet', 'web/bootstrap/css/bootstrap.min.css') }}
-            {{ pageAddAsset('stylesheet', 'web/bootstrap/css/bootstrap-theme.min.css') }}
-            {{ pageAddAsset('javascript', 'jquery') }}
-            {{ pageAddAsset('javascript', 'web/bootstrap/js/bootstrap.min.js') }}
+            {{ pageAddAsset('stylesheet', asset('bootstrap/css/bootstrap.min.css')) }}
+            {{ pageAddAsset('stylesheet', asset('bootstrap/css/bootstrap-theme.min.css')) }}
+            {{ pageAddAsset('javascript', asset('bootstrap/js/bootstrap.min.js')) }}
         «ENDIF»
         «IF targets('1.3.x')»
             <script type="text/javascript">

diff --git a/...ikula/modulestudio/generator/cartridges/zclassic/view/additions/ContentTypeListView.xtend b/...ikula/modulestudio/generator/cartridges/zclassic/view/additions/ContentTypeListView.xtend
@@ -297,7 +297,6 @@ class ContentTypeListView {
         «ELSE»
             {pageaddvar name='stylesheet' value='web/bootstrap/css/bootstrap.min.css'}
             {pageaddvar name='stylesheet' value='web/bootstrap/css/bootstrap-theme.min.css'}
-            {pageaddvar name='javascript' value='jquery'}
             {pageaddvar name='javascript' value='web/bootstrap/js/bootstrap.min.js'}
         «ENDIF»
         «IF targets('1.3.x')»

diff --git a/.../src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/ViewHierarchy.xtend b/.../src/org/zikula/modulestudio/generator/cartridges/zclassic/view/pages/ViewHierarchy.xtend
@@ -193,8 +193,8 @@ class ViewHierarchy {
             {{ pageAddAsset('javascript', zasset('@«appName»:js/«appName».Tree.js')) }}
 
             {% if hasNodes %}
-                {{ pageAddAsset('javascript', 'web/jstree/dist/jstree.min.js') }}
-                {{ pageAddAsset('stylesheet', 'web/jstree/dist/themes/default/style.min.css') }}
+                {{ pageAddAsset('javascript', asset('jstree/dist/jstree.min.js')) }}
+                {{ pageAddAsset('stylesheet', asset('jstree/dist/themes/default/style.min.css')) }}
                 <script type="text/javascript">
                 /* <![CDATA[ */
                     ( function($) {