swagger-api · jonesdhtx · Feb 9, 2016 · Feb 9, 2016 · Feb 9, 2016 · Feb 9, 2016
diff --git a/dist/css/print.css b/dist/css/print.css
@@ -82,7 +82,7 @@
 .swagger-section pre .vhdl .attribute,
 .swagger-section pre .clojure .attribute,
 .swagger-section pre .coffeescript .property {
-  color: #8888ff;
+  color: #88F;
 }
 .swagger-section pre .keyword,
 .swagger-section pre .id,

diff --git a/dist/css/screen.css b/dist/css/screen.css
@@ -82,7 +82,7 @@
 .swagger-section pre .vhdl .attribute,
 .swagger-section pre .clojure .attribute,
 .swagger-section pre .coffeescript .property {
-  color: #8888ff;
+  color: #88F;
 }
 .swagger-section pre .keyword,
 .swagger-section pre .id,
@@ -1231,8 +1231,10 @@
   cursor: pointer;
 }
 .swagger-section #header {
-  background-color: #89bf04;
+  background-image: url(../images/bg-nav.jpg);
+  border-bottom: 1px solid #e6e7e8;
   padding: 14px;
+  display: none;
 }
 .swagger-section #input_baseUrl {
   width: 400px;
@@ -1275,12 +1277,11 @@
   background-color: #547f00;
 }
 .swagger-section #header #logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../images/logo_small.png) no-repeat left center;
+  background-image: url(../images/leisurelink_logo.png);
+  background-position: left center;
+  background-repeat: no-repeat;
+  background-size: contain;
   padding: 20px 0 20px 40px;
-  color: white;
 }
 .swagger-section #content_message {
   margin: 10px 15px;

diff --git a/dist/images/bg-nav.jpg b/dist/images/bg-nav.jpg
diff --git a/dist/images/favicon-16x16.png b/dist/images/favicon-16x16.png
diff --git a/dist/images/favicon-32x32.png b/dist/images/favicon-32x32.png
diff --git a/dist/images/favicon.ico b/dist/images/favicon.ico
diff --git a/dist/images/leisurelink_logo.png b/dist/images/leisurelink_logo.png
diff --git a/dist/index.html b/dist/index.html
@@ -1,4 +1,14 @@
+<!--
 
+  WARNING:
+
+  LEISURELINK pulls in swagger-ui through @leisurelink/hapi-swaggered-ui which templates this file!
+
+  Any changes here are for stand-alone local development only - and will be bypassed when served through hapi-swaggered
+
+  To make changes to index - update @leisurelink/hapi-swaggered-ui/templates/index.hbs
+
+-->
 <!DOCTYPE html>
 <html>
 <head>
@@ -31,11 +41,13 @@
 
   <script type="text/javascript">
     $(function () {
+      $('#header').css('display', /embed=true/.test(window.location.search) ? 'none' : 'block');
+
       var url = window.location.search.match(/url=([^&]+)/);
       if (url && url.length > 1) {
         url = decodeURIComponent(url[1]);
       } else {
-        url = "http://petstore.swagger.io/v2/swagger.json";
+        url = "/specs/v2/leisurelink-v2-public-api.demo.json";
       }
 
       // Pre load translate...
@@ -52,7 +64,7 @@
               clientId: "your-client-id",
               clientSecret: "your-client-secret-if-required",
               realm: "your-realms",
-              appName: "your-app-name", 
+              appName: "your-app-name",
               scopeSeparator: ",",
               additionalQueryStringParams: {}
             });
@@ -109,16 +121,18 @@
 <body class="swagger-section">
 <div id='header'>
   <div class="swagger-ui-wrap">
-    <a id="logo" href="http://swagger.io">swagger</a>
-    <form id='api_selector'>
-      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
-      <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-      <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>
-    </form>
+    <div id="logo"></div>
   </div>
 </div>
 
 <div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
+<div class="swagger-ui-wrap">
+  <form id='api_selector'>
+    <!-- <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div> -->
+    <div class='input'><input placeholder="Enter your apiKey here..." id="input_apiKey" name="apiKey" type="text"/></div>
+    <!-- <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div> -->
+  </form>
+</div>
 <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
 </body>
 </html>
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
@@ -1,6 +1,6 @@
 /**
- * swagger-ui - Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API
- * @version v2.1.4
+ * @leisurelink/swagger-ui - Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API
+ * @version v1.0.2+2.1.4
  * @link http://swagger.io
  * @license Apache-2.0
  */

