Basic searching works

Author: Synchro

_layouts/default.html

@@ -48,8 +48,8 @@
 </div>
 <div class="container">
     <div class="row">
-        <div class="span9">
-            {{content}}
+        <div id="content" class="span9">
+{{content}}
         </div>
         <div class="span3">
             <div id="menu">
@@ -59,7 +59,7 @@
                         <button id="searchbutton" type="submit" placeholder="Search" class="btn" onclick="doSearch();">Search</button>
                     </div>
                 </form>
-                <ul class="nav nav-list" data-spy="affix">
+                <ul class="nav nav-list">
                     {% assign url = page.url|remove:'index.html' %}
                     {% for heading in site.navigation %}
                     <li class="nav-header">{{heading.heading}}</li>
@@ -81,9 +81,14 @@
 <script>
     function doSearch() {
         run_search(function doit() {
+            var content;
+            content  = '<h1>Search Results<\/h1>\n';
+            content += '<ul>\n';
             for (var i = 0, len = final_results.length; i < len; i++) {
-                console.log(final_results[i].t + ' ' + final_results[i].u);
+                content += '<li><a href="' + final_results[i].u + '">' + final_results[i].t + '<\/a><\/li>\n';
             }
+            content += '<\/ul>';
+            $('#content').html(content); //Replace main body of page with search results
         });
     }
 </script>

_plugins/gensearch.rb

@@ -67,7 +67,7 @@ def generate(site)
                 # add the page info to the ferret index
                 index << {  
                   :title => page.data['title'],
-                  :url => "#{page.dir}#{page.url}",
+                  :url => "#{page.url}",
                   :content => page.content,
                 }
 

api/clients.md

@@ -1,7 +1,6 @@
 ---
 layout: default
 title: Smartmessages API Clients
-section: api/clients
 ---
 #Smartmessages API Clients
 

api/index.md

@@ -1,7 +1,6 @@
 ---
 layout: default
 title: The Smartmessages API
-section: api
 ---
 #The Smartmessages API
 

api/reference.md

@@ -1,7 +1,6 @@
 ---
 layout: default
 title: Smartmessages API Reference
-section: api/reference
 ---
 # Smartmessages API Reference
 

index.md

@@ -1,9 +1,9 @@
 ---
 layout: default
-title: Welcome
+title: Smartmessages Docs Home
 ---
 
 # Smartmessages Docs
 ## Welcome to the Smartmessages documentation!
 
-To get started, check out the links on the left.
+To get started, check out the links in the sidebar, or try a search.

tech/dkim.md

@@ -1,7 +1,6 @@
 ---
 layout: default
-title: Smartmessages Technical Info
-section: tech/dkim
+title: Smartmessages Technical Info - DKIM
 ---
 # DKIM - Domain Keys Identified Mail
 

tech/index.md

@@ -1,7 +1,6 @@
 ---
 layout: default
 title: Smartmessages Technical Info
-section: tech/
 ---
 # Technical Overview
 

tech/spf.md

@@ -1,7 +1,6 @@
 ---
 layout: default
-title: Smartmessages Technical Info
-section: tech/spf
+title: Smartmessages Technical Info - SPF
 ---
 # SPF - The Sender Policy Framework
 

using/guides.md

@@ -1,6 +1,5 @@
 ---
 layout: default
 title: Smartmessages User Guides
-section: using/guides
 ---
 #Smartmessages User Guides and Documents

using/index.md

@@ -1,6 +1,5 @@
 ---
 layout: default
 title: Getting Started with Smartmessages
-section: using/
 ---
 # Getting Started With Smartmessages

using/tutorials.md

@@ -1,6 +1,5 @@
 ---
 layout: default
 title: Smartmessages Tutorials
-section: using/tutorials
 ---
 # Smartmessages Tutorials

using/video.md

@@ -1,6 +1,5 @@
 ---
 layout: default
 title: Smartmessages Video Library
-section: using/video
 ---
 # Smartmessages Video Library