diff --git a/.gitignore b/.gitignore index 2d9093a..63b5dae 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,13 @@ /php.ini.sample /pkginfo /shell -/skin/adminhtml/default +/skin/adminhtml/default/default/images/* +!/skin/adminhtml/default/default/images/jeroenvermeulen +/skin/adminhtml/default/default/lib +/skin/adminhtml/default/default/media +/skin/adminhtml/default/default/xmlconnect +/skin/adminhtml/default/default/*.css +/skin/adminhtml/default/default/*.ico /skin/frontend /skin/install /var/cache diff --git a/CHANGELOG.md b/CHANGELOG.md index d3a9fe6..092501d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,4 +63,11 @@ ### v1.4.2-beta - * Fixed issue #15: Autocomplete error on Solr3 \ No newline at end of file + * Fixed issue #15: Autocomplete error on Solr3 + +### v1.5.0 + + * The first "stable" version + * Added "Test Connection" button to configuration + * Added logos to configuration - Thanks @toonvd + * Added Dutch translations \ No newline at end of file diff --git a/modman b/modman index 10ead85..8e09673 100644 --- a/modman +++ b/modman @@ -1,11 +1,31 @@ ## JeroenVermeulen_Solarium Extension - Solr search for Magento CE +# Extension Dir app/code/community/JeroenVermeulen/Solarium/ app/code/community/JeroenVermeulen/Solarium/ + +# Frontend layout app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml app/design/frontend/base/default/layout/jeroenvermeulen/solarium.xml + +# Backend layout app/design/adminhtml/default/default/layout/jeroenvermeulen/solarium.xml app/design/adminhtml/base/default/layout/jeroenvermeulen/solarium.xml + +# Magento global configuration module XML app/etc/modules/JeroenVermeulen_Solarium.xml app/etc/modules/JeroenVermeulen_Solarium.xml -js/solarium/autocomplete.js js/solarium/autocomplete.js + +# Translation +app/locale/nl_NL/JeroenVermeulen_Solarium.csv app/locale/nl_NL/JeroenVermeulen_Solarium.csv + +# JavaScript libraries +js/solarium/ js/solarium/ + +# The Solarium Library, by Bas de Nooijer lib/Solarium/ lib/Solarium/ + +# The EventDispatcher component from the Symfony framework lib/Symfony/Component/EventDispatcher/ lib/Symfony/Component/EventDispatcher/ -skin/adminhtml/base/default/css/jeroenvermeulen/solarium.css skin/adminhtml/base/default/css/jeroenvermeulen/solarium.css -skin/adminhtml/base/default/images/jeroenvermeulen/ skin/adminhtml/base/default/images/jeroenvermeulen/ \ No newline at end of file + +# Backend CSS File +skin/adminhtml/default/default/css/jeroenvermeulen/solarium.css skin/adminhtml/default/default/css/jeroenvermeulen/solarium.css + +# Backend Image Files +skin/adminhtml/default/default/images/jeroenvermeulen/solarium/ skin/adminhtml/default/default/images/jeroenvermeulen/solarium/ \ No newline at end of file diff --git a/skin/adminhtml/base/default/css/jeroenvermeulen/solarium.css b/skin/adminhtml/default/default/css/jeroenvermeulen/solarium.css similarity index 76% rename from skin/adminhtml/base/default/css/jeroenvermeulen/solarium.css rename to skin/adminhtml/default/default/css/jeroenvermeulen/solarium.css index 725dd4f..fc23a40 100644 --- a/skin/adminhtml/base/default/css/jeroenvermeulen/solarium.css +++ b/skin/adminhtml/default/default/css/jeroenvermeulen/solarium.css @@ -18,7 +18,9 @@ * @copyright Copyright (c) 2014 Jeroen Vermeulen (http://www.jeroenvermeulen.eu) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -ul.tabs a.solarium-tab span:after, -ul.tabs a.solarium-tab:hover span:after{ content:url('../../images/jeroenvermeulen/solarium_small.png'); } -h3.solarium-header{ margin-top:-15px; } -.solarium-header:after { content:url('../../images/jeroenvermeulen/solarium_large.png'); } \ No newline at end of file +ul.tabs a.solarium-tab span:after, ul.tabs a.solarium-tab:hover span:after { + content:url('../../images/jeroenvermeulen/solarium/logo_small.png'); } + +h3.solarium-header { margin-top:-15px; } + +.solarium-header:after { content:url('../../images/jeroenvermeulen/solarium/logo_large.png'); } \ No newline at end of file diff --git a/skin/adminhtml/base/default/images/jeroenvermeulen/solarium_large.png b/skin/adminhtml/default/default/images/jeroenvermeulen/solarium/logo_large.png similarity index 100% rename from skin/adminhtml/base/default/images/jeroenvermeulen/solarium_large.png rename to skin/adminhtml/default/default/images/jeroenvermeulen/solarium/logo_large.png diff --git a/skin/adminhtml/base/default/images/jeroenvermeulen/solarium_small.png b/skin/adminhtml/default/default/images/jeroenvermeulen/solarium/logo_small.png similarity index 100% rename from skin/adminhtml/base/default/images/jeroenvermeulen/solarium_small.png rename to skin/adminhtml/default/default/images/jeroenvermeulen/solarium/logo_small.png diff --git a/var/connect/JeroenVermeulen_Solarium-1.5.0.tgz b/var/connect/JeroenVermeulen_Solarium-1.5.0.tgz new file mode 100644 index 0000000..b31cefb Binary files /dev/null and b/var/connect/JeroenVermeulen_Solarium-1.5.0.tgz differ diff --git a/var/connect/JeroenVermeulen_Solarium.xml b/var/connect/JeroenVermeulen_Solarium.xml index c1ea714..12d4dcc 100644 --- a/var/connect/JeroenVermeulen_Solarium.xml +++ b/var/connect/JeroenVermeulen_Solarium.xml @@ -1,5 +1,5 @@ <_> - LB001WPAnE44yhSJ + F1ORDmSGZQ9dcoTC JeroenVermeulen_Solarium community @@ -22,14 +22,12 @@ Report bugs: https://github.com/jeroenvermeulen/magento-solarium/issues OSL-3.0 http://opensource.org/licenses/osl-3.0.php - 1.4.2 - beta - Beta version. -Do not use on a production shop right away. - - * Fixed issue #15: Autocomplete error on Solr3 - -You need to update the `schema.xml` on your Solr server to fix the issue. + 1.5.0 + stable + * The first "stable" version + * Added "Test Connection" button to configuration + * Added logos to configuration - Thanks @toonvd + * Added Dutch translations Jeroen Vermeulen BVBA @@ -58,7 +56,7 @@ You need to update the `schema.xml` on your Solr server to fix the issue. - + @@ -75,31 +73,43 @@ You need to update the `schema.xml` on your Solr server to fix the issue. - magelocal magecommunity + magedesign + magedesign mageetc + mageweb magelib magelib - magedesign - mageweb + mageskin + mageskin + magecommunity + magelocale - JeroenVermeulen/Solarium + frontend/base/default/layout/jeroenvermeulen/solarium.xml + adminhtml/default/default/layout/jeroenvermeulen/solarium.xml modules/JeroenVermeulen_Solarium.xml + js/solarium Solarium Symfony/Component/EventDispatcher - frontend/base/default/layout/jeroenvermeulen/solarium.xml - js/solarium + adminhtml/default/default/css/jeroenvermeulen/solarium.css + adminhtml/default/default/images/jeroenvermeulen/solarium + JeroenVermeulen/Solarium + nl_NL/JeroenVermeulen_Solarium.csv - file dir file + file + file + dir dir dir file dir + dir + file @@ -109,6 +119,10 @@ You need to update the `schema.xml` on your Solr server to fix the issue. + + + + @@ -118,6 +132,10 @@ You need to update the `schema.xml` on your Solr server to fix the issue. + + + +