Merge pull request #2 from Nextcode-shanghai/gh-pages

remove blog section & fix search icon display and search feature bug

_data/landing.yml

@@ -23,11 +23,11 @@
   tpl: 'projects.html'
   css: 'project'
 
-- id: 'blog'
-  i18n: 'nav.blog'
-  name: 'Blog'
-  tpl: 'blog.html'
-  css: 'testimonials navy-section'
+# - id: 'blog'
+#   i18n: 'nav.blog'
+#   name: 'Blog'
+#   tpl: 'blog.html'
+#   css: 'testimonials navy-section'
 
 - id: 'links'
   i18n: 'nav.link'

_data/language.yml

@@ -1,7 +1,7 @@
 # localization
 # if you don't want this feature, just clear this file content and  static/locals/ folder.
-- locale: 'zh'
-  flag: 'static/img/flags/China.png'
+# - locale: 'zh'
+#   flag: 'static/img/flags/China.png'
 
-- locale: 'en'
-  flag: 'static/img/flags/United-States.png'
+# - locale: 'en'
+#   flag: 'static/img/flags/United-States.png'

_includes/header.html

@@ -3,12 +3,12 @@
     <input type="text" class="form-control search-content" id="search-content" style="position: fixed; top: 60px" placeholder="Search Blog">
 
     <div style="position: fixed; top: 16px; right: 16px; z-index: 9999;">
-        <img src="/search/img/cb-close.png" id="close-btn"/>
+        <img src="{{ "/search/img/cb-close.png" | prepend: site.baseurl }}" id="close-btn"/>
     </div>
 </div>
 
 <div style="position: fixed; right: 16px; bottom: 20px; z-index: 9999;">
-    <img src="/search/img/cb-search.png"  id="search-btn"  title="Double click Ctrl"/>
+    <img src="{{ "/search/img/cb-search.png" | prepend: site.baseurl }}"  id="search-btn"  title="Double click Ctrl"/>
 </div>
 
 <div class="navbar-wrapper">

index.html

@@ -25,6 +25,11 @@
                       </a>
                     </li>
                 {% endfor %}
+                <li>
+                  <a class="page-scroll" href="blog">
+                    <span data-i18n="{{ section.i18n }}">Blog</span>
+                  </a>
+                </li>
 
                 {% for language in site.data.language %}
                   <li>

search/cb-search.json

@@ -7,7 +7,7 @@ layout: null
 	 {% for post in site.posts %}
 	{
 		"title" : "{{ post.title }} - {{ post.date | date_to_utc | date: '%Y-%m-%d'}}",
-		"url" : "{{ post.url }}"
+		"url" : "{{ site.baseurl }}{{ post.url }}"
 	}
 	{% if forloop.rindex != 1  %}
 	,

search/js/cb-search.js

@@ -41,7 +41,7 @@
     toggleSearch(true);
   });
 
-  $.getJSON("/search/cb-search.json")
+  $.getJSON("/homepage/search/cb-search.json")
     .done(function (data) {
       if (data.code == 0) {
         $("#search-content").typeahead({