fixing difference between master and v2.0.x

craiggwilson · craiggwilson · commit ebee7b14a79a · 2015-05-15T08:15:37.000-05:00
diff --git a/Docs/reference/config.toml b/Docs/reference/config.toml
@@ -5,4 +5,18 @@ theme = "mongodb"
 canonifyurls = false
 
 [blackfriday]
-  plainIdAnchors = true
+  plainIdAnchors = true
+
+[[menu.main]]
+    name = "API Documentation"
+    pre = "<i class='fa fa-file-text-o'></i>"
+    weight = 90
+    identifier = "apiDocs"
+    url = "http://api.mongodb.org/csharp/2.0"
+
+[[menu.main]]
+    name = "Source Code"
+    pre = "<i class='fa fa-github'></i>"
+    weight = 90
+    identifier = "githubLink"
+    url = "https://github.com/mongodb/mongo-csharp-driver/tree/master"
diff --git a/Docs/reference/content/examples/import_export.md b/Docs/reference/content/examples/import_export.md
@@ -4,6 +4,7 @@ draft = true
 title = "Import and Export"
 [menu.main]
   parent = "Examples"
+  identifier = "Import/Export"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/examples/index.md b/Docs/reference/content/examples/index.md
@@ -4,6 +4,7 @@ draft = true
 title = "Examples"
 [menu.main]
   weight = 90
+  identifier = "Examples"
   pre = "<i class='fa fa-code'></i>"
 +++
 
diff --git a/Docs/reference/content/getting_started/index.md b/Docs/reference/content/getting_started/index.md
@@ -4,6 +4,7 @@ draft = false
 title = "Getting Started"
 [menu.main]
   weight = 10
+  identifier = "Getting Started"
   pre = "<i class='fa fa-road'></i>"
 +++
 
@@ -13,4 +14,4 @@ To help you get started quickly on the new driver, follow:
 
 - [Installation]({{< relref "getting_started\installation.md" >}})
 - [Quick Tour]({{< relref "getting_started\quick_tour.md" >}})
-- [Admin Quick Tour]({{< relref "getting_started\admin_quick_tour.md" >}})
+- [Admin Quick Tour]({{< relref "getting_started\admin_quick_tour.md" >}})
diff --git a/Docs/reference/content/issues_help.md b/Docs/reference/content/issues_help.md
@@ -4,6 +4,7 @@ draft = false
 title = "Issues & Help"
 [menu.main]
   weight = 100
+  identifier = "Issues & Help"
   pre = "<i class='fa fa-life-ring'></i>"
 +++
 
diff --git a/Docs/reference/content/reference/bson/bson.md b/Docs/reference/content/reference/bson/bson.md
@@ -1,9 +1,10 @@
 +++
 date = "2015-03-17T15:36:56Z"
 draft = false
-title = "Reading and Writing BSON/JSON"
+title = "BSON/JSON"
 [menu.main]
   parent = "BSON"
+  identifier = "BSON/JSON"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/bson/bson_document.md b/Docs/reference/content/reference/bson/bson_document.md
@@ -4,6 +4,7 @@ draft = false
 title = "BsonDocument"
 [menu.main]
   parent = "BSON"
+  identifier = "BsonDocument"
   weight = 20
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/bson/index.md b/Docs/reference/content/reference/bson/index.md
@@ -4,6 +4,7 @@ draft = false
 title = "BSON"
 [menu.main]
   parent = "Reference"
+  identifier = "BSON"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/bson/mapping/conventions.md b/Docs/reference/content/reference/bson/mapping/conventions.md
@@ -4,6 +4,7 @@ draft = false
 title = "Conventions"
 [menu.main]
   parent = "Mapping Classes"
+  identifier = "Conventions"
   weight = 20
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/bson/mapping/index.md b/Docs/reference/content/reference/bson/mapping/index.md
@@ -4,6 +4,7 @@ draft = false
 title = "Mapping Classes"
 [menu.main]
   parent = "BSON"
+  identifier = "Mapping Classes"
   weight = 40
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/bson/mapping/polymorphism.md b/Docs/reference/content/reference/bson/mapping/polymorphism.md
@@ -4,6 +4,7 @@ draft = false
 title = "Polymorphism"
 [menu.main]
   parent = "Mapping Classes"
+  identifier = "Polymorphism"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/bson/mapping/schema_changes.md b/Docs/reference/content/reference/bson/mapping/schema_changes.md
@@ -4,6 +4,7 @@ draft = false
 title = "Handling Schema Changes"
 [menu.main]
   parent = "Mapping Classes"
