Merge branch 'hotfix/ie-issues'

Author: tuj

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## in develop
 
+## 1.2.2
+
+* Fixed issues with IE select.
+* Moved icons to root of public folder.
+
 ## 1.2.1
 
 * Updated bundles.

public/icons/arrow-down.svg public/arrow-down.svgpublic/icons/arrow-down.svg renamed to public/arrow-down.svg

@@ -20,8 +20,19 @@
   float: right;
 }
 
-.custom-filters button[type=submit] {
-  display: none;
+.custom-filters--submit-button,
+.custom-filters--submit-button:hover,
+.custom-filters--submit-button:focus {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.custom-filters .form-action {
+  display: flex;
+}
+
+.custom-filters > div:first-child {
+  flex-grow: 1;
 }
 
 .custom-filters {
@@ -32,7 +43,7 @@
   -webkit-appearance: none;
   -moz-appearance: none;
   -webkit-border-radius: 0;
-  background-image: url("icons/arrow-down.svg");
+  background-image: url("arrow-down.svg");
   background-position: 95% 50%;
   background-repeat: no-repeat;
   background-size: 16px;
@@ -47,6 +58,10 @@
   color: black;
 }
 
+.custom-filters select::-ms-expand {
+  display: none;
+}
+
 th.rotate {
   height: 200px;
   white-space: nowrap;

public/icons/smiley/BLUE.png public/smiley-BLUE.pngpublic/icons/smiley/BLUE.png renamed to public/smiley-BLUE.png

@@ -316,7 +316,10 @@ public function createFilterForm($filters, $requestFilters, $route)
             'submit',
             SubmitType::class,
             [
-                'label' => 'Apply',
+                'label' => 'Filter',
+                'attr' => [
+                    'class' => 'btn custom-filters--submit-button'
+                ]
             ]
         );
 
@@ -344,6 +347,7 @@ public function filterAction(Request $request)
         $params = $request->query->all();
 
         $params['filters'] = null;
+        $params['page'] = 1;
 
         return $this->redirectToRoute(
             'easyadmin',

public/icons/smiley/GREEN.png public/smiley-GREEN.pngpublic/icons/smiley/GREEN.png renamed to public/smiley-GREEN.png

@@ -2,7 +2,7 @@
 {% set width = (width is defined ? width : '50') %}
 
 {% if value != '' %}
-  <img class="smiley-icon" src="icons/smiley/{{ value }}.png" width="{{ width }}px" {% if title is defined %}title="{{ title }}"{% endif %}>
+  <img class="smiley-icon" src="smiley-{{ value }}.png" width="{{ width }}px" {% if title is defined %}title="{{ title }}"{% endif %}>
 {% else %}
   <div class="field-smiley--title-hover" {% if title is defined %}title="{{ title }}"{% endif %}>N/A</div>
 {% endif %}

public/icons/smiley/RED.png public/smiley-RED.pngpublic/icons/smiley/RED.png renamed to public/smiley-RED.png

@@ -46,20 +46,18 @@
 {# Change layout to include filters #}
 {% block content_header %}
   <div class="row">
-    <div class="col-sm-4">
+    <div class="col-sm-3">
       {% block content_title_wrapper %}
         <h1 class="title">
           {{ block('content_title') }}
         </h1>
       {% endblock %}
     </div>
 
-    <div class="col-sm-2">
+    <div class="col-sm-3">
       {% block content_header_filters %}
         {% if filters is defined and filters is not null %}
-          <div class="custom-filters">
-            {{ form(filters, {'attr': {'id': 'filters', 'class': 'form-action'}}) }}
-          </div>
+          {{ form(filters, {'attr': {'id': 'filters', 'class': 'form-action custom-filters'}}) }}
         {% endif %}
       {% endblock %}
     </div>
@@ -74,20 +72,6 @@
   </div>
 {% endblock content_header %}
 
-{# Add submit on click for filters #}
-{% block body_javascript %}
-  {{ parent() }}
-
-  <script type="text/javascript">
-      // without jQuery (doesn't work in older IEs)
-      document.addEventListener('DOMContentLoaded', function(){
-          document.getElementById("filter_group").addEventListener('input', function (evt) {
-              document.getElementById("filters").submit();
-          });
-      }, false);
-  </script>
-{% endblock %}
-
 {# Do not display SEARCH form if not granted #}
 {% block search_action %}
   {% if is_easyadmin_granted(_entity_config, 'search') %}