[TASK] update includeCSS and includeJS TS conf

t3kit · Apr 13, 2017 · e99d657 · e99d657
1 parent c2a34b2
commit e99d657
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 38 deletions.
diff --git a/Configuration/TypoScript/Library/page.includeCSS.setupts b/Configuration/TypoScript/Library/page.includeCSS.setupts
@@ -1,64 +1,59 @@
 [globalVar = LIT:less = {$themes.configuration.feLayoutMode}]
     page {
         includeCSS {
-            bootstrap = {$themes.configuration.feLayoutPath}/bootstrap.less
+            bootstrap = {$themes.configuration.feLayoutPath}/less/bootstrap.less
             bootstrap {
                 # excludeFromConcatenation =
                 # disableCompression =
             }
-            rteFrontend = EXT:theme_t3kit/Resources/Public/Extensions/Rtehtmlarea/Css/rteFrontend.css
-            rteFrontend {
-                # excludeFromConcatenation =
-                # disableCompression =
-            }
-            components = {$themes.configuration.feLayoutPath}/components.css
+            # rteFrontend = EXT:theme_t3kit/Resources/Public/Extensions/Rtehtmlarea/Css/rteFrontend.css
+            # rteFrontend {
+            #     # excludeFromConcatenation =
+            #     # disableCompression =
+            # }
+            components = {$themes.configuration.feLayoutPath}/less/components.css
             components {
                 #excludeFromConcatenation =
                 #disableCompression =
             }
-            maincss = {$themes.configuration.feLayoutPath}/main.less
+            maincss = {$themes.configuration.feLayoutPath}/less/main.less
             maincss {
                 #excludeFromConcatenation =
                 #disableCompression =
             }
-            customLess = {$themes.configuration.customPath}/css/custom.less
+            customLess = {$themes.configuration.customPath}/custom.less
             customLess {
                 #excludeFromConcatenation =
                 #disableCompression =
             }
-            customCss = {$themes.configuration.customPath}/css/custom.css
-            customCss {
-                #excludeFromConcatenation =
-                #disableCompression =
-            }
         }
     }
 [global]
 
 [globalVar = LIT:css = {$themes.configuration.feLayoutMode}]
     page {
         includeCSS {
-            bootstrap = {$themes.configuration.feLayoutPath}/bootstrap.css
+            bootstrap = {$themes.configuration.feLayoutPath}/css/bootstrap.css
             bootstrap {
                 #excludeFromConcatenation =
                 #disableCompression =
             }
-            rteFrontend = EXT:theme_t3kit/Resources/Public/Extensions/Rtehtmlarea/Css/rteFrontend.css
-            rteFrontend {
-                # excludeFromConcatenation =
-                # disableCompression =
-            }
-            components = {$themes.configuration.feLayoutPath}/components.css
+            # rteFrontend = EXT:theme_t3kit/Resources/Public/Extensions/Rtehtmlarea/Css/rteFrontend.css
+            # rteFrontend {
+            #     # excludeFromConcatenation =
+            #     # disableCompression =
+            # }
+            components = {$themes.configuration.feLayoutPath}/css/components.css
             components {
                 #excludeFromConcatenation =
                 #disableCompression =
             }
-            maincss = {$themes.configuration.feLayoutPath}/main.css
+            maincss = {$themes.configuration.feLayoutPath}/css/main.css
             maincss {
                 #excludeFromConcatenation =
                 #disableCompression =
             }
-            customCss = {$themes.configuration.customPath}/css/custom.css
+            customCss = {$themes.configuration.customPath}/custom.css
             customCss {
                 #excludeFromConcatenation =
                 #disableCompression =
@@ -68,10 +63,10 @@
 [global]
 [globalVar = LIT:dev = {$themes.configuration.feLayoutMode}]
     page {
-        includeCSS {
-            rteFrontend = EXT:theme_t3kit/Resources/Public/Extensions/Rtehtmlarea/Css/rteFrontend.css
-            rteFrontend {
-            }
-        }
+        # includeCSS {
+        #     rteFrontend = EXT:theme_t3kit/Resources/Public/Extensions/Rtehtmlarea/Css/rteFrontend.css
+        #     rteFrontend {
+        #     }
+        # }
     }
 [global]
diff --git a/Configuration/TypoScript/Library/page.includeJS.setupts b/Configuration/TypoScript/Library/page.includeJS.setupts
@@ -1,27 +1,27 @@
 [globalVar = LIT:less = {$themes.configuration.feLayoutMode}]
     page {
         includeJSFooterlibs {
-            jquery = {$themes.configuration.feLayoutPath}/jquery.js
+            jquery = {$themes.configuration.feLayoutPath}/less/jquery.js
             jquery {
                 external = 0
                 # disableCompression =
                 # excludeFromConcatenation =
             }
-            bootstrap = {$themes.configuration.feLayoutPath}/bootstrap.js
+            bootstrap = {$themes.configuration.feLayoutPath}/less/bootstrap.js
             bootstrap {
                 external = 0
                 # disableCompression =
                 # excludeFromConcatenation =
             }
-            components = {$themes.configuration.feLayoutPath}/components.js
+            components = {$themes.configuration.feLayoutPath}/less/components.js
             components {
                 external = 0
                 # disableCompression =
                 # excludeFromConcatenation =
             }
         }
         includeJSFooter {
-            mainjs = {$themes.configuration.feLayoutPath}/main.js
+            mainjs = {$themes.configuration.feLayoutPath}/less/main.js
             mainjs {
                 external = 0
                 # disableCompression =
@@ -31,30 +31,30 @@
     }
 [global]
 
-[globalVar = LIT:less = {$themes.configuration.feLayoutMode}]
+[globalVar = LIT:css = {$themes.configuration.feLayoutMode}]
     page {
         includeJSFooterlibs {
-            jquery = {$themes.configuration.feLayoutPath}/jquery.js
+            jquery = {$themes.configuration.feLayoutPath}/css/jquery.js
             jquery {
                 external = 0
                 # disableCompression =
                 # excludeFromConcatenation =
             }
-            bootstrap = {$themes.configuration.feLayoutPath}/bootstrap.js
+            bootstrap = {$themes.configuration.feLayoutPath}/css/bootstrap.js
             bootstrap {
                 external = 0
                 # disableCompression =
                 # excludeFromConcatenation =
             }
-            components = {$themes.configuration.feLayoutPath}/components.js
+            components = {$themes.configuration.feLayoutPath}/css/components.js
             components {
                 external = 0
                 # disableCompression =
                 # excludeFromConcatenation =
             }
         }
         includeJSFooter {
-            mainjs = {$themes.configuration.feLayoutPath}/main.js
+            mainjs = {$themes.configuration.feLayoutPath}/css/main.js
             mainjs {
                 external = 0
                 # disableCompression =

diff --git a/Configuration/TypoScript/Library/plugin.themes.setupts b/Configuration/TypoScript/Library/plugin.themes.setupts
@@ -1,4 +1,3 @@
-
 plugin.tx_themes {
     view {
         templateRootPaths {