Merge pull request #9 from PlasticStudio/feature/config

Code update
PlasticStudio · Mar 17, 2021 · c0a8cc2 · c0a8cc2
2 parents 80a8fc0 + bb9085d
commit c0a8cc2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -6,7 +6,7 @@ Before:
 SilverStripe\Control\Controller:
   extensions:
     - PlasticStudio\Search\SearchControllerExtension
-PlasticStudio\Search\SearchPageController:
+# PlasticStudio\Search\SearchPageController:
   # types:
   #   docs:
   #     Label: 'Documents'

diff --git a/src/SearchPage.php b/src/SearchPage.php
@@ -3,6 +3,7 @@
 namespace PlasticStudio\Search;
 
 use Page;
+use SilverStripe\ORM\DB;
 
 class SearchPage extends Page {
 	private static $description = "Search engine and results page. You only need one of these page types.";

diff --git a/src/SearchPageController.php b/src/SearchPageController.php
@@ -23,11 +23,11 @@ class SearchPageController extends PageController {
 	public function index($request){
 
 		if (Director::isLive()){
-			Requirements::css('/resources/plasticstudio/search/client/Search.min.css');
-			Requirements::javascript('/resources/plasticstudio/search/client/Search.min.js');
+			Requirements::css('plasticstudio/search:client/Search.min.css');
+			Requirements::javascript('plasticstudio/search:client/Search.min.js');
 		} else {
-			Requirements::css('/resources/plasticstudio/search/client/Search.css');
-			Requirements::javascript('/resources/plasticstudio/search/client/Search.js');
+			Requirements::css('plasticstudio/search:client/Search.css');
+			Requirements::javascript('plasticstudio/search:client/Search.js');
 		}
 
 		// get the parameters and variables of this request (ie the query and filters)

diff --git a/templates/Jaedb/Search/Layout/SearchPage.ss → ...PlasticStudio/Search/Layout/SearchPage.ss b/templates/Jaedb/Search/Layout/SearchPage.ss → ...PlasticStudio/Search/Layout/SearchPage.ss
@@ -1,4 +1,3 @@
-
 <div class="search-results-page">
 
 	$AdvancedSearchForm
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		<div class="search-results-page">

		$AdvancedSearchForm
Expand Down