diff --git a/doc/css/_header.scss b/doc/css/_header.scss index 194cbe1b..61c6f710 100644 --- a/doc/css/_header.scss +++ b/doc/css/_header.scss @@ -8,25 +8,37 @@ header.site-header { transition: background 2s ease; nav.navbar { margin-bottom: 0; - background-color: #0B1724; + background-color: #000008; border-radius: 0; border: none; .navbar-collapse.in { - background-color: #0B1724 !important; + background-color: #000008 !important; animation: fadeInUp .2s ease-in-out; position: fixed; @include position(0,0,0,0); padding: 20%; font-size: 1.2em; li { - padding-bottom: 1em; } } + padding-bottom: 1em; + } + } .navbar-brand { font-size: 1em; color: white; - z-index: 1; } + z-index: 1; + &.auto-hide { + opacity: 0; + -webkit-transition: opacity 0.5s ease; + transition: opacity 0.5s ease; + &.visible { + opacity: 1; + } + } + } .navbar-header { position: relative; - z-index: 2; } + z-index: 2; + } .navbar-toggle { background-color: $brand-primary; border: solid 1px $brand-primary; @@ -34,14 +46,22 @@ header.site-header { &.collapsed { background-color: transparent; border: solid 1px rgba(white,.4); - color: white; } } + color: white; + } + } .navbar-nav { > li > a { - padding-bottom: 0; } + padding-bottom: 0; + } > .active > a { color: #1D96C7 !important; - background-color: transparent; } } } } + background-color: transparent; + } + } + } +} .main-content { - margin-top: $navbar-height; } + margin-top: $navbar-height; +} diff --git a/doc/css/_home.scss b/doc/css/_home.scss index 3f1f7051..a46a4ff7 100644 --- a/doc/css/_home.scss +++ b/doc/css/_home.scss @@ -1,9 +1,40 @@ + + + +/* GENERAL +// ------------------------- */ +h1 { + font-size: 3.2em; +} h2 { font-size: 1.8em; font-weight: normal; letter-spacing: 1px; - margin-bottom: 1em; } + margin-bottom: 1em; +} +.page-section { + padding-top: 80px; + padding-bottom: 70px; +} +.headline { + text-align: center; + font-size: 1.8em; + margin-top: 0; + + &:after { + display: block; + content: ' '; + height: 20px; + border-bottom: 4px solid $magento-orange; + margin: 0 auto 1em auto; + width: 50px; + } +} + + +/* JUMBOTRON +// ------------------------- */ .jumbotron { background-image: url(../img/header-bg.png); background-repeat: no-repeat; @@ -12,53 +43,109 @@ h2 { color: white; h1 { + font-size: 3.2em; text-align: center; - img { - height: 1em; + img.jumbotron-algolia_logo { + height: 1.2em; + position: relative; + top: -0.1em; + margin-right: 8px; + } + + img.jumbotron-magento_logo { + height: 1.8em; + position: relative; + top: -0.05em; + margin-left: 8px; } } p { - font-size: 24px; - line-height: 32px; + font-size: 1.5em; + line-height: 1.3; } .latest-version { text-align: center; - font-size: 18px; - margin: 30px 0 40px 0; + font-size: 1em; + margin: 30px 0 40px; } .buttons { text-align: center; margin-bottom: 40px; + text-transform: uppercase; .btn { border-width: 2px; font-size: 14px; margin: 0 10px; } + .btn-primary-full { + background: $magento-orange; + } } + .badges { + text-align: center; + img { + vertical-align: top; + } + } } -.headline { - text-align: center; - font-size: 30px; - &:after { - display: block; - content: ' '; - height: 10px; - border-bottom: 2px solid $magento-orange; - margin: 0 auto 1em auto; - width: 30px; + +/* THE WHY +// ------------------------- */ +.the-why p { + font-size: 1.2em; + font-family: $headings-font-family; + line-height: 1.5; +} + + + +/* INTEGRATE +// ------------------------- */ +.integrate { + padding-top: 0; + + p { + position: relative; + top: 50px; } } + + +/* DEMOS +// ------------------------- */ +.demos { + background: #F5F5F9; + .demo { + margin-bottom: 40px; + &:last-child { + margin-bottom: 0; + } + + .icon { + width: 46px; + } + h3 { + font-size: 1.2em; + font-weight: bold; + } + } +} + + + +/* FEATURES +// ------------------------- */ .features { - .row { + .feature { margin-bottom: 50px; h3 { @@ -79,6 +166,7 @@ h2 { border-radius: 50%; float: left; margin-right: 20px; + clear: both; } .bubble { @@ -119,29 +207,18 @@ h2 { } -.integrate { - margin-top: 100px; - margin-bottom: 100px; -} - -.demo { - margin-bottom: 100px; - - .icon { - width: 46px; - } - h3 { - font-size: 18px; - font-weight: bold; - } -} +/* SHOWCASES +// ------------------------- */ .showcases { + background: $dark-blue; text-align: center; + font-weight: 300; + color: #FFF; .showcase { - display: block; + display: inline-block; height: 323px; overflow: hidden; @@ -150,19 +227,25 @@ h2 { } &.fixme { - width: 100%; + color: #666; + width: 350px; height: 323px; - background: #efefef; + border: #666 4px dashed; line-height: 323px; font-size: 2em; } } + .showcase-link, .showcase-join { + display: inline-block; + font-size: 1.1em; + margin-top: 8px; + margin-bottom: 10px; + color: #FFF; + } + .showcase-link:hover { + color: $magento-orange; + text-decoration: none; + } } -.badges { - text-align: center; - img { - vertical-align: top; - } -} \ No newline at end of file diff --git a/doc/img/.DS_Store b/doc/img/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4406a679f0f28bb550aedf9a23f757432acee482 GIT binary patch literal 10244 zcmeHMO;Zy=5bc2+A_OX^h~;UI9E1|RP@Ym09z1*TXg=0J83>gC!Yv06Uby=c_$mGr z|AoFcvsgXJ_7Xg(Ma@vz-VF14`n~zu-iV0XJL~O;WFk_>hql?krKIrx{LGYvqUJfQ z172hxhtifU*x^j;RFM=&3M2)R0!e|S!2h5C&TN+Yab*DVk^Z67xXqKv%j=>&HC0R;{V_(A{7#J#r7jx($i!Fh@yg8W z#pVK47TzmW^camW!?-V_$hq-{K5f=i?OLhUK%6|AbDTV6S@BE};ntzb z5IZ_Gntrb7p=KnX%2%ORN=MMdb444Ta=#PN-;L+eRqU>i2VE%!b>N9TGy0>7y1xcu z)BA<7`|(t&JyrdzLYo8d{ft@A#yy`YcFOzY+={SkrP!*m$9$U0gE`WiJ&}hc#K0#i zDs^JSP0n8x=Lf)4??Gf5BW~7?F_Sp{5dx1%sU!uG0!e{;slZ}jmGS-m8~gYFd&xbK zN(v+ef #|89Q|_r<&Q8D03UJ;Ub%J}hiE3D!e!@vq}yYpCXzI?N{TQTKwD1^2DO tPJ%@Z%0Kuq06!C?{2!xH`IMgWe?L9T^LO+8D)X}_J1)nY%Kx4G{}&uwoHYOd literal 0 HcmV?d00001 diff --git a/doc/img/magento-logo.png b/doc/img/magento-logo.png index 9c0bde131fcaeb46ca4da9af1f72ae6f41be1201..afd1c9497a54feb4832b310644f84287de340eb6 100644 GIT binary patch literal 5542 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 literal 5241 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 site.version }} .buttons - %a.btn.btn-primary{href: 'https://www.algolia.com/schedule-demo?hi=magento'} - %i.fa.fa-headphones - Request a demo %a.btn.btn-primary{href: 'https://magento.algolia.com'} - %i.fa.fa-desktop Try it live - %a.btn.btn-primary{href: 'http://www.magentocommerce.com/magento-connect/algolia-search-extension.html'} - %i.fa.fa-download + %a.btn.btn-primary.btn-primary-full{href: 'http://www.magentocommerce.com/magento-connect/algolia-search-extension.html'} Install the extension now .badges @@ -35,41 +30,46 @@ layout: default %img{src: 'https://img.shields.io/badge/magento-1.8.1-blue.svg'} %img{src: 'https://img.shields.io/badge/magento-1.9.2-blue.svg'} - .container - .spacer50 - %h1.headline Build Unique Shopping Experiences - .row - .col-sm-8.col-sm-offset-2.text-center - %p With Algolia's as-you-type search customers think less about how to search and more about what they find. Serve relevant content from the first keystroke. - - .row.integrate - .col-sm-4.col-sm-offset-1 - %img.img-responsive.m-l-r-auto{src: '{{site.baseurl}}/img/ecommerce-search.png'} - .col-sm-6 - %p Integrate in minutes the Magento default search with Algolia's instant search and increase the conversion rates of your e-commerce site. - %p Algolia’s Search Magento Extension makes it easy to deliver a lightning fast search experience to your End-Users. - - - .row.demo - .col-sm-7 - %img.img-responsive.m-l-r-auto{src: '{{site.baseurl}}/auto-complete.gif'} - .col-sm-5 - %img.icon{src: '{{site.baseurl}}/img/autocomplete.png'} - %h3 Product & Category Autocomplete - %p Offer End-Users immediate access to your whole catalog from the dropdown menu, whatever your number of categories or attributes. - - .row.demo - .col-sm-5.text-right - %img.icon{src: '{{site.baseurl}}/img/faceted.png'} - %h3 Instant & Faceted search - %p Have your search results page, navigation and pagination updated in realtime, after each keystroke. - .col-sm-7 - %img.img-responsive.m-l-r-auto{src: '{{site.baseurl}}/instant-search.gif'} - - %h1.headline Features - .features + .page-section.the-why + .container + %h1.headline Build Unique Shopping Experiences + .row + .col-sm-8.col-sm-offset-2.text-center + %p With Algolia's as-you-type search customers think less about how to search and more about what they find. Serve relevant content from the first keystroke. + + .page-section.integrate + .container .row + .col-sm-4.col-sm-offset-1 + %img.img-responsive.m-l-r-auto{src: '{{site.baseurl}}/img/ecommerce-search.png'} + .col-sm-6 + %p Integrate in minutes the Magento default search with Algolia's instant search and increase the conversion rates of your e-commerce site. + %p Algolia’s Search Magento Extension makes it easy to deliver a lightning fast search experience to your End-Users. + + + .page-section.demos + .container + .row.demo + .col-sm-7 + %img.img-responsive.m-l-r-auto{src: '{{site.baseurl}}/auto-complete.gif'} .col-sm-5 + %img.icon{src: '{{site.baseurl}}/img/autocomplete.png'} + %h3 Product & Category Autocomplete + %p Offer End-Users immediate access to your whole catalog from the dropdown menu, whatever your number of categories or attributes. + + .row.demo + .col-sm-5.text-right + %img.icon{src: '{{site.baseurl}}/img/faceted.png'} + %h3 Instant & Faceted search + %p Have your search results page, navigation and pagination updated in realtime, after each keystroke. + .col-sm-7 + %img.img-responsive.m-l-r-auto{src: '{{site.baseurl}}/instant-search.gif'} + + .page-section.features + .container + %h1.headline Features + .row + .feature.col-sm-5.col-sm-offset-1 .bubble-outer .bubble .bubble-inner @@ -77,7 +77,7 @@ layout: default %img{src: '{{site.baseurl}}/img/icon-relevance.png'} %h3 Relevance %p Increase customer satisfaction by serving relevant results. If a user can't find a product, they won't buy it! - .col-sm-5.col-sm-offset-2 + .feature.col-sm-5 .bubble-outer .bubble .bubble-inner @@ -87,7 +87,7 @@ layout: default %p Deliver lightning fast results to your customers, anywhere in the world thanks to our distributed search network. .row - .col-sm-5 + .feature.col-sm-5.col-sm-offset-1 .bubble-outer .bubble .bubble-inner @@ -95,7 +95,7 @@ layout: default %img{src: '{{site.baseurl}}/img/icon-typo-tolerance.png'} %h3 Typo Tolerance %p Don't let spelling mistakes prevent your users from finding the products they are looking for. - .col-sm-5.col-sm-offset-2 + .feature.col-sm-5 .bubble-outer .bubble .bubble-inner @@ -105,7 +105,7 @@ layout: default %p Have your search results page, navigation and pagination updated in realtime, after each keystroke. .row - .col-sm-5 + .feature.col-sm-5.col-sm-offset-1 .bubble-outer .bubble .bubble-inner @@ -113,7 +113,7 @@ layout: default %img{src: '{{site.baseurl}}/img/icon-analytics.png'} %h3 Analytics %p From a simple dashboard, get valuable information on how your customers are searching and what they're searching for. - .col-sm-5.col-sm-offset-2 + .feature.col-sm-5 .bubble-outer .bubble .bubble-inner @@ -126,20 +126,26 @@ layout: default .col-sm-4.col-sm-offset-4.github %i.fa.fa-github %h3 Open source - %p Make it look like anything you want! Open-source, available on GitHub. + %p + Make it look like anything you want! + %br Open-source, available on Github. - .spacer100 - %h1.headline Showcase - .showcases + .page-section.showcases + .container + %h1.headline Showcase .row .col-sm-4 %a.showcase{href: 'http://www.whisky.fr'} %img.img-responsive{src: '{{site.baseurl}}/img/showcase-1.png'} - %p Whisky.fr + %br + %a.showcase-link{href: 'http://www.whisky.fr'} Whisky.fr .col-sm-4 %a.showcase{href: 'http://www.beyondretro.com/'} %img.img-responsive{src: 'img/beyond.png'} - %p Beyond Retro + %br + %a.showcase-link{href: 'http://www.beyondretro.com/'} Beyond Retro .col-sm-4 .showcase.fixme{href: '#'} You? - %p Join us! + %br + %p.showcase-join Join us! + diff --git a/doc/js/header.js b/doc/js/header.js new file mode 100644 index 00000000..581747be --- /dev/null +++ b/doc/js/header.js @@ -0,0 +1,15 @@ + + $(document).ready(function(){ + var scroll_start = 0; + var startchange = $('.navbar-brand.auto-hide'); + if (startchange.length) { + $(document).scroll(function() { + scroll_start = $(this).scrollTop(); + if(scroll_start > 300) { + startchange.addClass("visible"); + } else { + startchange.removeClass("visible"); + } + }); + } + }); \ No newline at end of file From c4bacff5b5aab76dbaab00a8f47faecb80de89f9 Mon Sep 17 00:00:00 2001 From: Joe Constant Date: Thu, 14 Jan 2016 23:02:30 -0700 Subject: [PATCH 03/17] Add config setting to control logging --- code/Helper/Logger.php | 4 +++- code/etc/config.xml | 1 + code/etc/system.xml | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/Helper/Logger.php b/code/Helper/Logger.php index f9224693..bcc39884 100644 --- a/code/Helper/Logger.php +++ b/code/Helper/Logger.php @@ -53,7 +53,9 @@ public function stop($action) public function log($message) { - Mage::log($message, null, 'algolia.log'); + if (Mage::getStoreConfigFlag('algoliasearch/credentials/debug')) { + Mage::log($message, null, 'algolia.log'); + } } protected function formatTime($begin, $end) diff --git a/code/etc/config.xml b/code/etc/config.xml index 596a51d8..3227e633 100755 --- a/code/etc/config.xml +++ b/code/etc/config.xml @@ -140,6 +140,7 @@ + 0 magento_ 1 1 diff --git a/code/etc/system.xml b/code/etc/system.xml index 7cfdbc67..309331eb 100755 --- a/code/etc/system.xml +++ b/code/etc/system.xml @@ -85,6 +85,21 @@ ]]> + + + select + adminhtml/system_config_source_yesno + 0 + 1 + 1 + 1 + 1 + + + + text From e8c59f9506283b65d402b4a6e4e6fdb52a35e4e4 Mon Sep 17 00:00:00 2001 From: Joe Constant Date: Fri, 15 Jan 2016 08:58:23 -0700 Subject: [PATCH 04/17] Change to use config helper --- code/Helper/Config.php | 2 +- code/Helper/Logger.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/Helper/Config.php b/code/Helper/Config.php index 66e28fd8..03b723cf 100644 --- a/code/Helper/Config.php +++ b/code/Helper/Config.php @@ -56,7 +56,7 @@ class Algolia_Algoliasearch_Helper_Config extends Mage_Core_Helper_Abstract const AUTOCOMPLETE_SELECTOR = 'algoliasearch/advanced/autocomplete_selector'; const SHOW_OUT_OF_STOCK = 'cataloginventory/options/show_out_of_stock'; - const LOGGING_ENABLED = 'dev/log/active'; + const LOGGING_ENABLED = 'algoliasearch/credentials/debug'; protected $_productTypeMap = array(); diff --git a/code/Helper/Logger.php b/code/Helper/Logger.php index bcc39884..510d8fd4 100644 --- a/code/Helper/Logger.php +++ b/code/Helper/Logger.php @@ -53,7 +53,7 @@ public function stop($action) public function log($message) { - if (Mage::getStoreConfigFlag('algoliasearch/credentials/debug')) { + if ($this->config->isLoggingEnabled()) { Mage::log($message, null, 'algolia.log'); } } @@ -62,4 +62,4 @@ protected function formatTime($begin, $end) { return ($end - $begin).'sec'; } -} \ No newline at end of file +} From 17a352e017cec8ff546c675c08376697707dcbb1 Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Tue, 19 Jan 2016 15:38:26 +0100 Subject: [PATCH 05/17] improve double search bar ui --- design/frontend/template/topsearch.phtml | 40 +++++++++++++--------- skin/algoliasearch.css | 43 ++++++++++++++++++------ 2 files changed, 57 insertions(+), 26 deletions(-) diff --git a/design/frontend/template/topsearch.phtml b/design/frontend/template/topsearch.phtml index 4a61a819..d7d0e82a 100644 --- a/design/frontend/template/topsearch.phtml +++ b/design/frontend/template/topsearch.phtml @@ -244,20 +244,25 @@ $placeholder = $this->__('Search for products, categories, ...'); {{#second_bar}}
{{/second_bar}} @@ -269,7 +274,12 @@ $placeholder = $this->__('Search for products, categories, ...');
-
+
+
+ __('SORT BY'); ?> +
+
+
diff --git a/skin/algoliasearch.css b/skin/algoliasearch.css index 82f72d52..bd7dbc6a 100755 --- a/skin/algoliasearch.css +++ b/skin/algoliasearch.css @@ -752,18 +752,16 @@ a.ais-current-refined-values--link:hover overflow: hidden; } -#instant-search-bar-container { - width: 100%; - position: relative; -} - #algolia_instant_selector #instant-search-bar { - width: 100%; + float: left; + width: calc(100% - 140px); height: 40px; font-family: "Raleway", "Helvetica Neue", Verdana, Arial, sans-serif; border: none; - border-bottom: solid 2px #54A5CD; - padding-left: 36px; + border: solid 2px #54A5CD; + border-left: none; + padding-left: 6px; + padding-top: 2px; } #algolia_instant_selector.with-facets #algolia-right-container { @@ -786,6 +784,10 @@ a.ais-current-refined-values--link:hover color: #555; } +#algolia_instant_selector .hits .sort-by-label { + margin-right: 8px; +} + #algolia_instant_selector .hits .no-results { margin: 40px 25px; color: #636363; @@ -965,6 +967,14 @@ a.ais-current-refined-values--link:hover #algolia_instant_selector #instant-search-bar-container { padding-top: 0px; margin-bottom: 15px; + width: 100%; + position: relative; +} + +#algolia_instant_selector #instant-search-bar-container:after { + clear: both; + content: ""; + display: block; } #algolia_instant_selector .as-search-box--input { @@ -982,12 +992,23 @@ a.ais-current-refined-values--link:hover display: none; } +#algolia_instant_selector .instant-search-bar-label { + background-color: #54A5CD; + height: 40px; + line-height: 24px; + padding: 8px 12px; + color: white; + float: left; + width: 140px; + text-align: right; +} + #algolia_instant_selector #instant-search-box svg.magnifying-glass { position: absolute; top: 8px; - left: 0px; - fill: #54A5CD; - stroke: #54A5CD; + left: 8px; + fill: #FFFFFF; + stroke: #FFFFFF; } #algolia_instant_selector .before_special { From 2822a3ad7d4797a4998654da118806394e9be7de Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Wed, 20 Jan 2016 10:35:43 +0100 Subject: [PATCH 06/17] cosmetic --- skin/algoliasearch.css | 1 - 1 file changed, 1 deletion(-) diff --git a/skin/algoliasearch.css b/skin/algoliasearch.css index bd7dbc6a..5e608340 100755 --- a/skin/algoliasearch.css +++ b/skin/algoliasearch.css @@ -757,7 +757,6 @@ a.ais-current-refined-values--link:hover width: calc(100% - 140px); height: 40px; font-family: "Raleway", "Helvetica Neue", Verdana, Arial, sans-serif; - border: none; border: solid 2px #54A5CD; border-left: none; padding-left: 6px; From fcfd62a1ded91ea2cc842a5726076b45b9490587 Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Wed, 20 Jan 2016 10:36:48 +0100 Subject: [PATCH 07/17] Fix massAction delete not working. Fixes #296 --- code/Model/Indexer/Algolia.php | 10 +++++++++- code/Model/Resource/Engine.php | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/Model/Indexer/Algolia.php b/code/Model/Indexer/Algolia.php index d61060a5..8d25f35b 100644 --- a/code/Model/Indexer/Algolia.php +++ b/code/Model/Indexer/Algolia.php @@ -196,7 +196,15 @@ protected function _registerCatalogProductEvent(Mage_Index_Model_Event $event) } $reindexData['catalogsearch_force_reindex'] = TRUE; - $reindexData['catalogsearch_product_ids'] = $actionObject->getProductIds(); + + if ($actionObject->getIsDeleted()) + { + $reindexData['catalogsearch_delete_product_id'] = $actionObject->getProductIds(); + } + else + { + $reindexData['catalogsearch_product_ids'] = $actionObject->getProductIds(); + } foreach ($reindexData as $k => $v) { diff --git a/code/Model/Resource/Engine.php b/code/Model/Resource/Engine.php index 1faa6a8c..44837483 100644 --- a/code/Model/Resource/Engine.php +++ b/code/Model/Resource/Engine.php @@ -37,11 +37,11 @@ public function removeProducts($storeId = null, $product_ids = null) { $ids = Algolia_Algoliasearch_Helper_Entity_Helper::getStores($storeId); + if (is_array($product_ids) == false) + $product_ids = array($product_ids); + foreach ($ids as $id) { - if (is_array($product_ids) == false) - $product_ids = array($product_ids); - $by_page = $this->config->getNumberOfElementByPage(); if (is_array($product_ids) && count($product_ids) > $by_page) From d7c01b74a1277eeabf0676d7a26fe39814ec113d Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Thu, 28 Jan 2016 12:05:51 +0100 Subject: [PATCH 08/17] Use Include in Navigation Menu to say if we index a category or not --- code/Helper/Entity/Categoryhelper.php | 3 +-- code/Helper/Entity/Producthelper.php | 1 + code/Model/Indexer/Algoliacategories.php | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/Helper/Entity/Categoryhelper.php b/code/Helper/Entity/Categoryhelper.php index a534b22d..41b2ab2c 100644 --- a/code/Helper/Entity/Categoryhelper.php +++ b/code/Helper/Entity/Categoryhelper.php @@ -57,8 +57,6 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null) { $storeRootCategoryPath = sprintf('%d/%d', $this->getRootCategoryId(), Mage::app()->getStore($storeId)->getRootCategoryId()); - $index_name = $this->getIndexName($storeId); - $categories = Mage::getResourceModel('catalog/category_collection'); /** @var $categories Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection */ $unserializedCategorysAttrs = $this->config->getCategoryAdditionalAttributes($storeId); @@ -74,6 +72,7 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null) ->addUrlRewriteToResult() ->addIsActiveFilter() ->setStoreId($storeId) + ->addAttributeToFilter('include_in_menu', '1') ->addAttributeToSelect(array_merge(array('name'), $additionalAttr)) ->addFieldToFilter('level', array('gt' => 1)); diff --git a/code/Helper/Entity/Producthelper.php b/code/Helper/Entity/Producthelper.php index 7544c835..7af13fc7 100644 --- a/code/Helper/Entity/Producthelper.php +++ b/code/Helper/Entity/Producthelper.php @@ -508,6 +508,7 @@ public function getObject(Mage_Catalog_Model_Product $product) $categoryCollection = Mage::getResourceModel('catalog/category_collection') ->addAttributeToSelect('name') ->addAttributeToFilter('entity_id', $_categoryIds) + ->addAttributeToFilter('include_in_menu', '1') ->addFieldToFilter('level', array('gt' => 1)) ->addIsActiveFilter(); diff --git a/code/Model/Indexer/Algoliacategories.php b/code/Model/Indexer/Algoliacategories.php index 44de5818..1dc86667 100644 --- a/code/Model/Indexer/Algoliacategories.php +++ b/code/Model/Indexer/Algoliacategories.php @@ -70,7 +70,7 @@ protected function _registerCatalogCategoryEvent(Mage_Index_Model_Event $event) $category = $event->getDataObject(); $productIds = $category->getAffectedProductIds(); - if (! $category->getData('is_active')) + if (! $category->getData('is_active') || ! $category->getData('include_in_menu')) { $event->addNewData('catalogsearch_delete_category_id', array_merge(array($category->getId()), $category->getAllChildren(TRUE))); @@ -78,7 +78,6 @@ protected function _registerCatalogCategoryEvent(Mage_Index_Model_Event $event) { $event->addNewData('catalogsearch_update_product_id', $productIds); } - } elseif ($productIds) { From 4df8046bf1ec25a771813ba08d68f09143a98b9b Mon Sep 17 00:00:00 2001 From: Sam Marcus Date: Sat, 30 Jan 2016 18:57:42 -0500 Subject: [PATCH 09/17] changed wording in system.xml --- code/etc/system.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/etc/system.xml b/code/etc/system.xml index 7cfdbc67..a87ca9ab 100755 --- a/code/etc/system.xml +++ b/code/etc/system.xml @@ -617,7 +617,7 @@ 1 1 1 - Choose if an query to Algolia is done by the backend for seo when instant search is enable + Choose if a query to Algolia is done by the backend for SEO when instant search is enabled From 62ffd6c8c79f54507b8172b6141122eef03e5a08 Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Mon, 8 Feb 2016 11:59:27 +0100 Subject: [PATCH 10/17] fix sorting on instantsearch --- code/Helper/Entity/Producthelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/Helper/Entity/Producthelper.php b/code/Helper/Entity/Producthelper.php index 7af13fc7..93284bbc 100644 --- a/code/Helper/Entity/Producthelper.php +++ b/code/Helper/Entity/Producthelper.php @@ -234,7 +234,7 @@ public function setSettings($storeId) $suffix_index_name = 'group_' . $group_id; - $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$suffix_index_name : $values['attribute']; + $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$currencies[0].'.'.$suffix_index_name : $values['attribute']; $mergeSettings['ranking'] = array($values['sort'].'('.$sort_attribute.')', 'typo', 'geo', 'words', 'proximity', 'attribute', 'exact', 'custom'); @@ -244,7 +244,7 @@ public function setSettings($storeId) } else { - $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.'default' : $values['attribute']; + $sort_attribute = strpos($values['attribute'], 'price') !== false ? $values['attribute'].'.'.$currencies[0].'.'.'default' : $values['attribute']; $mergeSettings['ranking'] = array($values['sort'].'('.$sort_attribute.')', 'typo', 'geo', 'words', 'proximity', 'attribute', 'exact', 'custom'); From 92ee37ee4ca003684e76cfe3342b5728b301c2a7 Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Mon, 8 Feb 2016 17:50:41 +0100 Subject: [PATCH 11/17] improve dockerfile --- dev/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/Dockerfile b/dev/Dockerfile index de32ed69..7146e9d9 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -5,7 +5,7 @@ RUN echo 'mysql-server mysql-server/root_password password P4ssw0rd' | debconf-s RUN echo 'mysql-server mysql-server/root_password_again password P4ssw0rd' | debconf-set-selections # packages/dependencies installation -RUN apt-get update && apt-get install -y \ +RUN systemctl mask mysql && apt-get update && apt-get install -y \ mysql-client-5.5 \ mysql-server \ php5-mysql \ @@ -14,7 +14,8 @@ RUN apt-get update && apt-get install -y \ vim emacs-nox \ git-core \ wget \ - zsh + zsh && systemctl unmask mysql + RUN docker-php-ext-install soap RUN docker-php-ext-install mysqli From c71c15cd88f6dcc99cd14297f9c53135c0642984 Mon Sep 17 00:00:00 2001 From: Thai Phan Date: Tue, 9 Feb 2016 09:51:35 +1100 Subject: [PATCH 12/17] Fix typos in topsearch.phtml This change fixes some derp spelling. --- design/frontend/template/topsearch.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/frontend/template/topsearch.phtml b/design/frontend/template/topsearch.phtml index d7d0e82a..69194963 100644 --- a/design/frontend/template/topsearch.phtml +++ b/design/frontend/template/topsearch.phtml @@ -571,7 +571,7 @@ $placeholder = $this->__('Search for products, categories, ...'); content += '
'; if (algoliaConfig.showSuggestionsOnNoResultsPage && this.suggestions.length > 0) { - content += '
__('You can can try one of he popular seearch queries'); ?>
' + this.suggestions.join(', '); + content += '
__('You can can try one of the popular search queries'); ?>
' + this.suggestions.join(', '); } content += '
'; From 73d85643cf54d60b592f12d481854f9f8cc0fe3e Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Tue, 9 Feb 2016 14:05:14 +0100 Subject: [PATCH 13/17] Fixed wrong price for configurable product --- code/Helper/Entity/Producthelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/Helper/Entity/Producthelper.php b/code/Helper/Entity/Producthelper.php index 93284bbc..fc0ec213 100644 --- a/code/Helper/Entity/Producthelper.php +++ b/code/Helper/Entity/Producthelper.php @@ -371,7 +371,7 @@ protected function handlePrice(&$product, $sub_products, &$customData) } } - if ($type == 'configurable' || $type == 'grouped' || $type == 'bundle') + if ($type == 'grouped' || $type == 'bundle') { $min = PHP_INT_MAX; $max = 0; @@ -383,7 +383,7 @@ protected function handlePrice(&$product, $sub_products, &$customData) list($min, $max) = $_priceModel->getTotalPrices($product, null, $with_tax, true); } - if ($type == 'grouped' || $type == 'configurable') + if ($type == 'grouped') { if (count($sub_products) > 0) { From 66a3aef3901469dac772f5fc738832b298a3a20d Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Wed, 10 Feb 2016 10:50:02 +0100 Subject: [PATCH 14/17] Disable instant search by default --- code/etc/config.xml | 2 +- code/etc/system.xml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/etc/config.xml b/code/etc/config.xml index 3227e633..17075581 100755 --- a/code/etc/config.xml +++ b/code/etc/config.xml @@ -143,7 +143,7 @@ 0 magento_ 1 - 1 + 0 9 diff --git a/code/etc/system.xml b/code/etc/system.xml index 967f8d29..db894a91 100755 --- a/code/etc/system.xml +++ b/code/etc/system.xml @@ -161,6 +161,9 @@ top.search and content block. +

+ ⚠ Enabling instant search can potentially break your design, some work will be required to have a good integration into your theme + products. ]]> @@ -564,7 +567,7 @@
- ⚠ Eacb time the cron runs it will process ("Max number of element per indexing job" * "Number of jobs to run each time the cron is run") + ⚠ Each time the cron runs it will process ("Max number of element per indexing job" * "Number of jobs to run each time the cron is run") products. ]]> From 7b4fd634ac23c7e0cdba7de753e47a5123a37ee4 Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Wed, 10 Feb 2016 11:32:04 +0100 Subject: [PATCH 15/17] small cosmetic improvements --- design/frontend/template/topsearch.phtml | 4 ++++ skin/algoliasearch.css | 1 + 2 files changed, 5 insertions(+) diff --git a/design/frontend/template/topsearch.phtml b/design/frontend/template/topsearch.phtml index d7d0e82a..43bd12c3 100644 --- a/design/frontend/template/topsearch.phtml +++ b/design/frontend/template/topsearch.phtml @@ -788,6 +788,10 @@ $placeholder = $this->__('Search for products, categories, ...'); .on('autocomplete:updated', function (e) { fixAutocompleteCssHeight(menu); }); + + $(window).resize(function () { + fixAutocompleteCssSticky(menu); + }); }); } }); diff --git a/skin/algoliasearch.css b/skin/algoliasearch.css index 5e608340..ca210b7a 100755 --- a/skin/algoliasearch.css +++ b/skin/algoliasearch.css @@ -367,6 +367,7 @@ a.ais-current-refined-values--link:hover @media (min-width: 992px) { #algolia-autocomplete-container .aa-dropdown-menu { width: 71.1%; + min-width: 800px; } } From 4693cef9d2db75f3f2dfbbbe10a9972019bc6827 Mon Sep 17 00:00:00 2001 From: Maxime Locqueville Date: Wed, 10 Feb 2016 11:41:00 +0100 Subject: [PATCH 16/17] bump to 1.5.3 --- Algolia_Algoliasearch.xml | 2 +- CHANGELOG.md | 10 ++++++++++ README.md | 2 +- code/Helper/Data.php | 2 +- code/etc/config.xml | 2 +- code/etc/system.xml | 2 +- doc/_config.yml | 2 +- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Algolia_Algoliasearch.xml b/Algolia_Algoliasearch.xml index e2171af1..25d013c3 100755 --- a/Algolia_Algoliasearch.xml +++ b/Algolia_Algoliasearch.xml @@ -4,7 +4,7 @@ true community - 1.5.2 + 1.5.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index c64f13a3..42256632 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ ## Change Log +### 1.5.3 + +- UPDATED: added a config to disable logging +- UPDATED: better instant search UI +- FIX: various design improvements +- FIX: take into account "Include in Navigation" for categories +- FIX: sorting in instant search page +- FIX: wrong price for configurable products +- FIX: mass action delete + ### 1.5.2 ==== BREAKING CHANGES ==== diff --git a/README.md b/README.md index 506b685d..42da90fe 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This extension replaces the default search of Magento with a typo-tolerant, fast See features and benefits of [Algolia Search Extension for Magento](https://community.algolia.com/magento). -![Latest version](https://img.shields.io/badge/latest-1.5.2-green.svg) +![Latest version](https://img.shields.io/badge/latest-1.5.3-green.svg) ![Magento 1.6.2](https://img.shields.io/badge/magento-1.6.2-blue.svg) ![Magento 1.7.1](https://img.shields.io/badge/magento-1.7.1-blue.svg) ![Magento 1.8.1](https://img.shields.io/badge/magento-1.8.1-blue.svg) diff --git a/code/Helper/Data.php b/code/Helper/Data.php index 0fd9f795..4ac4dace 100755 --- a/code/Helper/Data.php +++ b/code/Helper/Data.php @@ -25,7 +25,7 @@ class Algolia_Algoliasearch_Helper_Data extends Mage_Core_Helper_Abstract public function __construct() { - \AlgoliaSearch\Version::$custom_value = " Magento (1.5.2)"; + \AlgoliaSearch\Version::$custom_value = " Magento (1.5.3)"; $this->algolia_helper = Mage::helper('algoliasearch/algoliahelper'); diff --git a/code/etc/config.xml b/code/etc/config.xml index 17075581..e41fd035 100755 --- a/code/etc/config.xml +++ b/code/etc/config.xml @@ -2,7 +2,7 @@ - 1.5.2 + 1.5.3 diff --git a/code/etc/system.xml b/code/etc/system.xml index db894a91..20449aa2 100755 --- a/code/etc/system.xml +++ b/code/etc/system.xml @@ -4,7 +4,7 @@