From 70526ef0a703d6740ee0eb1ce3ef9b2bdb4368f7 Mon Sep 17 00:00:00 2001
From: Alexandre Terrasa <alexandre@moz-code.org>
Date: Fri, 6 Jun 2014 12:55:10 -0400
Subject: [PATCH 1/1] nitdoc: migrate javascript plugins

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
---
 share/nitdoc/css/Nitdoc.GitHub.css         |   77 +----------------
 share/nitdoc/css/Nitdoc.QuickSearch.css    |   12 +--
 share/nitdoc/js/nitdoc.js                  |    7 +-
 share/nitdoc/js/plugins/github.js          |   20 +++--
 share/nitdoc/js/plugins/github/loginbox.js |  123 ++++++++++++++++------------
 share/nitdoc/js/plugins/quicksearch.js     |   40 +++------
 6 files changed, 105 insertions(+), 174 deletions(-)

diff --git a/share/nitdoc/css/Nitdoc.GitHub.css b/share/nitdoc/css/Nitdoc.GitHub.css
index bba519c..a2d675f 100644
--- a/share/nitdoc/css/Nitdoc.GitHub.css
+++ b/share/nitdoc/css/Nitdoc.GitHub.css
@@ -20,18 +20,11 @@
  * Nitdoc Github Login Box
  */
 
-#nitdoc-github-li {
-	float: left;
-	padding: 0;
-	margin: -2px 5px 5px 15px;
-}
-
 #nitdoc-github-li.current {
 	color: #999;
 }
 
-#nitdoc-github-li .nitdoc-github-li-img {
-	width: 20px;
+#nitdoc-github-li .glyphicon {
 	cursor: pointer;
 }
 
@@ -93,23 +86,6 @@
 	text-align:center;
 }
 
-#nitdoc-github-loginbox input {
-	width: 212px;
-	height: 20px;
-	padding: 3px;
-	margin: 5px 0px 5px 0px;
-	color: black;
-	font-style: normal;
-	font-size: 12px;
-	border: 1px solid #CCC;
-}
-
-#nitdoc-github-loginbox button {
-	margin-top: 15px;
-	width: 220px;
-	font-weight: bold;
-}
-
 #nitdoc-github-loginbox h4 {
 	display: block;
 	width: 100%;
@@ -126,57 +102,6 @@
 	color: #0D8921;
 }
 
