From 9b58ed5430578b4cd801c030dc1c29c7107fd616 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Mon, 19 Nov 2012 19:51:28 -0800
Subject: [PATCH] redo of PR #88, #89, #90

---
 src/main/html/css/screen.css      | 14 +++++++-------
 src/main/javascript/doc.js        | 22 +++++++++++++---------
 src/main/template/main.handlebars |  7 +++++--
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/html/css/screen.css b/src/main/html/css/screen.css
index ea3ac3f0..94815fd7 100644
--- a/src/main/html/css/screen.css
+++ b/src/main/html/css/screen.css
@@ -1145,9 +1145,9 @@ body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operatio
     display: block;
     margin: 0 0 0 0;
     padding: 0;
-    background-color: #faebf2;
+    background-color: #FCE9E3;
     border: 1px solid black;
-    border-color: #f0cecb;
+    border-color: #F5D5C3;
 }
 
 body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 {
@@ -1168,7 +1168,7 @@ body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operatio
 
 body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
     text-transform: uppercase;
-    background-color: #993300;
+    background-color: #D38042;
     text-decoration: none;
     color: white;
     display: inline-block;
@@ -1228,12 +1228,12 @@ body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operatio
 
 body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
     border-right-color: #f0cecb;
-    color: #993300;
+    color: #D38042;
     font-size: 0.9em;
 }
 
 body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
-    color: #993300;
+    color: #D38042;
     text-decoration: none;
 }
 
@@ -1263,7 +1263,7 @@ body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operatio
 }
 
 body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
-    color: #993300;
+    color: #D38042;
     font-size: 1.1em;
     margin: 0;
     padding: 15px 0 5px 0px;
@@ -1271,7 +1271,7 @@ body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operatio
 
 body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content form input[type='text'].error {
     outline: 2px solid black;
-    outline-color: #cc0000;
+    outline-color: #F5D5C3;
 }
 
 body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header {
diff --git a/src/main/javascript/doc.js b/src/main/javascript/doc.js
index 9b55a658..53fd5092 100644
--- a/src/main/javascript/doc.js
+++ b/src/main/javascript/doc.js
@@ -115,7 +115,7 @@ var Docs = {
 	},
 
 	toggleEndpointListForResource: function(resource) {
-		var elem = $('li[id^=resource_' + Docs.escapeResourceName(resource) + '] ul.endpoints');
+		var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
 		if (elem.is(':visible')) {
 			Docs.collapseEndpointListForResource(resource);
 		} else {
@@ -125,24 +125,27 @@ var Docs = {
 
 	// Expand resource
 	expandEndpointListForResource: function(resource) {
-		$('[id^=resource_' + resource + ']').addClass('active');
+		var resource = Docs.escapeResourceName(resource);
+		$('li#resource_' + resource).addClass('active');
 
-		var elem = $('li[id^=resource_' + Docs.escapeResourceName(resource) + '] ul.endpoints');
+		var elem = $('li#resource_' + resource + ' ul.endpoints');
 		elem.slideDown();
 	},
 
 	// Collapse resource and mark as explicitly closed
 	collapseEndpointListForResource: function(resource) {
-		$('[id^=resource_' + resource + ']').removeClass('active');
+		var resource = Docs.escapeResourceName(resource);
+		$('li#resource_' + resource).removeClass('active');
 
-		var elem = $('li[id^=resource_' + Docs.escapeResourceName(resource) + '] ul.endpoints');
+		var elem = $('li#resource_' + resource + ' ul.endpoints');
 		elem.slideUp();
 	},
 
 	expandOperationsForResource: function(resource) {
 		// Make sure the resource container is open..
 		Docs.expandEndpointListForResource(resource);
-		$('li[id^=resource_' + Docs.escapeResourceName(resource) + '] li.operation div.content').each(function() {
+
+		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
 			Docs.expandOperation($(this));
 		});
 	},
@@ -150,13 +153,14 @@ var Docs = {
 	collapseOperationsForResource: function(resource) {
 		// Make sure the resource container is open..
 		Docs.expandEndpointListForResource(resource);
-		$('li[id^=resource_' + Docs.escapeResourceName(resource) + '] li.operation div.content').each(function() {
+
+		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
 			Docs.collapseOperation($(this));
 		});
 	},
 
 	escapeResourceName: function(resource) {
-		 return resource.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g, "\\$&")
+		return resource.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g, "\\$&");
 	},
 
 	expandOperation: function(elem) {
@@ -167,4 +171,4 @@ var Docs = {
 		elem.slideUp();
 	}
 
-};
\ No newline at end of file
+};
diff --git a/src/main/template/main.handlebars b/src/main/template/main.handlebars
index 24e637bf..91b5ce9b 100644
--- a/src/main/template/main.handlebars
+++ b/src/main/template/main.handlebars
@@ -6,6 +6,9 @@
     <div class="footer">
         <br>
         <br>
-        <h4 style="color: #999">[<span style="font-variant: small-caps">base url</span>: {{basePath}}]</h4>
+        <h4 style="color: #999">[ <span style="font-variant: small-caps">base url</span>: {{basePath}}
+        {{#if apiVersion}}
+        , <span style="font-variant: small-caps">api version</span>: {{apiVersion}}
+        {{/if}}]</h4>
     </div>
-</div>
\ No newline at end of file
+</div>
-- 
GitLab