+  identifier = "Handling Schema Changes"
   weight = 30
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/bson/serialization.md b/Docs/reference/content/reference/bson/serialization.md
@@ -4,6 +4,7 @@ draft = false
 title = "Serialization"
 [menu.main]
   parent = "BSON"
+  identifier = "Serialization"
   weight = 30
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver/authentication.md b/Docs/reference/content/reference/driver/authentication.md
@@ -3,7 +3,8 @@ date = "2015-03-17T15:36:56Z"
 draft = false
 title = "Authentication"
 [menu.main]
-  parent = "Connecting"
+  parent = "Reference Connecting"
+  identifier = "Authentication"
   weight = 30
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver/connecting.md b/Docs/reference/content/reference/driver/connecting.md
@@ -4,6 +4,7 @@ draft = false
 title = "Connecting"
 [menu.main]
   parent = "Driver"
+  identifier = "Reference Connecting"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver/crud/reading.md b/Docs/reference/content/reference/driver/crud/reading.md
@@ -3,7 +3,7 @@ date = "2015-03-17T15:36:56Z"
 draft = false
 title = "Reading"
 [menu.main]
-  parent = "CRUD Operations"
+  parent = "Reference Reading and Writing"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver/crud/writing.md b/Docs/reference/content/reference/driver/crud/writing.md
@@ -3,7 +3,7 @@ date = "2015-03-17T15:36:56Z"
 draft = false
 title = "Writing"
 [menu.main]
-  parent = "CRUD Operations"
+  parent = "Reference Reading and Writing"
   weight = 20
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver/expressions.md b/Docs/reference/content/reference/driver/expressions.md
@@ -4,6 +4,7 @@ draft = false
 title = "Expressions"
 [menu.main]
   parent = "Definitions and Builders"
+  identifier = "Expressions"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver/index.md b/Docs/reference/content/reference/driver/index.md
@@ -4,6 +4,7 @@ draft = false
 title = "Driver"
 [menu.main]
   parent = "Reference"
+  identifier = "Driver"
   weight = 20
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver/ssl.md b/Docs/reference/content/reference/driver/ssl.md
@@ -3,7 +3,8 @@ date = "2015-03-17T15:36:56Z"
 draft = false
 title = "SSL"
 [menu.main]
-  parent = "Connecting"
+  parent = "Reference Connecting"
+  identifier = "SSL"
   weight = 20
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/driver_core/index.md b/Docs/reference/content/reference/driver_core/index.md
@@ -4,6 +4,7 @@ draft = false
 title = "Driver Core"
 [menu.main]
   parent = "Reference"
+  identifier = "Driver Core"
   weight = 30
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/reference/index.md b/Docs/reference/content/reference/index.md
@@ -4,6 +4,7 @@ draft = false
 title = "Reference"
 [menu.main]
   weight = 80
+  identifier = "Reference"
   pre = "<i class='fa fa-book'></i>"
 +++
 
diff --git a/Docs/reference/content/upgrading.md b/Docs/reference/content/upgrading.md
@@ -4,6 +4,7 @@ draft = false
 title = "Upgrading"
 [menu.main]
   parent = "What's New"
+  identifier = "Upgrading"
   weight = 10
   pre = "<i class='fa'></i>"
 +++
diff --git a/Docs/reference/content/what_is_new.md b/Docs/reference/content/what_is_new.md
@@ -4,6 +4,7 @@ draft = false
 title = "What's New"
 [menu.main]
   weight = 20
+  identifier = "What's New"
   pre = "<i class='fa fa-star'></i>"
 +++
 
diff --git a/Docs/reference/static/css/dn.css b/Docs/reference/static/css/dn.css
@@ -1,4 +1,7 @@
 .downloadInfo {
   margin-top: -24px;
-  font-size: 14px;
+  font-size: 13px;
+}
+.downloadInfo p {
+  margin: 0px;
 }
diff --git a/Docs/reference/themes/mongodb/layouts/partials/header/main.html b/Docs/reference/themes/mongodb/layouts/partials/header/main.html
@@ -11,6 +11,6 @@
       </a>
     </div>
     <!--logo end-->
-    {{ partial "header/topRight.html" }}
+    {{ partial "header/topRight.html" . }}
   </div>
 </header>
