~xdavidwu/xdavidwu.link

8610e14c1342151809640f3150df68258ecbfdb2 — Michael Rose 7 years ago c4109a0
Replace hardcoded text with strings stored in `_data` file
3 files changed, 14 insertions(+), 10 deletions(-)

M _data/ui-text.yml
M _layouts/search.html
M assets/js/lunr-en.js
M _data/ui-text.yml => _data/ui-text.yml +2 -0
@@ 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:

M _layouts/search.html => _layouts/search.html +5 -3
@@ 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>

M assets/js/lunr-en.js => assets/js/lunr-en.js +7 -7
@@ 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>'+