diff --git a/app/assets/images/icn-close.png b/app/assets/images/icn-close.png new file mode 100644 index 0000000000..6ef99bffec Binary files /dev/null and b/app/assets/images/icn-close.png differ diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee index b1004b132d..894ed5576f 100644 --- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee @@ -84,9 +84,12 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord ).join(" #{t('products_or')} ") if $scope.activeProperties? $scope.clearAll = -> - $scope.query = "" + $scope.clearQuery() $scope.clearFilters() + $scope.clearQuery = -> + $scope.query = "" + $scope.clearFilters = -> $scope.taxonSelectors.clearAll() $scope.propertySelectors.clearAll() diff --git a/app/assets/stylesheets/darkswarm/shop_search.css.scss b/app/assets/stylesheets/darkswarm/shop_search.css.scss index fdf45329ad..0822e5ba3c 100644 --- a/app/assets/stylesheets/darkswarm/shop_search.css.scss +++ b/app/assets/stylesheets/darkswarm/shop_search.css.scss @@ -10,6 +10,19 @@ position: relative; z-index: 5; + .search-wrap { + position: relative; + width: 100%; + + .clear { + height: 1em; + width: 1em; + margin-top: 1em; + position: absolute; + right: 1em; + } + } + input#search { height: 3em; border-radius: $radius-small; diff --git a/app/views/shop/products/_searchbar.haml b/app/views/shop/products/_searchbar.haml index c74be2b14a..2ca6f32cb0 100644 --- a/app/views/shop/products/_searchbar.haml +++ b/app/views/shop/products/_searchbar.haml @@ -1,10 +1,13 @@ .shop-searchbar .row .small-12.large-5.columns.flex - %input#search.text{"ng-model" => "query", - placeholder: t(:products_search), - "ng-debounce" => "200", - "ofn-disable-enter" => true} + %div.search-wrap + %input#search.text{"ng-model" => "query", + placeholder: t(:products_search), + "ng-debounce" => "200", + "ofn-disable-enter" => true} + %a.clear{type: 'button', ng: {show: 'query', click: 'clearQuery()'}} + %img{ src: "/assets/icn-close.png" } .hide-for-large-up %button{type: 'button', ng: {click: 'toggleFilterSidebar()'}}