diff --git a/app/Resources/views/full/blog.html.twig b/app/Resources/views/full/blog.html.twig index ca39c430..f6f4afcb 100644 --- a/app/Resources/views/full/blog.html.twig +++ b/app/Resources/views/full/blog.html.twig @@ -9,70 +9,22 @@
- {% include 'parts/content_list.html.twig' with { - 'items': posts, - 'viewType': 'line', - 'extraParams': { - 'page': 1 - } - } %} - +
+ {% include 'parts/content_list.html.twig' with { + 'items': posts, + 'viewType': 'line', + 'extraParams': { + 'page': 1 + } + } %} +
-
+
{% if posts.totalCount > posts.searchHits|length %} - + {% endif %}
- - {% endblock %} diff --git a/app/config/routing.yml b/app/config/routing.yml index 8b97bb04..3d7ad481 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -38,12 +38,12 @@ _multiFileUpload: _ezplatform_blog_ajax: path: /ezplatform/blog/load/page/{page} defaults: { _controller: app.controller.blog:showBlogPostsAction } - methods: [POST] + methods: [GET] requirements: "page": "\d+" _ezplatform_bundles_list_ajax: path: /ezplatform/bundles/load/page/{page} defaults: { _controller: app.controller.bundle:getBundlesListAction } - methods: [POST] + methods: [GET] requirements: "page": "\d+" diff --git a/web/assets/css/blog.css b/web/assets/css/blog.css index e8d72ace..da1c50ee 100755 --- a/web/assets/css/blog.css +++ b/web/assets/css/blog.css @@ -109,52 +109,3 @@ color: #f15a22; text-decoration: none; } - -.blog-load-more { - margin-top: 40px; -} - -.blog-load-more button { - text-transform: uppercase; - font-family: 'Open Sans', sans-serif; - font-weight: 600; - border: 2px solid #b1b1b1; - border-radius: 23px; - font-size: 17px; - padding: 10px 0; - width: 100%; - white-space: normal; - color: #b1b1b1; - background: inherit; - outline: none; -} - -.blog-load-more button:hover { - background: #b1b1b1; - color: #fff; -} - -.blog-load-progress { - width: 48px; - height: 48px; - margin: auto; - background: url('/assets/images/loading.svg') no-repeat; - -webkit-transform-origin: 50% 50%; - transform-origin: 50% 50%; - -webkit-animation: loader_spin 1s linear infinite; - animation: loader_spin 1s linear infinite; -} - -@keyframes loader_spin { - 100% { - -webkit-transform: rotate(-360deg); - transform: rotate(-360deg); - } -} - -.blog-load-error { - text-align: center; - font-size: 17px; - color: #c34111; - font-weight: 600; -} diff --git a/web/assets/js/app.js b/web/assets/js/app.js index a1e592b0..2f10feda 100644 --- a/web/assets/js/app.js +++ b/web/assets/js/app.js @@ -27,7 +27,7 @@ $(document).ready(function(){ $parent.append('
').fadeIn(); $.ajax({ - type: 'POST', + type: 'GET', url: url + '/' + page, dataType: 'json', success: function(data) {