Merge branch 'develop'

sulu · Jul 28, 2016 · 2a5ea26 · 2a5ea26
2 parents a576cc3 + 4dcc2c6
commit 2a5ea26
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 96 deletions.
diff --git a/app/Resources/webspaces/sulu.io.xml.dist b/app/Resources/webspaces/sulu.io.xml.dist
@@ -18,10 +18,11 @@
         <default-template type="homepage">overview</default-template>
     </default-templates>
 
-    <error-templates>
-        <error-template default="true">ClientWebsiteBundle:views:error.html.twig</error-template>
-        <error-template code="404">ClientWebsiteBundle:views:error404.html.twig</error-template>
-    </error-templates>
+    <templates>
+        <template type="search">ClientWebsiteBundle:views:query.html.twig</template>
+        <template type="error">ClientWebsiteBundle:views:error.html.twig</template>
+        <template type="error-404">ClientWebsiteBundle:views:error404.html.twig</template>
+    </templates>
 
     <navigation>
         <contexts>

diff --git a/app/config/website/routing.yml b/app/config/website/routing.yml
@@ -1,9 +1,9 @@
 sulu_media:
     resource: "@SuluMediaBundle/Resources/config/routing_website.yml"
 
-client_website:
+sulu_search:
     type: portal
-    resource: "@ClientWebsiteBundle/Resources/config/routing.yml"
+    resource: "@SuluSearchBundle/Resources/config/routing_website.xml"
 
 sulu_website:
     resource: "@SuluWebsiteBundle/Resources/config/routing_website.yml"
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "sensio/distribution-bundle": "~5.0",
         "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "~2.0",
-        "sulu/sulu": "1.3.0-RC1",
+        "sulu/sulu": "dev-develop",
         "sulu/theme-bundle": "1.0.*",
         "sulu/document-manager": "@dev",
         "symfony-cmf/core-bundle": "1.2.*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Client/Bundle/WebsiteBundle/Controller/SearchController.php b/src/Client/Bundle/WebsiteBundle/Controller/SearchController.php
diff --git a/src/Client/Bundle/WebsiteBundle/Resources/config/routing.yml b/src/Client/Bundle/WebsiteBundle/Resources/config/routing.yml
diff --git a/src/Client/Bundle/WebsiteBundle/Resources/themes/default/views/master.html.twig b/src/Client/Bundle/WebsiteBundle/Resources/themes/default/views/master.html.twig
@@ -40,7 +40,7 @@
                         </div>
                     </div>
                     <div class="col-lg-3">
-                        <form action="{{ path('website_search') }}" method="GET">
+                        <form action="{{ path('sulu_search.website_search') }}" method="GET">
                             <input name="q" type="text" placeholder="Search" />
                             <input type="submit" value="Go" />
                         </form>

diff --git a/...rces/themes/default/views/query.html.twig → ...ces/themes/default/views/search.html.twig b/...rces/themes/default/views/query.html.twig → ...ces/themes/default/views/search.html.twig