-/* 
- * Nitdoc Github buttons
- */
-
-.nitdoc-github-button {
-	display: inline-block;
-	cursor: pointer;
-	background-color: #92C929;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#92C929), to(#1d7900)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient(top, #92C929, #1d7900); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient(top, #92C929, #1d7900); /* FF3.6 */
-	background-image:     -ms-linear-gradient(top, #92C929, #1d7900); /* IE10 */
-	background-image:      -o-linear-gradient(top, #92C929, #1d7900); /* Opera 11.10+ */
-	background-image:         linear-gradient(top, #92C929, #1d7900);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#92C929', EndColorStr='#1d7900'); /* IE6–IE9 */
-	border-radius: 2px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	-moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
-	box-shadow: 0px 2px 4px rgba(0,0,0, .2);
-	-moz-box-shadow: 0px 2px 4px rgba(0,0,0, .2);
-	-webkit-box-shadow: 0px 2px 4px rgba(0,0,0, .2);
-	text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
-	-moz-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
-	-webkit-text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
-	border: 1px solid #1d7900;
-	color: #fff;
-	font-size: 14px;
-	padding: 5px 7px 5px 7px;
-	text-align: center;
-}
-
-button.nitdoc-github-button[disabled=disabled] {
-	background-color: #999999;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#999999), to(#333333)); /* Saf4+, Chrome */
-	background-image: -webkit-linear-gradient(top, #999999, #333333); /* Chrome 10+, Saf5.1+ */
-	background-image:    -moz-linear-gradient(top, #999999, #333333); /* FF3.6 */
-	background-image:     -ms-linear-gradient(top, #999999, #333333); /* IE10 */
-	background-image:      -o-linear-gradient(top, #999999, #333333); /* Opera 11.10+ */
-	background-image:         linear-gradient(top, #999999, #333333);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#999999', EndColorStr='#333333'); /* IE6–IE9 */
-	border: 1px solid #333333;
-}
-
-button.nitdoc-github-button img {
-	margin-right: 7px;
-	margin-bottom: -3px;
-	height: 16px;
-	width: 16px;
-}
-
 /* Comment editing */
 
 .nitdoc-github-commentbox {
diff --git a/share/nitdoc/css/Nitdoc.QuickSearch.css b/share/nitdoc/css/Nitdoc.QuickSearch.css
index 42b3925..81bba5d 100644
--- a/share/nitdoc/css/Nitdoc.QuickSearch.css
+++ b/share/nitdoc/css/Nitdoc.QuickSearch.css
@@ -20,19 +20,9 @@
  * Nitdoc Quick Search JS module 
  */
 
-#nitdoc-qs-li {
-	float: right;
-	padding: 0;
-	margin: 0;
-}
-
 #nitdoc-qs-field {
 	width: 300px;
-}
-
-#nitdoc-qs-field.nitdoc-qs-field-notused {
-	color: #999;
-	font-style: italic;
+	margin-top: 3px;
 }
 
 #nitdoc-qs-table {
diff --git a/share/nitdoc/js/nitdoc.js b/share/nitdoc/js/nitdoc.js
index 73d33a4..0c90d58 100644
--- a/share/nitdoc/js/nitdoc.js
+++ b/share/nitdoc/js/nitdoc.js
@@ -9,18 +9,17 @@ require.config({
 		quicksearchList: searchList,
 		jQueryUI: "jquery-ui",
     },
-	shim: {
+	/*shim: {
 		"jQueryUI": {
 		    export: "$",
 		    deps: ['jquery']
 		}
-	}
+	}*/
 });
 
 // nitdoc main module
 define([
-	"plugins/folding",
-	"plugins/filtering",
+	//"plugins/filtering",
 	"plugins/quicksearch",
 	"plugins/github",
 ], function() {});
diff --git a/share/nitdoc/js/plugins/github.js b/share/nitdoc/js/plugins/github.js
index 84ad4f2..c77c0d0 100644
--- a/share/nitdoc/js/plugins/github.js
+++ b/share/nitdoc/js/plugins/github.js
@@ -46,11 +46,21 @@ define([
 			this.origin = this._parseUpstream(upstream);
 			this._initMarked();
 			// Add github menu
-			$("nav.main ul").append(
-				$("<li/>")
-				.attr("id", "nitdoc-github-li")
+			$("#topmenu>.container-fluid").append(
+				$("<a/>")
+				.attr({
+					"id": "nitdoc-github-li",
+					"type": "button",
+					"class": "navbar-btn navbar-right btn-link",
+					"href": "#",
+					"data-container": "body",
+					"data-toggle": "popover",
+					"data-placement": "bottom",
+					"data-content": "bottom",
+					"data-html": "true",
+				})
 				.loginbox()
-				.loginbox("displayLogin")
+				//.loginbox("displayLogin")
 				.bind("loginbox_logoff", function() {
 					GithubUI.disactivate();
 				})
@@ -124,7 +134,7 @@ define([
 						.modalbox("open");
 					} else if(isok == "error:sha") {
 						$("<p/>")
-						.text("The provided Github repository must contain the base commit '" + UI.origin.sha + "'.")
+						.text("The provided Github repository must contain the base commit '" + this.origin.sha + "'.")
 						.modalbox({
 							title: "Github base commit error",
 							isError: true
diff --git a/share/nitdoc/js/plugins/github/loginbox.js b/share/nitdoc/js/plugins/github/loginbox.js
index 119b5e8..55fbffe 100644
--- a/share/nitdoc/js/plugins/github/loginbox.js
+++ b/share/nitdoc/js/plugins/github/loginbox.js
@@ -40,16 +40,16 @@ define([
 
 		_create: function() {
 			this.element.append(
-				$("<a/>")
-				.append(
-					$("<img/>")
-					.attr({
-						src: this.options.icon,
-						alt: this.options.iconAlt
-					})
-					.addClass("nitdoc-github-li-img")
-				)
-				.click($.proxy(this.toggle, this))
+				$("<span/>")
+				.addClass("glyphicon glyphicon-off")
+				//.click($.proxy(this.toggle, this))
+				.attr({
+					"data-container": "body",
+					"data-toggle": "popover",
+					"data-placement": "bottom",
+					"data-content": "bottom",
+					"data-html": "true",
+				})
 			);
 
 			this.content = $("<div/>");
@@ -133,56 +133,77 @@ define([
 				$("<form/>")
 				.keyup($.proxy(this._doFormChange, this))
 				.append(
-					$("<label/>")
-					.attr("for", "nitdoc-github-login-field")
-					.append(this.options.usernameTxt)
-				)
-				.append(
-					$("<input/>")
-					.attr({
-						id: "nitdoc-github-login-field",
-						type: "text"
-					})
-				)
-				.append(
-					$("<label/>")
-					.attr("for", "nitdoc-github-password-field")
-					.append(this.options.passwordTxt)
-				)
-				.append(
-					$("<input/>")
-					.attr({
-						id: "nitdoc-github-password-field",
-						type: "password"
-					})
-				)
-				.append(
-					$("<label/>")
-					.attr("for", "nitdoc-github-repo-field")
-					.append(this.options.repoTxt)
+					$("<div/>")
+					.addClass("form-group")
+					.append(
+						$("<label/>")
+						.attr("for", "nitdoc-github-login-field")
+						.append(this.options.usernameTxt)
+					)
+					.addClass("form-group")
+					.append(
+						$("<input/>")
+						.attr({
+							id: "nitdoc-github-login-field",
+							type: "text",
+							"class": "form-control"
+						})
+					)
 				)
 				.append(
-					$("<input/>")
-					.attr({
-						id: "nitdoc-github-repo-field",
-						type: "text"
-					})
+					$("<div/>")
+					.addClass("form-group")
+					.append(
+						$("<label/>")
+						.attr("for", "nitdoc-github-password-field")
+						.append(this.options.passwordTxt)
+					)
+					.append(
+						$("<input/>")
+						.attr({
+							id: "nitdoc-github-password-field",
+							type: "password",
+							"class": "form-control"
+						})
+					)
 				)
 				.append(
-					$("<label/>")
-					.attr("for", "nitdoc-github-branch-field")
-					.append(this.options.branchTxt)
+					$("<div/>")
+					.addClass("form-group")
+					.append(
+						$("<label/>")
+						.attr("for", "nitdoc-github-repo-field")
+						.append(this.options.repoTxt)
+					)
+					.append(
+						$("<input/>")
+						.attr({
+							id: "nitdoc-github-repo-field",
+							type: "text",
+							"class": "form-control"
+						})
+					)
 				)
 				.append(
-					$("<input/>")
-					.attr({
-						id: "nitdoc-github-branch-field",
-						type: "text"
-					})
+					$("<div/>")
+					.addClass("form-group")
+					.append(
+						$("<label/>")
+						.attr("for", "nitdoc-github-branch-field")
+						.append(this.options.branchTxt)
+					)
+					.append(
+						$("<input/>")
+						.attr({
+							id: "nitdoc-github-branch-field",
+							type: "text",
+							"class": "form-control"
+						})
+					)
 				)
 				.append(
 					$("<button/>")
-					.addClass("nitdoc-github-button")
+					.addClass("nitdoc-github-button btn btn-primary btn-lg pull-right")
 					.attr("disabled", "disabled")
 					.append(
 						$("<img/>")
diff --git a/share/nitdoc/js/plugins/quicksearch.js b/share/nitdoc/js/plugins/quicksearch.js
index c4cd682..12c124a 100644
--- a/share/nitdoc/js/plugins/quicksearch.js
+++ b/share/nitdoc/js/plugins/quicksearch.js
@@ -29,10 +29,8 @@ define([
 
 		options: {
 			list: {}, // List of raw results generated by nitdoc tool
-			fieldNotUsedClass: "nitdoc-qs-field-notused",
 			fieldAttrs: {
 				autocomplete: "off",
-				value: "quick search..."
 			},
 			tableID: "nitdoc-qs-table",
 			tableCSS: {
@@ -56,11 +54,8 @@ define([
 		_create: function() {
 			this.element
 				.attr(this.options.fieldAttrs)
-				.addClass(this.options.fieldNotUsedClass)
 				.keydown($.proxy(this._doKeyDown, this))
 				.keyup($.proxy(this._doKeyUp, this))
-				.focusout($.proxy(this._doFocusOut, this))
-				.focusin($.proxy(this._doFocusIn, this));
 
 			this._table = $("<table/>")
 				.attr("id", this.options.tableID)
@@ -93,28 +88,14 @@ define([
 					break;
 				case 13: // Enter
 					this._loadResult();
-					break;
+					return false;
 				case 27: // Escape
 					this.element.blur();
 					this.closeTable();
-					break;
+					return true;
 				default: // Other keys
 					utils.delayEvent($.proxy(this.search, this));
-					break;
-			}
-		},
-
-		_doFocusOut: function() {
-			if(this.element.val() == "") {
-				this.element.addClass(this.options.fieldNotUsedClass);
-				this.element.val(this.options.fieldAttrs.value);
-			}
-		},
-
-		_doFocusIn: function() {
-			if(this.element.val() == this.options.fieldAttrs.value) {
-				this.element.removeClass(this.options.fieldNotUsedClass);
-				this.element.val("");
+					return true;
 			}
 		},
 
@@ -378,16 +359,21 @@ define([
 	});
 
 	var searchField = $("<input/>")
-	.addClass("nitdoc-qs-field-notused")
+	.addClass("form-control input-sm")
 	.attr({
 		id: "nitdoc-qs-field",
 		type: "text",
+		placeholder: "Search..."
 	})
 
-	$("nav.main ul").append(
-		$("<li/>")
-			.attr("id", "nitdoc-qs-li")
-			.append(searchField)
+	$("#topmenu>.container-fluid").append(
+		$("<div>")
+		.addClass("navbar-form navbar-right")
+       	.append(
+       		$("<div>")
+       		.addClass("form-group")
+       		.append(searchField)
+       	)
 	);
 
 	searchField.quicksearch({
-- 
1.7.9.5