From 74ed3422179862fac5ce779d03aec4808507590a Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Sun, 22 Feb 2015 18:33:36 -0500 Subject: [PATCH] Move assets to media folder --- .../PatchTester/View/Pulls/tmpl/default.php | 2 +- .../components/com_patchtester/patchtester.xml | 10 +++++++--- build/patchtester/build.sh | 7 ++++--- .../com_patchtester/css}/octicons.css | 8 ++++---- .../com_patchtester/fonts}/octicons.eot | Bin .../com_patchtester/fonts}/octicons.svg | 0 .../com_patchtester/fonts}/octicons.ttf | Bin .../com_patchtester/fonts}/octicons.woff | Bin .../com_patchtester}/images/icon-16-patchtester.png | Bin .../com_patchtester}/images/icon-48-patchtester.png | Bin 10 files changed, 16 insertions(+), 11 deletions(-) rename {administrator/components/com_patchtester/assets/octicons => media/com_patchtester/css}/octicons.css (97%) rename {administrator/components/com_patchtester/assets/octicons => media/com_patchtester/fonts}/octicons.eot (100%) rename {administrator/components/com_patchtester/assets/octicons => media/com_patchtester/fonts}/octicons.svg (100%) rename {administrator/components/com_patchtester/assets/octicons => media/com_patchtester/fonts}/octicons.ttf (100%) rename {administrator/components/com_patchtester/assets/octicons => media/com_patchtester/fonts}/octicons.woff (100%) rename {administrator/components/com_patchtester/assets => media/com_patchtester}/images/icon-16-patchtester.png (100%) rename {administrator/components/com_patchtester/assets => media/com_patchtester}/images/icon-48-patchtester.png (100%) diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php index fa84550..49c7635 100644 --- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php +++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php @@ -12,7 +12,7 @@ \JHtml::_('behavior.modal'); \JHtml::_('formbehavior.chosen', 'select'); -\JFactory::getDocument()->addStyleSheet(\JUri::base() . '/components/com_patchtester/assets/octicons/octicons.css'); +\JHtml::_('stylesheet', 'com_patchtester/octicons.css', array(), true); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); diff --git a/administrator/components/com_patchtester/patchtester.xml b/administrator/components/com_patchtester/patchtester.xml index 96a1f22..1c1078c 100644 --- a/administrator/components/com_patchtester/patchtester.xml +++ b/administrator/components/com_patchtester/patchtester.xml @@ -1,5 +1,5 @@ - + com_patchtester Joomla! Project October 2011 @@ -31,11 +31,15 @@ install/sql/updates/sqlsrv + + css + fonts + images + - com_patchtester + com_patchtester PatchTester - assets backups install language diff --git a/build/patchtester/build.sh b/build/patchtester/build.sh index 9e44437..1fc4eb4 100755 --- a/build/patchtester/build.sh +++ b/build/patchtester/build.sh @@ -3,10 +3,11 @@ rm -rf ../packaging && mkdir ../packaging rm -rf ../packages && mkdir ../packages cp -r ../../administrator/components/com_patchtester ../packaging/admin cp -r ../../administrator/templates/hathor/html/com_patchtester ../packaging/hathor +cp -r ../../media/com_patchtester ../packaging/media rm -rf ../packaging/admin/backups/*.txt mv ../packaging/admin/patchtester.xml ../packaging/patchtester.xml mv ../packaging/admin/script.php ../packaging/script.php cd ../packaging -tar jcf ../packages/com_patchtester.tar.bz2 admin/ hathor/ patchtester.xml script.php -tar zcf ../packages/com_patchtester.tar.gz admin/ hathor/ patchtester.xml script.php -zip -r ../packages/com_patchtester.zip admin/ hathor/ patchtester.xml script.php +tar jcf ../packages/com_patchtester.tar.bz2 admin/ hathor/ media/ patchtester.xml script.php +tar zcf ../packages/com_patchtester.tar.gz admin/ hathor/ media/ patchtester.xml script.php +zip -r ../packages/com_patchtester.zip admin/ hathor/ media/ patchtester.xml script.php diff --git a/administrator/components/com_patchtester/assets/octicons/octicons.css b/media/com_patchtester/css/octicons.css similarity index 97% rename from administrator/components/com_patchtester/assets/octicons/octicons.css rename to media/com_patchtester/css/octicons.css index a5dcd15..65da35f 100644 --- a/administrator/components/com_patchtester/assets/octicons/octicons.css +++ b/media/com_patchtester/css/octicons.css @@ -1,9 +1,9 @@ @font-face { font-family: 'octicons'; - src: url('octicons.eot?#iefix') format('embedded-opentype'), - url('octicons.woff') format('woff'), - url('octicons.ttf') format('truetype'), - url('octicons.svg#octicons') format('svg'); + src: url('../fonts/octicons.eot?#iefix') format('embedded-opentype'), + url('../fonts/octicons.woff') format('woff'), + url('../fonts/octicons.ttf') format('truetype'), + url('../fonts/octicons.svg#octicons') format('svg'); font-weight: normal; font-style: normal; } diff --git a/administrator/components/com_patchtester/assets/octicons/octicons.eot b/media/com_patchtester/fonts/octicons.eot similarity index 100% rename from administrator/components/com_patchtester/assets/octicons/octicons.eot rename to media/com_patchtester/fonts/octicons.eot diff --git a/administrator/components/com_patchtester/assets/octicons/octicons.svg b/media/com_patchtester/fonts/octicons.svg similarity index 100% rename from administrator/components/com_patchtester/assets/octicons/octicons.svg rename to media/com_patchtester/fonts/octicons.svg diff --git a/administrator/components/com_patchtester/assets/octicons/octicons.ttf b/media/com_patchtester/fonts/octicons.ttf similarity index 100% rename from administrator/components/com_patchtester/assets/octicons/octicons.ttf rename to media/com_patchtester/fonts/octicons.ttf diff --git a/administrator/components/com_patchtester/assets/octicons/octicons.woff b/media/com_patchtester/fonts/octicons.woff similarity index 100% rename from administrator/components/com_patchtester/assets/octicons/octicons.woff rename to media/com_patchtester/fonts/octicons.woff diff --git a/administrator/components/com_patchtester/assets/images/icon-16-patchtester.png b/media/com_patchtester/images/icon-16-patchtester.png similarity index 100% rename from administrator/components/com_patchtester/assets/images/icon-16-patchtester.png rename to media/com_patchtester/images/icon-16-patchtester.png diff --git a/administrator/components/com_patchtester/assets/images/icon-48-patchtester.png b/media/com_patchtester/images/icon-48-patchtester.png similarity index 100% rename from administrator/components/com_patchtester/assets/images/icon-48-patchtester.png rename to media/com_patchtester/images/icon-48-patchtester.png