Move assets to media folder

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'));

administrator/components/com_patchtester/patchtester.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension type="component" version="3.1" method="upgrade">
+<extension type="component" version="3.3" method="upgrade">
 	<name>com_patchtester</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2011</creationDate>
@@ -31,11 +31,15 @@
 			<schemapath type="sqlsrv">install/sql/updates/sqlsrv</schemapath>
 		</schemas>
 	</update>
+    <media destination="com_patchtester" folder="media">
+   		<folder>css</folder>
+        <folder>fonts</folder>
+   		<folder>images</folder>
+   	</media>
 	<administration>
-		<menu img="components/com_patchtester/assets/images/icon-16-patchtester.png">com_patchtester</menu>
+		<menu img="../media/com_patchtester/images/icon-16-patchtester.png">com_patchtester</menu>
 		<files folder="admin">
 			<folder>PatchTester</folder>
-			<folder>assets</folder>
 			<folder>backups</folder>
 			<folder>install</folder>
 			<folder>language</folder>

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 jcf ../packages/com_patchtester.tar.bz2 admin/ hathor/ media/ patchtester.xml script.php
-tar zcf ../packages/com_patchtester.tar.gz admin/ hathor/ 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/ patchtester.xml script.php
+zip -r ../packages/com_patchtester.zip admin/ hathor/ media/ patchtester.xml script.php

media/com_patchtester/css/octicons.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: 'octicons';
-  src: url('octicons.eot?#iefix') format('embedded-opentype'),
+  src: url('../fonts/octicons.eot?#iefix') format('embedded-opentype'),
-       url('octicons.woff') format('woff'),
+       url('../fonts/octicons.woff') format('woff'),
-       url('octicons.ttf') format('truetype'),
+       url('../fonts/octicons.ttf') format('truetype'),
-       url('octicons.svg#octicons') format('svg');
+       url('../fonts/octicons.svg#octicons') format('svg');
   font-weight: normal;
   font-style: normal;
 }