diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 10c1a00..3221775 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -16,7 +16,7 @@ - + {% endblock %} {{ get_var('CssBlock')|raw }} @@ -101,7 +101,7 @@ -
+
diff --git a/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php b/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php index 2eafd66..d6b07fa 100644 --- a/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php +++ b/src/Deblan/Bundle/BlogBundle/Controller/DefaultController.php @@ -11,6 +11,9 @@ use Deblan\Bundle\BlogBundle\Model\Post; use Deblan\Bundle\BlogBundle\Model\PostFollower; use Deblan\Bundle\BlogBundle\Model\PostFollowerPeer; use Deblan\Component\Flash; +use Elastica\Query\QueryString; +use Elastica\Filter\Bool; +use Elastica\Query\Match; class DefaultController extends PageController { @@ -49,13 +52,33 @@ class DefaultController extends PageController /** * @param $query */ - public function searchEngineAction($query) + public function searchEngineAction($page) { + $query = $this->getRequest()->query->get('query'); + // $finder = $this->get('fos_elastica.finder.deblan.post'); + + // $boolQuery = new Bool(); + + // $fieldQuery = new QueryString(); + // $fieldQuery->setParam('query', $query); + + // $fieldActive = new Match(); + // $fieldActive->setField('active', '1'); + + // $boolQuery->addShould($fieldQuery); + // $boolQuery->addMust($fieldActive); + + // $pager = $finder->findPaginated($fieldQuery); + // $pager->setMaxPerPage(5); + // $pager->setCurrentPage($page); + if (empty($query)) { $query = $this->getRequest()->query->get('query'); } - $this->getPage()->setObject($query); + $this->getPage() + ->setObject(explode(' ', $query)); + $this->initPager(); if ($this->getRequest()->query->get('format') === 'rss') { diff --git a/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css b/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css index 8f324d8..39dbf20 100644 --- a/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css +++ b/src/Deblan/Bundle/BlogBundle/Resources/public/css/cleanblog/main.css @@ -279,3 +279,7 @@ pre, label { font-size: 16px; } + +img { + max-width: 100%; +} diff --git a/src/Deblan/Bundle/BlogBundle/Resources/public/img/home-bg2.jpg b/src/Deblan/Bundle/BlogBundle/Resources/public/img/home-bg2.jpg new file mode 100644 index 0000000..fbe52c4 Binary files /dev/null and b/src/Deblan/Bundle/BlogBundle/Resources/public/img/home-bg2.jpg differ diff --git a/src/Deblan/Bundle/BlogBundle/Resources/public/js/main.js b/src/Deblan/Bundle/BlogBundle/Resources/public/js/main.js index a1cbe62..7cca30e 100644 --- a/src/Deblan/Bundle/BlogBundle/Resources/public/js/main.js +++ b/src/Deblan/Bundle/BlogBundle/Resources/public/js/main.js @@ -143,7 +143,7 @@ if (!readCookie('private_life')) { createCookie('private_life', '1', 365); $('#cookie').removeClass('hide').css({ - top: 0, + top: 57, position: 'absolute', width: '100%' }); diff --git a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/searchEngine.html.twig b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/searchEngine.html.twig index 6458d21..3faaf80 100644 --- a/src/Deblan/Bundle/BlogBundle/Resources/views/Default/searchEngine.html.twig +++ b/src/Deblan/Bundle/BlogBundle/Resources/views/Default/searchEngine.html.twig @@ -3,7 +3,7 @@ {% block breadcrumb %}
  • Accueil
  • »
  • -
  • Recherche « {{ page.Words }} »
  • +
  • Recherche « {{ page.words }} »
  • {% if page.pager.nbResults > 0 and page.pager.currentPage > 1 %}
  • »