diff --git a/Docs/reference/themes/mongodb/layouts/partials/header/search.html b/Docs/reference/themes/mongodb/layouts/partials/header/search.html
@@ -0,0 +1,8 @@
+<div id="search">
+<form method="get" action="//www.google.com/search" target="_blank">
+    <input type="text" name="searchQuery" size="20" value="" autocomplete="off" placeholder="Search docs">
+    <input type="hidden" name="site" value="{{.Site.BaseUrl}}">
+    <input type="hidden" name="q" value="">
+    <label for="searchQuery"><i class="fa fa-search fa-1"></i></label>
+</form>
+</div>
diff --git a/Docs/reference/themes/mongodb/layouts/partials/header/topRight.html b/Docs/reference/themes/mongodb/layouts/partials/header/topRight.html
@@ -5,5 +5,6 @@
   <a href="http://www.mongodb.org/get-involved" data-toggle="tooltip" data-placement="bottom" title="Get involved with MongoDB">Community</a>
   <a href="http://docs.mongodb.org" data-toggle="tooltip" data-placement="bottom" title="The MongoDB Documentation">Docs</a>
   <a href="http://blog.mongodb.org" data-toggle="tooltip" data-placement="bottom" title="The MongoDB Blog">Blog</a>
+  {{ partial "header/search.html" . }}
 </div>
 </div>
diff --git a/Docs/reference/themes/mongodb/static/css/overrides.css b/Docs/reference/themes/mongodb/static/css/overrides.css
@@ -23,8 +23,8 @@
   margin-left: 5px;
 }
 
-.hljsCode pre { padding: 0px; overflow: auto; word-wrap: normal; white-space: nowrap;}
-.hljsCode pre code { padding: 24px 12px; overflow: auto; white-space: pre;}
+.jsEnabled pre { padding: 0px; overflow: auto; word-wrap: normal; white-space: nowrap;}
+.jsEnabled pre code { padding: 24px 12px; overflow: auto; white-space: pre;}
 
 .body blockquote {
   background-color: #edf4e8;
@@ -88,3 +88,30 @@ code {
 a code {
   color: #006cbc;
 }
+
+#search {
+  visibility: hidden;
+  display: inline-block;
+  background-color: rgba(255,255,255,0.3);
+  border-radius: 6px;
+  border: 1px solid #3b2920;
+  font-weight: 300;
+  font-size: 15px;
+  padding: 2px;
+}
+
+#search label {
+  padding-right: 5px;
+}
+
+#search input[name="searchQuery"] {
+  background-color: transparent !important;
+  color: white;
+  border: none;
+  padding: 2px 0 0 4px;
+  outline: none;
+}
+
+.jsEnabled #search {
+  visibility: visible;
+}
diff --git a/Docs/reference/themes/mongodb/static/img/favicon.png b/Docs/reference/themes/mongodb/static/img/favicon.png
diff --git a/Docs/reference/themes/mongodb/static/js/scripts.js b/Docs/reference/themes/mongodb/static/js/scripts.js
@@ -12,9 +12,23 @@ function initializeJS() {
     });
 };
 
-jQuery(document).ready(function(){
+jQuery(document).ready(function() {
     initializeJS();
     jQuery('[data-toggle="tooltip"]').tooltip();
-    jQuery("body").addClass("hljsCode");
+    jQuery("body").addClass("jsEnabled");
     hljs.initHighlightingOnLoad();
+    var linkRegex = new RegExp('/' + window.location.host + '/');
+    jQuery('a').not('[href*="mailto:"]').each(function () {
+        if (!linkRegex.test(this.href)) {
+            $(this).attr('target', '_blank');
+        }
+    });
+    jQuery('.body table').addClass('table').addClass('table-striped');
+    var siteInput = $('#search input[name="site"]');
+    if (siteInput.val().substring(0, 4) != "http") {
+        siteInput.attr("value", window.location.hostname + siteInput.val());
+    }
+    jQuery("#search form").submit(function() {
+        $('#search input[name="q"]').attr("value", $('#search input[name="searchQuery"]').val() + ' site:' + $('#search input[name="site"]').val());
+    });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`.downloadInfo {`
`2`	`2`	`margin-top: -24px;`
`3`		`- font-size: 14px;`
	`3`	`+ font-size: 13px;`
	`4`	`+}`
	`5`	`+.downloadInfo p {`
	`6`	`+ margin: 0px;`
`4`	`7`	`}`