Integrate symbol search into new search pane.

dlang · Feb 15, 2015 · 78a207f · 78a207f
1 parent e9fb1f3
commit 78a207f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/css/ddox.css b/css/ddox.css
@@ -149,7 +149,7 @@ a.inherited:after { content: url(../images/ddox/inherited.png); padding-left: 3p
 
 #symbolSearchResults {
 	position: absolute;
-	left: 136pt;
+	left: 158pt;
 	width: 400pt;
 	margin: 0;
 	background-color: white;

diff --git a/dpl-docs/views/layout.dt b/dpl-docs/views/layout.dt
@@ -16,6 +16,7 @@ html(lang='en-US')
     link(rel='stylesheet', href='#{root_dir}css/style.css')
     link(rel='stylesheet', href='#{root_dir}css/print.css', media='print')
     link(rel='stylesheet', href='#{root_dir}css/cssmenu.css')
+    link(rel='stylesheet', href='#{root_dir}css/ddox.css')
     link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
     link(rel='shortcut icon', href='#{root_dir}favicon.ico')
     script(type="text/javascript", src="#{root_dir}prettify/prettify.js")
@@ -41,6 +42,7 @@ html(lang='en-US')
           |             
           span#search-query
             input#q(name='q', placeholder='Search')
+            input#symbolSearch(style="display: none", type="text", name="symbolSearch", placeholder="API Search", onchange="performSymbolSearch(80);", onkeypress="this.onchange();", onpaste="this.onchange();", oninput="this.onchange();", autofocus)
           span#search-dropdown
             select#sitesearch(name='sitesearch', size='1')
               option(value='dlang.org') Entire D Site
@@ -53,9 +55,6 @@ html(lang='en-US')
               i.fa.fa-search
               span go
 
-      #symbolSearchPane(style="display: none")
-        input#symbolSearch(type="text", name="symbolSearch", placeholder="API Search", onchange="performSymbolSearch(80);", onkeypress="this.onchange();", onpaste="this.onchange();", oninput="this.onchange();", autofocus)
-
       #cssmenu
         ul
           li

diff --git a/js/ddox.js b/js/ddox.js
@@ -3,6 +3,16 @@ function setupDdox()
 	$(".tree-view").children(".package").click(toggleTree);
 	$(".tree-view.collapsed").children("ul").hide();
 	$("#symbolSearch").attr("tabindex", "1000");
+
+	updateSearchBox();
+	$('#sitesearch').change(updateSearchBox);
+}
+
+function updateSearchBox()
+{
+	var ddox = $('#sitesearch').val() == "dlang.org/library";
+	$('#q').toggle(!ddox);
+	$('#symbolSearch').toggle(ddox);
 }
 
 function toggleTree()