WebAsset template.cassiopeia asset

joomla · Sep 29, 2018 · 6354dc8 · 6354dc8
1 parent ae01b9d
commit 6354dc8
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 19 deletions.
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -36,9 +36,6 @@
 $wa = Factory::getContainer()->get('webasset');
 $wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
 
-// Load custom CSS file
-HTMLHelper::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
-
 // Load specific language related CSS
 HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
 

diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
@@ -19,12 +19,18 @@
     "template.atum.ltr": {
       "name": "template.atum.ltr",
       "dependencies": ["template.atum.base"],
-      "css": ["template.min.css"]
+      "css": [
+        "template.min.css",
+        "user.css"
+      ]
     },
     "template.atum.rtl": {
       "name": "template.atum.rtl",
       "dependencies": ["template.atum.base"],
-      "css": ["template-rtl.min.css"]
+      "css": [
+        "template.min.css",
+        "user.css"
+      ]
     },
     "bootstrap.css": {
       "name": "bootstrap.css",

diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
@@ -29,20 +29,10 @@
 $menu     = $app->getMenu()->getActive();
 $pageclass = $menu->params->get('pageclass_sfx');
 
-// Add JavaScript Frameworks
-HTMLHelper::_('bootstrap.framework');
-
-// Add template js
-HTMLHelper::_('script', 'template.js', ['version' => 'auto', 'relative' => true]);
-
-// Load custom Javascript file
-HTMLHelper::_('script', 'user.js', ['version' => 'auto', 'relative' => true]);
-
-// Load template CSS file
-HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', ['version' => 'auto', 'relative' => true]);
-
-// Load custom CSS file
-HTMLHelper::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
+// Enable assets
+/** @var \Joomla\CMS\WebAsset\WebAssetRegistry $wa */
+$wa = Factory::getContainer()->get('webasset');
+$wa->enableAsset('template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
 
 // Load specific language related CSS
 HTMLHelper::_('stylesheet', 'language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));

diff --git a/templates/cassiopeia/joomla.asset.json b/templates/cassiopeia/joomla.asset.json
@@ -0,0 +1,37 @@
+{
+  "name": "cassiopeia",
+  "version": "4.0.0",
+  "description": "Cassiopeia is the Joomla 4 site template",
+  "license": "GPL-2.0+",
+  "assets": {
+    "template.cassiopeia.base": {
+      "name": "template.cassiopeia.base",
+      "dependencies": [
+        "core",
+        "jquery-noconflict",
+        "font-awesome",
+        "bootstrap.js.bundle"
+      ],
+      "js": [
+        "template.js",
+        "user.js"
+      ]
+    },
+    "template.cassiopeia.ltr": {
+      "name": "template.cassiopeia.ltr",
+      "dependencies": ["template.cassiopeia.base"],
+      "css": [
+        "template.min.css",
+        "user.css"
+      ]
+    },
+    "template.cassiopeia.rtl": {
+      "name": "template.cassiopeia.rtl",
+      "dependencies": ["template.cassiopeia.base"],
+      "css": [
+        "template-rtl.min.css",
+        "user.css"
+      ]
+    }
+  }
+}