Continue layout work

doc/build.js

@@ -2,7 +2,7 @@ var panino = require("panino");
 
 var srcPath = process.cwd() + "/../lib/ace";
 
-panino.main(["--path=" + srcPath, "-o", "./out/", "-a", "./additionalObjs.json", "-t", "Ace API Documentation", "--skin", "./resources/ace/"], function(err) {
+panino.main(["--path=" + srcPath, "-o", "./out/", "-a", "./additionalObjs.json", "-t", "Ace API", "--skin", "./resources/ace/"], function(err) {
     if (err) {
         console.error(err);
         process.exit(-1);

doc/resources/ace/skeleton/csses/ace_api.css

@@ -3,10 +3,8 @@
 */
 body {
     min-width: 1010px;
-}
-body {
-    background: #edf5fa url(../images/main_bg.png) 0 0 repeat;
-    color: #262626
+    color: #2D2D2D;
+    background: #EDF5FA url(../images/main_bg.png) 0 0 repeat;
 }
 
 ul {
@@ -22,14 +20,6 @@ a, a:hover {
 }
 
 code {
-/*    background-color: #fce68c;*/
-    
-/*    font-size: 11px;
-    line-height: 16px;
-    font-family: 'Ubuntu Mono',Monaco,Consolas,monospace !important;
-    padding: 0;
-    
-    */
     font-size: 12px;
     line-height: 16px;
     font-family: 'Ubuntu Mono',Monaco,Consolas,monospace !important;
@@ -39,6 +29,7 @@ code {
     display: inline-block;
     padding: 0 4px;
     margin: 2px 1px;
+    color: inherit;
 }
 
 pre {
@@ -96,22 +87,8 @@ blockquote p{
   Header and shoulders
 */
 
-#topSection {
-    margin: 0 auto;
-    width: 1000px;
-    position : relative;
-}
-
-#topSection .leftnav{
-    width : 286px;
-}
-
-#topSection .dropdown {
-    margin-right: 0px;
-}
-
-#topSection .versions {
-    margin-right: 0;
+ul.topLinks {
+	left: 290px;
 }
 
 .small_win #topSection {
@@ -149,30 +126,9 @@ a.brand {
 
 .ace_logo {
 	position: absolute;
-	top: 8px;
+	top: 45px;
 	z-index: 20000;
-	left: 400px;
-}
-
-.masthead {
-    background: #000000 url(../images/header_back.png) repeat-x 0 bottom;
-    background-position-y: 70px;
-}
-.masthead .container {
-    width: 680px;
-    padding-left: 60px;
-    margin: 0 auto;
-}
-.jumbotron {
-	min-width: 1000px;
-	position: relative;
-	height: 200px;
-	top: -36px;
-}
-
-.jumbotron .inner {
-    padding: 45px 0;
-    padding-top: 75px;
+	left: 210px;
 }
 
 .c9-sponsor {
@@ -198,6 +154,12 @@ a.brand {
     text-shadow: 0 1px 1px rgba(0, 0, 0, .3);
 }
 
+.headerTitle {
+	position: relative;
+	top: 100px;
+	left: 250px;
+}
+
 /*
   Menu venue
 */
@@ -225,7 +187,7 @@ ul.menu {
 
 /* need specificity to "beat" the above colors */
 .menu li .menu-item a.currentItem, .menuTwo li .menu-item  {
-    color: #618100;
+    color: #0072bc;
 }
 
 /*
@@ -383,6 +345,11 @@ ul.menu {
 .tabs a.menu:after, .tabs .dropdown-toggle:after {
     margin-top: 22px;
 }
+
+.dropdown .caret {
+	margin-top: 14px;
+}
+
 /*.backToMDN {
     position: absolute;
     right: 0px;
@@ -528,12 +495,26 @@ ul.tabs .double ul, ul.tabs .triple ul, ul.tabs .quad ul{
   Center content (the "real stuff")
 */
 
-.content .container {
-    background: url(../images/sidebar-border.png) repeat-y 95px 0;
-    padding-bottom : 50px;
+.content .row {
+	width: 1000px;
+	margin-left: auto;
+	margin-right: auto;
 }
-.container-fluid {
-    border-top: 1px solid #fffffe;
+
+.content .centerpiece {
+	background: url(../images/sidebar_border.png) repeat-y 180px 0;
+	padding-bottom: 50px;
+}
+
+header.filler {
+	position: relative;
+	background: #EDF5FA;
+	height: 50px;
+	width: 100%;
+}
+
+#container {
+    background: #edf5fa url(../images/main_bg.png) 0 0 repeat;
 }
 /*
 .container-fluid .row-fluid {
@@ -542,6 +523,10 @@ ul.tabs .double ul, ul.tabs .triple ul, ul.tabs .quad ul{
     margin-right: auto;
 }*/
 
+.sidebarContainer {
+	margin-right: 25px;
+}
+
 #sidebar {
     margin-top: 9px;
     /*background: url(../images/sidebar-border.png) repeat-y right 0;*/
@@ -556,26 +541,24 @@ ul.tabs .double ul, ul.tabs .triple ul, ul.tabs .quad ul{
     color: #404040;
 }
 
-#sidebar #well
-
-#content {
+#documentation {
     padding-bottom: 10px;
 }
 
-#content article.article {
+#documentation article.article {
 /*    border-bottom: 1px solid #e9e9e9;*/
     border-top: 1px solid #e9e9e9;
     padding: 16px 10px 2px;
 }
-div#content article:last-child {
+div#documentation article:last-child {
     border-bottom: 1px solid #e9e9e9;
     padding-bottom: 40px;
 }
-#content article.article.methodToggleOpen {
-    background: url(../images/method-bg.png) repeat 0 0;
+#documentation article.article.methodToggleOpen {
+    background: url(../images/method_bg.png) repeat 0 0;
     margin : 0 0 10px 0;
 }
-#content article:first-child {
+#documentation article:first-child {
     border:none;
 }
 
@@ -689,7 +672,11 @@ li.signature {
     cursor: pointer;
 }
 .signature-call a {
-    color: #859c59;
+    color: #8e487e;
+}
+
+.sigClassName {
+	display: none;
 }
 
 .eventObjName {
@@ -741,9 +728,6 @@ li.signature {
 .alias:hover, .related-to:hover {
     opacity: 0.8;
     cursor: pointer;
-}
-.memberContent {
-  
 }
 .memberContent .title {
     
@@ -806,9 +790,12 @@ table td, .bordered-table th + th, .bordered-table td + td, .bordered-table th +
 .zebra-striped tbody tr:hover td, .zebra-striped tbody tr:hover th {
 }
 
-.argument-list{
+.argument-list {
     margin-bottom : 13px;
 }
+.argName {
+	font-style: italic;
+}
 
 table td{
     padding: 8px 10px 8px 10px;
@@ -816,15 +803,19 @@ table td{
 /*
   Everyday I'm togglin'
 */
-#content h3 {
+.mainContent {
+	padding-top: 10px;
+	float: right
+}
+
+#documentation h3 {
     font-size: 24px;
     margin-top: 5px; 
-/*    margin: 10px 0;*/
 }
-#content h3.methodToggle {
+#documentation h3.methodToggle {
     margin: 0;
 }
-#content h3.sectionHeader {
+#documentation h3.sectionHeader {
     margin: 10px 0 17px 0;
     line-height : 24px;
 }

doc/resources/ace/skeleton/javascripts/ux.js

@@ -48,6 +48,7 @@ $(function () {
     // init prettyprint
     $('pre > code').addClass('prettyprint');
     prettyPrint();
+    
 });
 
 $(document).ready(function () {
@@ -86,7 +87,7 @@ $(document).ready(function () {
         var $classContent = $(this).closest('.classContent');
         
         $(this).scrollspy({
-            min: $classContent.position().top - 55,
+            min: $classContent.position().top,
             max: $classContent.position().top + $classContent.height(),
             onEnter: function (element, position) {
                 var $pagination = $(element);
@@ -135,7 +136,7 @@ $(document).ready(function () {
             }
         });
     });
-
+    
     $('span.methodClicker, article.article, h3.methodClicker').each(function () {
         var a = $(this);
         var constructorPos = a.attr("id").indexOf("new ");

doc/resources/ace/templates/layout.jade

@@ -10,17 +10,18 @@ include lib
 mixin head(title + " - " + fileName)
 
 body
-
+  
   mixin navBar
 
-  mixin header
+  header.filler
 
-  .container-fluid
-      .row-fluid
-        .span2.sidebarContainer
+  .container
+      .content
+       .row.centerpiece
+        .span3.offset6.sidebarContainer
           #sidebar
             include ace_menu.jade
-        .span10
+        .span9.mainContent
           #documentation
              mixin api()
 

doc/resources/ace/templates/lib.jade

@@ -141,12 +141,7 @@ mixin article(obj, parents)
 							-description = obj.description.substring(obj.short_description.length) // cut the short_desc out
 							descArray = description.split("\n#### ")
 
-							if obj.arguments
-								h4 Arguments
-									!= argumentTable(obj.arguments, ["argument-list", "zebra-striped", "bordered-table"])
-
 							if descArray[0].length && descArray[0] !== '' && descArray[0] !== '\n'
-								h4 Description
 								mixin markdown(descArray[0])
 
 							if obj.bound && ~obj.bound.indexOf('#')
@@ -160,15 +155,14 @@ mixin article(obj, parents)
 									!= link(obj.bound, ['link-short'], 'generic method')
 									|. If calling as generic, pass the instance in as the first argument.
 
-							- var r; // Probably inefficient; we want the Returns section under the Arguments, no matter where in source it's defined
-							- for (var a = 1; a < descArray.length; a++)
-								if (descArray[a].indexOf("Returns") >= 0)
-									mixin markdown("\n#### " + descArray[a])
-									r = a
+							if obj.arguments
+								h4 Arguments
+								!= argumentTable(obj.arguments, ["argument-list", "table", "table-striped", "table-bordered"])
 								
-							- for (var a = 1; a < descArray.length; a++)
-								if (a != r)
-									mixin markdown("\n#### " + descArray[a])			
+							
+							if obj.retDesc
+								h4 Returns
+								!= returnTable(obj.retDesc, ["return-list", "table", "table-striped", "table-bordered"])   
 
 	//- children
 	for child in obj.children.filter(function(x){return x.type === 'section'})

doc/resources/common_layout.jade

@@ -36,25 +36,20 @@ mixin head(guideTitle, additionalCSS)
 	script(src="#{dirPrefix}resources/javascripts/jquery.collapse.js")
 	script(src="#{dirPrefix}resources/javascripts/jquery.cookie.js")
 	script(src="#{dirPrefix}resources/javascripts/bootstrap-dropdown.js")
+	script(src="#{dirPrefix}resources/javascripts/jquery-scrollspy.js")
+	script(script src="#{dirPrefix}resources/javascripts/prettify-extension.js")
 
 mixin navBar
 	div.navbar.navbar-fixed-top
 		div.navbar-inner
 			div.container
+				ul.nav.topLinks
+					li#ace_site
+						a(href='http://ace.ajax.org') Ace
+					li#ace_api.active
+						a(href='http://ace.ajax.org/api') Ace API Reference
 				form(id='searchbox', action='', class='navbar-search pull-right')	
-					input(class='span3', name='query', type='text', placeholder="Search Documentation", title="Search across all the documentation")
-
-mixin header
-	header.jumbotron.masthead#overview
-		div.ace_logo
-			a(href="http://ace.ajax.org")
-				img(src="#{dirPrefix}resources/images/ace_logo.png", alt="Ace Logo")
-		.container-fluid
-			.row-fluid
-				.span2
-					 
-				.span10
-					h1 Ace API Reference
+					input(class='search-query span3', name='query', type='text', placeholder="Search", title="Search across all the documentation")
 
 mixin footer
 	footer#footer
@@ -67,7 +62,7 @@ mixin endingScripts
 	<script defer src="#{dirPrefix}resources/javascripts/plugins.js"></script>
 	<script defer src="#{dirPrefix}resources/javascripts/prettify.js"></script>
 	<script defer src="#{dirPrefix}resources/javascripts/prettify-extension.js"></script>
-	<script defer src="#{dirPrefix}resources/javascripts/script.js"></script>
+	<script defer src="#{dirPrefix}resources/javascripts/ux.js"></script>
 	<script defer src="#{dirPrefix}resources/javascripts/disqus-ext.js"></script>
 	<script defer src="#{dirPrefix}resources/javascripts/ga.js"></script>
 	//-<script defer src="tree.js"></script>
@@ -84,26 +79,7 @@ mixin identifyBuild(tree, type)
 		-dirPrefix = './'
 
 mixin markdown(text, inline)
-	html = markdown(text, inline)
-	!= restoreNotes(html)
-
--function restoreNotes(html)
-	-var noteORegex = new RegExp('<note>', "ig")
-	-var noteCRegex = new RegExp('</note>', "ig")
-	-var warningORegex = new RegExp('<warning>', "ig")
-	-var warningCRegex = new RegExp('</warning>', "ig")
-
-	if (html.match(noteORegex))
-		-html = html.replace(noteORegex, "<div class='alert-message block-message warning'>")
-	if (html.match(warningORegex))
-		-html = html.replace(warningORegex, "<div class='alert-message block-message error'>")
-
-	if (html.match(noteCRegex))
-		-html = html.replace(noteCRegex, "</div>")
-		if (html.match(warningCRegex))
-		-html = html.replace(warningCRegex, "</div>")
-
-	!= html
+	!= markdown(text, inline)
 
 mixin formatGHHref(url, type)
 	url = url.substring(url.indexOf("src/") + 4)