diff --git a/dist/swagger-ui.min.js b/dist/swagger-ui.min.js
diff --git a/package.json b/package.json
@@ -1,14 +1,18 @@
 {
-  "name": "swagger-ui",
+  "name": "@leisurelink/swagger-ui",
   "author": "Tony Tam <[email protected]>",
   "contributors": [
     {
       "name": "Mohsen Azimi",
       "email": "[email protected]"
+    },
+    {
+      "name": "David Jones",
+      "email": "[email protected]"
     }
   ],
   "description": "Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API",
-  "version": "2.1.4",
+  "version": "1.0.2+2.1.4",
   "homepage": "http://swagger.io",
   "license": "Apache-2.0",
   "main": "dist/swagger-ui.js",
@@ -18,11 +22,12 @@
     "prejshint": "gulp",
     "jshint": "jshint .",
     "pretest": "npm run jshint",
+    "preversion": "\n#############\nnpm version does not support semver build-meta, you must version manually\n#############\n",
     "test": "mocha"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/swagger-api/swagger-ui.git"
+    "url": "https://github.com/leisurelink/swagger-ui.git"
   },
   "readmeFilename": "README.md",
   "devDependencies": {

diff --git a/src/main/html/css/print.css b/src/main/html/css/print.css
@@ -82,7 +82,7 @@
 .swagger-section pre .vhdl .attribute,
 .swagger-section pre .clojure .attribute,
 .swagger-section pre .coffeescript .property {
-  color: #8888ff;
+  color: #88F;
 }
 .swagger-section pre .keyword,
 .swagger-section pre .id,

diff --git a/src/main/html/css/screen.css b/src/main/html/css/screen.css
@@ -82,7 +82,7 @@
 .swagger-section pre .vhdl .attribute,
 .swagger-section pre .clojure .attribute,
 .swagger-section pre .coffeescript .property {
-  color: #8888ff;
+  color: #88F;
 }
 .swagger-section pre .keyword,
 .swagger-section pre .id,
@@ -1231,8 +1231,10 @@
   cursor: pointer;
 }
 .swagger-section #header {
-  background-color: #89bf04;
+  background-image: url(../images/bg-nav.jpg);
+  border-bottom: 1px solid #e6e7e8;
   padding: 14px;
+  display: none;
 }
 .swagger-section #input_baseUrl {
   width: 400px;
@@ -1275,12 +1277,11 @@
   background-color: #547f00;
 }
 .swagger-section #header #logo {
-  font-size: 1.5em;
-  font-weight: bold;
-  text-decoration: none;
-  background: transparent url(../images/logo_small.png) no-repeat left center;
+  background-image: url(../images/leisurelink_logo.png);
+  background-position: left center;
+  background-repeat: no-repeat;
+  background-size: contain;
   padding: 20px 0 20px 40px;
-  color: white;
 }
 .swagger-section #content_message {
   margin: 10px 15px;

diff --git a/src/main/html/images/bg-nav.jpg b/src/main/html/images/bg-nav.jpg
diff --git a/src/main/html/images/favicon-16x16.png b/src/main/html/images/favicon-16x16.png
diff --git a/src/main/html/images/favicon-32x32.png b/src/main/html/images/favicon-32x32.png
diff --git a/src/main/html/images/favicon.ico b/src/main/html/images/favicon.ico
diff --git a/src/main/html/images/leisurelink_logo.png b/src/main/html/images/leisurelink_logo.png
diff --git a/src/main/html/index.html b/src/main/html/index.html
@@ -1,4 +1,14 @@
+<!--
 
+  WARNING:
+
+  LEISURELINK pulls in swagger-ui through @leisurelink/hapi-swaggered-ui which templates this file!
+
+  Any changes here are for stand-alone local development only - and will be bypassed when served through hapi-swaggered
+
+  To make changes to index - update @leisurelink/hapi-swaggered-ui/templates/index.hbs
+
+-->
 <!DOCTYPE html>
 <html>
 <head>
@@ -31,11 +41,13 @@
 
   <script type="text/javascript">
     $(function () {
+      $('#header').css('display', /embed=true/.test(window.location.search) ? 'none' : 'block');
+
       var url = window.location.search.match(/url=([^&]+)/);
       if (url && url.length > 1) {
         url = decodeURIComponent(url[1]);
       } else {
-        url = "http://petstore.swagger.io/v2/swagger.json";
+        url = "/specs/v2/leisurelink-v2-public-api.demo.json";
       }
 
       // Pre load translate...
@@ -52,7 +64,7 @@
               clientId: "your-client-id",
               clientSecret: "your-client-secret-if-required",
               realm: "your-realms",
-              appName: "your-app-name", 
+              appName: "your-app-name",
               scopeSeparator: ",",
               additionalQueryStringParams: {}
             });
@@ -109,16 +121,18 @@
 <body class="swagger-section">
 <div id='header'>
   <div class="swagger-ui-wrap">
-    <a id="logo" href="http://swagger.io">swagger</a>
-    <form id='api_selector'>
-      <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>
-      <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-      <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>
-    </form>
+    <div id="logo"></div>
   </div>
 </div>
 
 <div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
+<div class="swagger-ui-wrap">
+  <form id='api_selector'>
+    <!-- <div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div> -->
+    <div class='input'><input placeholder="Enter your apiKey here..." id="input_apiKey" name="apiKey" type="text"/></div>
+    <!-- <div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div> -->
+  </form>
+</div>
 <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
 </body>
 </html>
diff --git a/src/main/less/screen.less b/src/main/less/screen.less
@@ -76,8 +76,10 @@
   }
 
   #header {
-    background-color: #89bf04;
+    background-image: url(../images/bg-nav.jpg);
+    border-bottom: 1px solid #e6e7e8;
     padding: 14px;
+    display: none;
   }
 
   #input_baseUrl { width: 400px; }
@@ -122,12 +124,11 @@
   }
 
   #header #logo {
-    font-size: 1.5em;
-    font-weight: bold;
-    text-decoration: none;
-    background: transparent url(../images/logo_small.png) no-repeat left center;
+    background-image: url(../images/leisurelink_logo.png);
+    background-position: left center;
+    background-repeat: no-repeat;
+    background-size: contain;
     padding: 20px 0 20px 40px;
-    color: white;
   }
 
   #content_message {
@@ -141,7 +142,7 @@
     text-align: center;
     padding-top: 10px;
   }
-  
+
   .swagger-collapse:before {
     content: "-";
   }