From 19f6d3274582bfc670bad20ec4a1309d5a36b7dd Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Wed, 15 Nov 2017 15:50:29 -0500
Subject: [PATCH] Replace hardcoded text with strings stored in `_data` file

---
 _data/ui-text.yml      |  2 ++
 _layouts/search.html   |  8 +++++---
 assets/js/lunr-en.js   | 14 +++++++-------
 docs/_data/ui-text.yml |  2 ++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/_data/ui-text.yml b/_data/ui-text.yml
index 3a0450b1..526d3a26 100644
--- a/_data/ui-text.yml
+++ b/_data/ui-text.yml
@@ -40,6 +40,8 @@ en: &DEFAULT_EN
   comment_success_msg        : "Thanks for your comment! It will show on the site once it has been approved."
   comment_error_msg          : "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again."
   loading_label              : "Loading..."
+  search_placeholder_text    : "Enter your search term..."
+  results_found              : "Result(s) found"
 en-US:
   <<: *DEFAULT_EN
 en-CA:
diff --git a/_layouts/search.html b/_layouts/search.html
index d9cdfe3e..2fa9d64c 100644
--- a/_layouts/search.html
+++ b/_layouts/search.html
@@ -21,10 +21,12 @@ layout: default
     {% endunless %}
 
     {{ content }}
-    
-    <input placeholder="Search..." type="search" id="search" class="search-input">
-    <div id="results"></div>
 
+    <form>
+      <input placeholder="{{ site.data.ui-text[site.locale].search_placeholder_text | default: "Enter your search term..." }}" type="search" id="search" class="search-input">
+    </form>
+
+    <div id="results"></div>
 
   </div>
 </div>
diff --git a/assets/js/lunr-en.js b/assets/js/lunr-en.js
index bf0dd279..bfafdaef 100644
--- a/assets/js/lunr-en.js
+++ b/assets/js/lunr-en.js
@@ -1,6 +1,6 @@
 ---
+---
 
----
 var idx = lunr(function () {
   this.field('title', {boost: 10})
   this.field('excerpt')
@@ -58,26 +58,26 @@ $(document).ready(function() {
     var query = $(this).val();
     var result = idx.search(query);
     resultdiv.empty();
-    resultdiv.prepend('<p>'+result.length+' Result(s) found</p>');
+    resultdiv.prepend('<p>'+result.length+' {{ site.data.ui-text[site.locale].results_found | default: "Result(s) found" }}</p>');
     for (var item in result) {
       var ref = result[item].ref;
       if(store[ref].teaser){
         var searchitem =
-          '<div>'+
+          '<div class="list__item">'+
             '<article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">'+
-              '<div class="archive__item-teaser">'+
-                '<img src="'+store[ref].teaser+'" alt="">'+
-              '</div>'+
               '<h2 class="archive__item-title" itemprop="headline">'+
                 '<a href="'+store[ref].url+'" rel="permalink">'+store[ref].title+'</a>'+
               '</h2>'+
+              '<div class="archive__item-teaser">'+
+                '<img src="'+store[ref].teaser+'" alt="">'+
+              '</div>'+
               '<p class="archive__item-excerpt" itemprop="description">'+store[ref].excerpt+'</p>'+
             '</article>'+
           '</div>';
       }
       else{
     	  var searchitem =
-          '<div>'+
+          '<div class="list__item">'+
             '<article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">'+
               '<h2 class="archive__item-title" itemprop="headline">'+
                 '<a href="'+store[ref].url+'" rel="permalink">'+store[ref].title+'</a>'+
diff --git a/docs/_data/ui-text.yml b/docs/_data/ui-text.yml
index 3a0450b1..526d3a26 100644
--- a/docs/_data/ui-text.yml
+++ b/docs/_data/ui-text.yml
@@ -40,6 +40,8 @@ en: &DEFAULT_EN
   comment_success_msg        : "Thanks for your comment! It will show on the site once it has been approved."
   comment_error_msg          : "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again."
   loading_label              : "Loading..."
+  search_placeholder_text    : "Enter your search term..."
+  results_found              : "Result(s) found"
 en-US:
   <<: *DEFAULT_EN
 en-CA: