Merge pull request #1345 from swagger-api/develop_2.0

merge from develop 2.0 for release

Dockerfile

@@ -1,5 +1,5 @@
 ###
-# swagger-ui-builder - https://github.com/wordnik/swagger-ui/
+# swagger-ui-builder - https://github.com/swagger-api/swagger-ui/
 # Container for building the swagger-ui static site
 #
 # Build: docker build -t swagger-ui-builder .

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 Reverb Technologies, Inc.
+Copyright 2015 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -20,7 +20,7 @@ The Swagger Specification has undergone 4 revisions since initial creation in 20
 
 Swagger UI Version | Release Date | Swagger Spec compatibility | Notes | Status
 ------------------ | ------------ | -------------------------- | ----- | ------
-2.1.1-M2           | 2015-04-16   | 1.1, 1.2, 2.0              | [master](https://github.com/swagger-api/swagger-ui) |
+2.1.1              | 2015-06-06   | 1.1, 1.2, 2.0              | [master](https://github.com/swagger-api/swagger-ui) |
 2.0.24             | 2014-09-12   | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24) |
 1.0.13             | 2013-03-08   | 1.1, 1.2 | [tag v1.0.13](https://github.com/swagger-api/swagger-ui/tree/v1.0.13) |
 1.0.1              | 2011-10-11   | 1.0, 1.1 | [tag v1.0.1](https://github.com/swagger-api/swagger-ui/tree/v1.0.1)   |
@@ -96,8 +96,9 @@ operationsSorter | Apply a sort to the operation list of each API. It can be 'al
 onComplete | This is a callback function parameter which can be passed to be notified of when SwaggerUI has completed rendering successfully.
 onFailure | This is a callback function parameter which can be passed to be notified of when SwaggerUI encountered a failure was unable to render.
 highlightSizeThreshold | Any size response below this threshold will be highlighted syntactically, attempting to highlight large responses can lead to browser hangs, not including a threshold will default to highlight all returned responses.
-supportedSubmitMethods | An array of of the HTTP operations that will have the 'Try it out!` option. An empty array disables all operations. This does not filter the operations from the display.
+supportedSubmitMethods | An array of of the HTTP operations that will have the 'Try it out!' option. An empty array disables all operations. This does not filter the operations from the display.
 oauth2RedirectUrl | OAuth redirect URL
+showRequestHeaders | Whether or not to show the headers that were sent when making a request via the 'Try it out!' option. Defaults to `false`.
 
 * All other parameters are explained in greater detail below
 
@@ -228,7 +229,7 @@ Plsee see [releases](https://github.com/swagger-api/swagger-ui/releases) for cha
 
 ## License
 
-Copyright 2011-2015 Reverb technologies, Inc.
+Copyright 2011-2015 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "swagger-ui",
   "main": "dist/index.html",
-  "version": "2.1.5-M2",
+  "version": "2.1.0",
   "authors": [
     "Mohsen Azimi <me@azimi.me>"
   ],
@@ -13,7 +13,7 @@
     "Swagger",
     "API"
   ],
-  "license": "Copyright 2015 Reverb Technologies, Inc.",
+  "license": "Copyright 2015 SmartBear Software",
   "homepage": "http://swagger.io",
   "private": true,
   "ignore": [

dist/css/print.css

@@ -426,6 +426,17 @@
 .swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
   font-weight: bold;
 }
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
+  display: inline;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
+  display: block;
+  content: '';
+}
+.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
+  margin-right: -3px;
+}
 .swagger-section .swagger-ui-wrap .model-signature .propName {
   font-weight: bold;
 }

dist/css/screen.css

@@ -426,6 +426,17 @@
 .swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
   font-weight: bold;
 }
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
+  display: inline;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
+  display: block;
+  content: '';
+}
+.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
+  margin-right: -3px;
+}
 .swagger-section .swagger-ui-wrap .model-signature .propName {
   font-weight: bold;
 }

dist/css/style.css

@@ -0,0 +1,250 @@
+.swagger-section #header a#logo {
+  font-size: 1.5em;
+  font-weight: bold;
+  text-decoration: none;
+  background: transparent url(../images/logo.png) no-repeat left center;
+  padding: 20px 0 20px 40px;
+}
+#text-head {
+  font-size: 80px;
+  font-family: 'Roboto', sans-serif;
+  color: #ffffff;
+  float: right;
+  margin-right: 20%;
+}
+.navbar-fixed-top .navbar-nav {
+  height: auto;
+}
+.navbar-fixed-top .navbar-brand {
+  height: auto;
+}
+.navbar-header {
+  height: auto;
+}
+.navbar-inverse {
+  background-color: #000;
+  border-color: #000;
+}
+#navbar-brand {
+  margin-left: 20%;
+}
+.navtext {
+  font-size: 10px;
+}
+.h1,
+h1 {
+  font-size: 60px;
+}
+.navbar-default .navbar-header .navbar-brand {
+  color: #a2dfee;
+}
+/* tag titles */
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
+  color: #393939;
+  font-family: 'Arvo', serif;
+  font-size: 1.5em;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
+  color: black;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
+  color: #525252;
+  padding-left: 0px;
+  display: block;
+  clear: none;
+  float: left;
+  font-family: 'Arvo', serif;
+  font-weight: bold;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #0A0A0A;
+}
+.container1 {
+  width: 1500px;
+  margin: auto;
+  margin-top: 0;
+  background-image: url('../images/shield.png');
+  background-repeat: no-repeat;
+  background-position: -40px -20px;
+  margin-bottom: 210px;
+}
+.container-inner {
+  width: 1200px;
+  margin: auto;
+  background-color: rgba(223, 227, 228, 0.75);
+  padding-bottom: 40px;
+  padding-top: 40px;
+  border-radius: 15px;
+}
+.header-content {
+  padding: 0;
+  width: 1000px;
+}
+.title1 {
+  font-size: 80px;
+  font-family: 'Vollkorn', serif;
+  color: #404040;
+  text-align: center;
+  padding-top: 40px;
+  padding-bottom: 100px;
+}
+#icon {
+  margin-top: -18px;
+}
+.subtext {
+  font-size: 25px;
+  font-style: italic;
+  color: #08b;
+  text-align: right;
+  padding-right: 250px;
+}
+.bg-primary {
+  background-color: #00468b;
+}
+.navbar-default .nav > li > a,
+.navbar-default .nav > li > a:focus {
+  color: #08b;
+}
+.navbar-default .nav > li > a,
+.navbar-default .nav > li > a:hover {
+  color: #08b;
+}
+.navbar-default .nav > li > a,
+.navbar-default .nav > li > a:focus:hover {
+  color: #08b;
+}
+.text-faded {
+  font-size: 25px;
+  font-family: 'Vollkorn', serif;
+}
+.section-heading {
+  font-family: 'Vollkorn', serif;
+  font-size: 45px;
+  padding-bottom: 10px;
+}
+hr {
+  border-color: #00468b;
+  padding-bottom: 10px;
+}
+.description {
+  margin-top: 20px;
+  padding-bottom: 200px;
+}
+.description li {
+  font-family: 'Vollkorn', serif;
+  font-size: 25px;
+  color: #525252;
+  margin-left: 28%;
+  padding-top: 5px;
+}
+.gap {
+  margin-top: 200px;
+}
+.troubleshootingtext {
+  color: rgba(255, 255, 255, 0.7);
+  padding-left: 30%;
+}
+.troubleshootingtext li {
+  list-style-type: circle;
+  font-size: 25px;
+  padding-bottom: 5px;
+}
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+}
+.block.response_body.json:hover {
+  cursor: pointer;
+}
+.backdrop {
+  color: blue;
+}
+#myModal {
+  height: 100%;
+}
+.modal-backdrop {
+  bottom: 0;
+  position: fixed;
+}
+.curl {
+  padding: 10px;
+  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+  font-size: 0.9em;
+  max-height: 400px;
+  margin-top: 5px;
+  overflow-y: auto;
+  background-color: #fcf6db;
+  border: 1px solid #e5e0c6;
+  border-radius: 4px;
+}
+.curl_title {
+  font-size: 1.1em;
+  margin: 0;
+  padding: 15px 0 5px;
+  font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
+  font-weight: 500;
+  line-height: 1.1;
+}
+.footer {
+  display: none;
+}
+.swagger-section .swagger-ui-wrap h2 {
+  padding: 0;
+}
+h2 {
+  margin: 0;
+  margin-bottom: 5px;
+}
+.markdown p {
+  font-size: 15px;
+  font-family: 'Arvo', serif;
+}
+.swagger-section .swagger-ui-wrap .code {
+  font-size: 15px;
+  font-family: 'Arvo', serif;
+}
+.swagger-section .swagger-ui-wrap b {
+  font-family: 'Arvo', serif;
+}
+#signin:hover {
+  cursor: pointer;
+}
+.dropdown-menu {
+  padding: 15px;
+}
+.navbar-right .dropdown-menu {
+  left: 0;
+  right: auto;
+}
+#signinbutton {
+  width: 100%;
+  height: 32px;
+  font-size: 13px;
+  font-weight: bold;
+  color: #08b;
+}
+.navbar-default .nav > li .details {
+  color: #000000;
+  text-transform: none;
+  font-size: 15px;
+  font-weight: normal;
+  font-family: 'Open Sans', sans-serif;
+  font-style: italic;
+  line-height: 20px;
+  top: -2px;
+}
+.navbar-default .nav > li .details:hover {
+  color: black;
+}
+#signout {
+  width: 100%;
+  height: 32px;
+  font-size: 13px;
+  font-weight: bold;
+  color: #08b;
+}

dist/index.html

@@ -52,7 +52,8 @@
           log("Unable to Load SwaggerUI");
         },
         docExpansion: "none",
-        apisSorter: "alpha"
+        apisSorter: "alpha",
+        showRequestHeaders: false
       });
 
       function addApiKeyAuthorization(){

gulpfile.js

@@ -92,7 +92,8 @@ gulp.task('less', ['clean'], function() {
     .src([
       './src/main/less/screen.less',
       './src/main/less/print.less',
-      './src/main/less/reset.less'
+      './src/main/less/reset.less',
+      './src/main/less/style.less'
     ])
     .pipe(less())
     .on('error', log)

lang/en.js

@@ -42,7 +42,6 @@ window.SwaggerTranslator.learn({
     "fetching resource list":"fetching resource list",
     "Explore":"Explore",
     "Show Swagger Petstore Example Apis":"Show Swagger Petstore Example Apis",
-    "Show Wordnik Developer Apis":"Show Wordnik Developer Apis",
     "Can't read from server.  It may not have the appropriate access-control-origin settings.":"Can't read from server.  It may not have the appropriate access-control-origin settings.",
     "Please specify the protocol for":"Please specify the protocol for",
     "Can't read swagger JSON from":"Can't read swagger JSON from",

lang/ru.js

@@ -42,7 +42,6 @@ window.SwaggerTranslator.learn({
     "fetching resource list":"Получение ресурсов",
     "Explore":"Поехали",
     "Show Swagger Petstore Example Apis":"Показать примеры АПИ",
-    "Show Wordnik Developer Apis":"Показать АПИ Wordnik Developer",
     "Can't read from server.  It may not have the appropriate access-control-origin settings.":"Не удается получить ответ от сервера. Возможно, какая-то лажа с настройками доступа",
     "Please specify the protocol for":"Пожалуйста, укажите протогол для",
     "Can't read swagger JSON from":"Не получается прочитать swagger json из",

lang/translator.js

@@ -29,7 +29,7 @@ window.SwaggerTranslator = {
     },
 
     _tryTranslate: function(word) {
-      return this._words[word] !== undefined ? this._words[word] : word;
+      return this._words[$.trim(word)] !== undefined ? this._words[$.trim(word)] : word;
     },
 
     learn: function(wordsMap) {

package.json

@@ -8,7 +8,7 @@
     }
   ],
   "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.5-M2",
+  "version": "2.1.0",
   "homepage": "http://swagger.io",
   "license": "Apache 2.0",
   "main": "dist/swagger-ui.js",
@@ -50,6 +50,6 @@
     "less": "^2.4.0",
     "mocha": "^2.1.0",
     "selenium-webdriver": "^2.45.0",
-    "swagger-client": "2.1.6-M2"
+    "swagger-client": "2.1.1"
   }
 }

src/main/html/css/print.css

@@ -426,6 +426,17 @@
 .swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
   font-weight: bold;
 }
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
+  display: inline;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
+  display: block;
+  content: '';
+}
+.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
+  margin-right: -3px;
+}
 .swagger-section .swagger-ui-wrap .model-signature .propName {
   font-weight: bold;
 }

src/main/html/css/screen.css

@@ -426,6 +426,17 @@
 .swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
   font-weight: bold;
 }
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:first-child,
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:last-child {
+  display: inline;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .propDesc.markdown > p:not(:first-child):before {
+  display: block;
+  content: '';
+}
+.swagger-section .swagger-ui-wrap .model-signature .description span:last-of-type.propDesc.markdown > p:only-child {
+  margin-right: -3px;
+}
 .swagger-section .swagger-ui-wrap .model-signature .propName {
   font-weight: bold;
 }

src/main/html/css/style.css

@@ -0,0 +1,250 @@
+.swagger-section #header a#logo {
+  font-size: 1.5em;
+  font-weight: bold;
+  text-decoration: none;
+  background: transparent url(../images/logo.png) no-repeat left center;
+  padding: 20px 0 20px 40px;
+}
+#text-head {
+  font-size: 80px;
+  font-family: 'Roboto', sans-serif;
+  color: #ffffff;
+  float: right;
+  margin-right: 20%;
+}
+.navbar-fixed-top .navbar-nav {
+  height: auto;
+}
+.navbar-fixed-top .navbar-brand {
+  height: auto;
+}
+.navbar-header {
+  height: auto;
+}
+.navbar-inverse {
+  background-color: #000;
+  border-color: #000;
+}
+#navbar-brand {
+  margin-left: 20%;
+}
+.navtext {
+  font-size: 10px;
+}
+.h1,
+h1 {
+  font-size: 60px;
+}
+.navbar-default .navbar-header .navbar-brand {
+  color: #a2dfee;
+}
+/* tag titles */
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
+  color: #393939;
+  font-family: 'Arvo', serif;
+  font-size: 1.5em;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
+  color: black;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
+  color: #525252;
+  padding-left: 0px;
+  display: block;
+  clear: none;
+  float: left;
+  font-family: 'Arvo', serif;
+  font-weight: bold;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #0A0A0A;
+}
+.container1 {
+  width: 1500px;
+  margin: auto;
+  margin-top: 0;
+  background-image: url('../images/shield.png');
+  background-repeat: no-repeat;
+  background-position: -40px -20px;
+  margin-bottom: 210px;
+}
+.container-inner {
+  width: 1200px;
+  margin: auto;
+  background-color: rgba(223, 227, 228, 0.75);
+  padding-bottom: 40px;
+  padding-top: 40px;
+  border-radius: 15px;
+}
+.header-content {
+  padding: 0;
+  width: 1000px;
+}
+.title1 {
+  font-size: 80px;
+  font-family: 'Vollkorn', serif;
+  color: #404040;
+  text-align: center;
+  padding-top: 40px;
+  padding-bottom: 100px;
+}
+#icon {
+  margin-top: -18px;
+}
+.subtext {
+  font-size: 25px;
+  font-style: italic;
+  color: #08b;
+  text-align: right;
+  padding-right: 250px;
+}
+.bg-primary {
+  background-color: #00468b;
+}
+.navbar-default .nav > li > a,
+.navbar-default .nav > li > a:focus {
+  color: #08b;
+}
+.navbar-default .nav > li > a,
+.navbar-default .nav > li > a:hover {
+  color: #08b;
+}
+.navbar-default .nav > li > a,
+.navbar-default .nav > li > a:focus:hover {
+  color: #08b;
+}
+.text-faded {
+  font-size: 25px;
+  font-family: 'Vollkorn', serif;
+}
+.section-heading {
+  font-family: 'Vollkorn', serif;
+  font-size: 45px;
+  padding-bottom: 10px;
+}
+hr {
+  border-color: #00468b;
+  padding-bottom: 10px;
+}
+.description {
+  margin-top: 20px;
+  padding-bottom: 200px;
+}
+.description li {
+  font-family: 'Vollkorn', serif;
+  font-size: 25px;
+  color: #525252;
+  margin-left: 28%;
+  padding-top: 5px;
+}
+.gap {
+  margin-top: 200px;
+}
+.troubleshootingtext {
+  color: rgba(255, 255, 255, 0.7);
+  padding-left: 30%;
+}
+.troubleshootingtext li {
+  list-style-type: circle;
+  font-size: 25px;
+  padding-bottom: 5px;
+}
+.overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+}
+.block.response_body.json:hover {
+  cursor: pointer;
+}
+.backdrop {
+  color: blue;
+}
+#myModal {
+  height: 100%;
+}
+.modal-backdrop {
+  bottom: 0;
+  position: fixed;
+}
+.curl {
+  padding: 10px;
+  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+  font-size: 0.9em;
+  max-height: 400px;
+  margin-top: 5px;
+  overflow-y: auto;
+  background-color: #fcf6db;
+  border: 1px solid #e5e0c6;
+  border-radius: 4px;
+}
+.curl_title {
+  font-size: 1.1em;
+  margin: 0;
+  padding: 15px 0 5px;
+  font-family: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
+  font-weight: 500;
+  line-height: 1.1;
+}
+.footer {
+  display: none;
+}
+.swagger-section .swagger-ui-wrap h2 {
+  padding: 0;
+}
+h2 {
+  margin: 0;
+  margin-bottom: 5px;
+}
+.markdown p {
+  font-size: 15px;
+  font-family: 'Arvo', serif;
+}
+.swagger-section .swagger-ui-wrap .code {
+  font-size: 15px;
+  font-family: 'Arvo', serif;
+}
+.swagger-section .swagger-ui-wrap b {
+  font-family: 'Arvo', serif;
+}
+#signin:hover {
+  cursor: pointer;
+}
+.dropdown-menu {
+  padding: 15px;
+}
+.navbar-right .dropdown-menu {
+  left: 0;
+  right: auto;
+}
+#signinbutton {
+  width: 100%;
+  height: 32px;
+  font-size: 13px;
+  font-weight: bold;
+  color: #08b;
+}
+.navbar-default .nav > li .details {
+  color: #000000;
+  text-transform: none;
+  font-size: 15px;
+  font-weight: normal;
+  font-family: 'Open Sans', sans-serif;
+  font-style: italic;
+  line-height: 20px;
+  top: -2px;
+}
+.navbar-default .nav > li .details:hover {
+  color: black;
+}
+#signout {
+  width: 100%;
+  height: 32px;
+  font-size: 13px;
+  font-weight: bold;
+  color: #08b;
+}

src/main/html/index.html

@@ -52,7 +52,8 @@
           log("Unable to Load SwaggerUI");
         },
         docExpansion: "none",
-        apisSorter: "alpha"
+        apisSorter: "alpha",
+        showRequestHeaders: false
       });
 
       function addApiKeyAuthorization(){

src/main/javascript/SwaggerUi.js

@@ -91,7 +91,7 @@ window.SwaggerUi = Backbone.Router.extend({
       url = this.buildUrl(window.location.href.toString(), url);
     }
     if(this.api) {
-      this.options.authorizations = this.api.clientAuthorizations;
+      this.options.authorizations = this.api.clientAuthorizations.authz;
     }
     this.options.url = url;
     this.headerView.update(url);
@@ -175,7 +175,7 @@ window.SwaggerUi = Backbone.Router.extend({
     }
     $('#message-bar').removeClass('message-fail');
     $('#message-bar').addClass('message-success');
-    $('#message-bar').html(data);
+    $('#message-bar').text(data);
   },
 
   // shows message in red
@@ -186,7 +186,7 @@ window.SwaggerUi = Backbone.Router.extend({
     $('#message-bar').removeClass('message-success');
     $('#message-bar').addClass('message-fail');
 
-    var val = $('#message-bar').html(data);
+    var val = $('#message-bar').text(data);
 
     if (this.options.onFailure) {
       this.options.onFailure(data);
@@ -200,6 +200,10 @@ window.SwaggerUi = Backbone.Router.extend({
     $('.markdown').each(function(){
       $(this).html(marked($(this).html()));
     });
+
+    $('.propDesc', '.model-signature .description').each(function () {
+      $(this).html(marked($(this).html())).addClass('markdown');
+    });
   }
 
 });

src/main/javascript/doc.js

@@ -93,11 +93,13 @@ window.Docs = {
 
 		switch (fragments.length) {
 			case 1:
+        if (fragments[0].length > 0) { // prevent matching "#/"
           // Expand all operations for the resource and scroll to it
           var dom_id = 'resource_' + fragments[0];
 
           Docs.expandEndpointListForResource(fragments[0]);
           $("#"+dom_id).slideto({highlight: false});
+        }
 				break;
 			case 2:
 				// Refer to the endpoint DOM element, e.g. #words_get_search

src/main/javascript/helpers/handlebars.js

@@ -7,7 +7,7 @@ Handlebars.registerHelper('sanitize', function(html) {
 });
 
 Handlebars.registerHelper('renderTextParam', function(param) {
-    var result, type = 'text';
+    var result, type = 'text', idAtt = '';
     var isArray = param.type.toLowerCase() === 'array' || param.allowMultiple;
     var defaultValue = isArray && Array.isArray(param.default) ? param.default.join('\n') : param.default;
 
@@ -19,8 +19,12 @@ Handlebars.registerHelper('renderTextParam', function(param) {
         type = 'password';
     }
 
+    if(param.valueId) {
+        idAtt = ' id=\'' + param.valueId + '\'';
+    }
+
     if(isArray) {
-        result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + param.name + '\'';
+        result = '<textarea class=\'body-textarea' + (param.required ? ' required' : '') + '\' name=\'' + param.name + '\'' + idAtt;
         result += ' placeholder=\'Provide multiple values in new lines' + (param.required ? ' (at least one required).' : '.') + '\'>';
         result += defaultValue + '</textarea>';
     } else {
@@ -29,7 +33,7 @@ Handlebars.registerHelper('renderTextParam', function(param) {
           parameterClass += ' required';
         }
         result = '<input class=\'' + parameterClass + '\' minlength=\'' + (param.required ? 1 : 0) + '\'';
-        result += ' name=\'' + param.name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'';
+        result += ' name=\'' + param.name +'\' placeholder=\'' + (param.required ? '(required)' : '') + '\'' + idAtt;
         result += ' type=\'' + type + '\' value=\'' + defaultValue + '\'/>';
     }
     return new Handlebars.SafeString(result);

src/main/javascript/view/ContentTypeView.js

@@ -4,10 +4,8 @@ SwaggerUi.Views.ContentTypeView = Backbone.View.extend({
   initialize: function() {},
 
   render: function(){
+  	this.model.contentTypeId = 'ct' + Math.random();
     $(this.el).html(Handlebars.templates.content_type(this.model));
-
-    $('label[for=contentType]', $(this.el)).text('Response Content Type');
-
     return this;
   }
 });

src/main/javascript/view/HeaderView.js

@@ -3,7 +3,6 @@
 SwaggerUi.Views.HeaderView = Backbone.View.extend({
   events: {
     'click #show-pet-store-icon'    : 'showPetStore',
-    'click #show-wordnik-dev-icon'  : 'showWordnikDev',
     'click #explore'                : 'showCustom',
     'keyup #input_baseUrl'          : 'showCustomOnKeyup',
     'keyup #input_apiKey'           : 'showCustomOnKeyup'
@@ -17,12 +16,6 @@ SwaggerUi.Views.HeaderView = Backbone.View.extend({
     });
   },
 
-  showWordnikDev: function(){
-    this.trigger('update-swagger-ui', {
-      url: 'http://api.wordnik.com/v4/resources.json'
-    });
-  },
-
   showCustomOnKeyup: function(e){
     if (e.keyCode === 13) {
       this.showCustom();

src/main/javascript/view/MainView.js

@@ -54,23 +54,19 @@ SwaggerUi.Views.MainView = Backbone.View.extend({
       });
     }
 
-    if (this.model.swaggerVersion === '2.0') {
     if ('validatorUrl' in opts.swaggerOptions) {
-
       // Validator URL specified explicitly
       this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
-
     } else if (this.model.url.indexOf('localhost') > 0) {
-
       // Localhost override
       this.model.validatorUrl = null;
-
     } else {
-
       // Default validator
-        if(window.location.protocol.indexOf('http') === 0) {
+      if(window.location.protocol === 'https') {
-          this.model.validatorUrl = window.location.protocol + '//online.swagger.io/validator';
+        this.model.validatorUrl = 'https://online.swagger.io/validator';
       }
+      else {
+        this.model.validatorUrl = 'http://online.swagger.io/validator';
       }
     }
   },

src/main/javascript/view/OperationView.js

@@ -10,6 +10,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     'click .toggleOperation'  : 'toggleOperationContent',
     'mouseenter .api-ic'      : 'mouseEnter',
     'mouseout .api-ic'        : 'mouseExit',
+    'dblclick .curl'          : 'selectText',
   },
 
   initialize: function(opts) {
@@ -22,6 +23,24 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     return this;
   },
 
+  selectText: function(event) {
+      var doc = document,
+          text = event.target.firstChild,
+          range,
+          selection;
+      if (doc.body.createTextRange) {
+          range = document.body.createTextRange();
+          range.moveToElementText(text);
+          range.select();
+      } else if (window.getSelection) {
+          selection = window.getSelection();        
+          range = document.createRange();
+          range.selectNodeContents(text);
+          selection.removeAllRanges();
+          selection.addRange(range);
+      }
+  },
+
   mouseEnter: function(e) {
     var elem = $(this.el).find('.content');
     var x = e.pageX;
@@ -160,6 +179,10 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
         signature: this.model.responseClassSignature
       };
     }
+    var opts = this.options.swaggerOptions;
+    if (opts.showRequestHeaders) {
+      this.model.showRequestHeaders = true;
+    }
     $(this.el).html(Handlebars.templates.operation(this.model));
     if (signatureModel) {
       responseSignatureView = new SwaggerUi.Views.SignatureView({
@@ -241,7 +264,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
   // Note: copied from CoffeeScript compiled file
   // TODO: redactor
   submitOperation: function(e) {
-    var error_free, form, isFileUpload, l, len, len1, len2, m, map, n, o, opts, ref1, ref2, ref3, val;
+    var error_free, form, isFileUpload, map, opts;
     if (e !== null) {
       e.preventDefault();
     }
@@ -290,7 +313,8 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
       }
     });
     if (error_free) {
-      map = {};
+      map = this.getInputMap(form);
+      isFileUpload = this.isFileUpload(form);
       opts = {
         parent: this
       };
@@ -299,7 +323,27 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
           opts[key] = this.options.swaggerOptions[key];
         }
       }
-      isFileUpload = false;
+      opts.responseContentType = $('div select[name=responseContentType]', $(this.el)).val();
+      opts.requestContentType = $('div select[name=parameterContentType]', $(this.el)).val();
+      $('.response_throbber', $(this.el)).show();
+      if (isFileUpload) {
+        $('.request_url', $(this.el)).html('<pre></pre>');
+        $('.request_url pre', $(this.el)).text(this.invocationUrl);
+
+        opts.useJQuery = true;
+        map.parameterContentType = 'multipart/form-data';
+
+        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);
+      } else {
+        this.map = map;
+        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);
+      }
+    }
+  },
+
+  getInputMap: function (form) {
+    var map, ref1, l, len, o, ref2, m, len1, val, ref3, n, len2;
+    map = {};
     ref1 = form.find('input');
     for (l = 0, len = ref1.length; l < len; l++) {
       o = ref1[l];
@@ -308,7 +352,6 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
       }
       if (o.type === 'file') {
         map[o.name] = o.files[0];
-          isFileUpload = true;
       }
     }
     ref2 = form.find('textarea');
@@ -327,94 +370,27 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
         map[o.name] = val;
       }
     }
-      opts.responseContentType = $('div select[name=responseContentType]', $(this.el)).val();
+    return map;
-      opts.requestContentType = $('div select[name=parameterContentType]', $(this.el)).val();
+  },
-      $('.response_throbber', $(this.el)).show();
+
-      if (isFileUpload) {
+  isFileUpload: function (form) {
-        return this.handleFileUpload(map, form);
+    var ref1, l, len, o;
-      } else {
+    var isFileUpload = false;
-        return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);
+    ref1 = form.find('input');
+    for (l = 0, len = ref1.length; l < len; l++) {
+      o = ref1[l];
+      if (o.type === 'file') {
+        isFileUpload = true;
       }
     }
+    return isFileUpload;
   },
 
   success: function(response, parent) {
     parent.showCompleteStatus(response);
   },
 
-  // Note: This is compiled code
-  // TODO: Refactor
-  handleFileUpload: function(map, form) {
-    var bodyParam, el, headerParams, l, len, len1, len2, len3, m, n, o, p, param, params, ref1, ref2, ref3, ref4;
-    ref1 = form.serializeArray();
-    for (l = 0, len = ref1.length; l < len; l++) {
-      o = ref1[l];
-      if ((o.value !== null) && jQuery.trim(o.value).length > 0) {
-        map[o.name] = o.value;
-      }
-    }
-    bodyParam = new FormData();
-    params = 0;
-    ref2 = this.model.parameters;
-    for (m = 0, len1 = ref2.length; m < len1; m++) {
-      param = ref2[m];
-      if (param.paramType === 'form' || param['in'] === 'formData') {
-        if (param.type.toLowerCase() !== 'file' && map[param.name] !== void 0) {
-          bodyParam.append(param.name, map[param.name]);
-        }
-      }
-    }
-    headerParams = {};
-    ref3 = this.model.parameters;
-    for (n = 0, len2 = ref3.length; n < len2; n++) {
-      param = ref3[n];
-      if (param.paramType === 'header') {
-        headerParams[param.name] = map[param.name];
-      }
-    }
-    ref4 = form.find('input[type~="file"]');
-    for (p = 0, len3 = ref4.length; p < len3; p++) {
-      el = ref4[p];
-      if (typeof el.files[0] !== 'undefined') {
-        bodyParam.append($(el).attr('name'), el.files[0]);
-        params += 1;
-      }
-    }
-    this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), delete headerParams['Content-Type'], this.model.urlify(map, false)) : this.model.urlify(map, true);
-    $('.request_url', $(this.el)).html('<pre></pre>');
-    $('.request_url pre', $(this.el)).text(this.invocationUrl);
-
-    // TODO: don't use jQuery. Use SwaggerJS for handling the call.
-    var obj = {
-      type: this.model.method,
-      url: this.invocationUrl,
-      headers: headerParams,
-      data: bodyParam,
-      dataType: 'json',
-      contentType: false,
-      processData: false,
-      error: (function(_this) {
-        return function(data) {
-          return _this.showErrorStatus(_this.wrap(data), _this);
-        };
-      })(this),
-      success: (function(_this) {
-        return function(data) {
-          return _this.showResponse(data, _this);
-        };
-      })(this),
-      complete: (function(_this) {
-        return function(data) {
-          return _this.showCompleteStatus(_this.wrap(data), _this);
-        };
-      })(this)
-    };
-    jQuery.ajax(obj);
-    return false;
-    // end of file-upload nastiness
-  },
   // wraps a jquery response as a shred response
-
   wrap: function(data) {
    var h, headerArray, headers, i, l, len, o;
     headers = {};
@@ -669,20 +645,38 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
     $('.response', $(this.el)).slideDown();
     $('.response_hider', $(this.el)).show();
     $('.response_throbber', $(this.el)).hide();
-    var response_body_el = $('.response_body', $(this.el))[0];
+
+
+    //adds curl output
+    var curlCommand = this.model.asCurl(this.map);
+    curlCommand = curlCommand.replace('!', '&#33;');
+    $( '.curl', $(this.el)).html('<pre>' + curlCommand + '</pre>');
 
     // only highlight the response if response is less than threshold, default state is highlight response
     var opts = this.options.swaggerOptions;
-    if (opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold) {
+
+    if (opts.showRequestHeaders) {
+      var form = $('.sandbox', $(this.el)),
+        map = this.getInputMap(form),
+        requestHeaders = this.model.getHeaderParams(map);
+      delete requestHeaders['Content-Type'];
+      $('.request_headers', $(this.el)).html('<pre>' + _.escape(JSON.stringify(requestHeaders, null, '  ')).replace(/\n/g, '<br>') + '</pre>');
+    }
+
+    var response_body_el = $('.response_body', $(this.el))[0];
+    // only highlight the response if response is less than threshold, default state is highlight response
+    if (opts.highlightSizeThreshold && typeof response.data !== 'undefined' && response.data.length > opts.highlightSizeThreshold) {
       return response_body_el;
     } else {
       return hljs.highlightBlock(response_body_el);
     }
   },
 
-  toggleOperationContent: function() {
+  toggleOperationContent: function (event) {
     var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content'));
     if (elem.is(':visible')){
+      event.preventDefault();
+      $.bbq.pushState('#/', 2);
       Docs.collapseOperation(elem);
     } else {
       Docs.expandOperation(elem);

src/main/javascript/view/ParameterContentTypeView.js

@@ -4,10 +4,8 @@ SwaggerUi.Views.ParameterContentTypeView = Backbone.View.extend({
   initialize: function  () {},
 
   render: function(){
+    this.model.parameterContentTypeId = 'pct' + Math.random();
     $(this.el).html(Handlebars.templates.parameter_content_type(this.model));
-
-    $('label[for=parameterContentType]', $(this.el)).text('Parameter content type:');
-
     return this;
   }
 

src/main/javascript/view/ParameterView.js

@@ -30,7 +30,14 @@ SwaggerUi.Views.ParameterView = Backbone.View.extend({
     this.model.paramType = this.model.in || this.model.paramType;
     this.model.isBody = this.model.paramType === 'body' || this.model.in === 'body';
     this.model.isFile = type && type.toLowerCase() === 'file';
-    this.model.default = (this.model.default || this.model.defaultValue);
+
+    // Allow for default === false
+    if(typeof this.model.default === 'undefined') {
+      this.model.default = this.model.defaultValue;
+    }
+
+    this.model.hasDefault = (typeof this.model.default !== 'undefined');
+    this.model.valueId = 'm' + this.model.name + Math.random();
 
     if (this.model.allowableValues) {
       this.model.isList = true;

src/main/javascript/view/ResponseContentTypeView.js

@@ -4,10 +4,8 @@ SwaggerUi.Views.ResponseContentTypeView = Backbone.View.extend({
   initialize: function(){},
 
   render: function(){
+    this.model.responseContentTypeId = 'rct' + Math.random();
     $(this.el).html(Handlebars.templates.response_content_type(this.model));
-
-    $('label[for=responseContentType]', $(this.el)).text('Response Content Type');
-
     return this;
   }
 });

src/main/less/specs.less

@@ -321,6 +321,19 @@
                     }
                 }
             }
+            .propDesc.markdown {
+                > p:first-child,
+                > p:last-child {
+                    display: inline;
+                }
+                > p:not(:first-child):before {
+                    display: block;
+                    content: '';
+                }
+            }
+            span:last-of-type.propDesc.markdown > p:only-child {
+                margin-right: -3px; // otherwise there is a gap before the comma
+            }
         }
         .propName {
             font-weight: bold;

src/main/less/style.less

@@ -0,0 +1,311 @@
+
+
+.swagger-section #header a#logo {
+  font-size: 1.5em;
+  font-weight: bold;
+  text-decoration: none;
+  background: transparent url(../images/logo.png) no-repeat left center;
+  padding: 20px 0 20px 40px;
+}
+
+#text-head{
+	font-size: 80px;
+	font-family: 'Roboto', sans-serif;
+	color: #ffffff;
+	float: right;
+	margin-right: 20%;
+}
+
+.navbar-fixed-top .navbar-nav {
+    height:auto;
+}
+
+.navbar-fixed-top .navbar-brand {
+    height: auto;
+}
+
+.navbar-header {
+	height: auto;
+}
+
+.navbar-inverse {
+	background-color: #000;
+	border-color: #000;
+}
+
+#navbar-brand {
+	margin-left: 20%;
+
+}
+
+.navtext {
+	font-size: 10px;
+
+}
+
+.h1, h1 {
+	font-size: 60px;
+
+}
+
+
+
+.navbar-default .navbar-header .navbar-brand {
+	color: #a2dfee;
+}
+
+/* tag titles */
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
+	color: #393939;
+	font-family: 'Arvo', serif;
+	font-size: 1.5em;
+
+}
+
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
+  color: black;
+}
+
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
+  color: #525252;
+  padding-left: 0px;
+  display: block;
+  clear: none;
+  float: left;
+  font-family: 'Arvo', serif;
+  font-weight: bold;
+}
+
+.navbar-default .navbar-collapse, .navbar-default .navbar-form {
+  border-color: #0A0A0A;
+}
+
+.container1 {
+width: 1500px;
+margin: auto;
+margin-top: 0;
+background-image: url('../images/shield.png');
+background-repeat: no-repeat;
+background-position: -40px -20px;
+margin-bottom: 210px;
+}
+
+.container-inner {
+width: 1200px;
+margin: auto;
+background-color: rgba(223,227,228, 0.75);
+padding-bottom: 40px;
+padding-top: 40px;
+border-radius: 15px;
+
+}
+
+.header-content {
+	padding: 0;
+	width: 1000px;
+
+}
+
+.title1 {
+	font-size: 80px;
+	font-family: 'Vollkorn', serif;
+	color: #404040;
+	text-align: center;
+	padding-top: 40px;
+	padding-bottom: 100px;
+}
+
+#icon {
+	margin-top: -18px;
+}
+
+.subtext{
+	font-size: 25px;
+	font-style: italic;
+	color: #08b;
+	text-align: right;
+	padding-right: 250px;
+}
+
+.container-fluid {
+
+}
+
+.bg-primary {
+	background-color: #00468b;
+}
+
+.navbar-default .nav > li>a, .navbar-default .nav>li>a:focus {
+	color: #08b;
+}
+
+.navbar-default .nav > li>a, .navbar-default .nav>li>a:hover {
+	color: #08b;
+}
+
+.navbar-default .nav > li>a, .navbar-default .nav>li>a:focus:hover {
+	color: #08b;
+}
+
+.text-faded {
+	font-size: 25px;
+	font-family: 'Vollkorn', serif;
+}
+
+.section-heading{
+	font-family: 'Vollkorn', serif;
+	font-size: 45px;
+	padding-bottom: 10px;
+}
+
+hr {
+	border-color: #00468b;
+	padding-bottom: 10px;
+}
+
+.description {
+	margin-top: 20px;
+	padding-bottom: 200px;
+}
+.description li {
+	font-family: 'Vollkorn', serif;
+	font-size: 25px;
+	color: #525252;
+	margin-left: 28%;
+	padding-top: 5px;
+}
+
+.gap {
+	margin-top: 200px;
+}
+
+.troubleshootingtext {
+	color: rgba(255,255,255,.7);
+	padding-left: 30%;
+}
+
+.troubleshootingtext li {
+	list-style-type: circle;
+	font-size: 25px;
+	padding-bottom: 5px;
+}
+
+.overlay {
+    position:absolute;
+    top:0;
+    left:0;
+    width:100%;
+    height:100%;
+    z-index:1000;
+}
+
+.block.response_body.json:hover{
+	cursor: pointer;
+}
+
+.backdrop {
+	color: blue;
+}
+
+#myModal {
+	height: 100%;
+}
+
+.modal-backdrop {
+  bottom: 0;
+  position: fixed;
+}
+
+.curl {
+	padding: 10px;
+	font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+	font-size: 0.9em;
+  	max-height: 400px;
+  	margin-top: 5px;
+  	overflow-y: auto;
+  	background-color: #fcf6db;
+  	border: 1px solid #e5e0c6;
+  	border-radius: 4px;
+
+}
+
+.curl_title {
+	font-size: 1.1em;
+  	margin: 0;
+  	padding: 15px 0 5px;
+  	font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
+  	font-weight: 500;
+  	line-height: 1.1;
+}
+
+.footer {
+	display: none;
+}
+
+.swagger-section .swagger-ui-wrap h2 {
+	padding: 0;
+}
+
+h2 {
+	margin: 0;
+	margin-bottom: 5px;
+}
+
+.markdown p {
+	font-size: 15px;
+	font-family: 'Arvo', serif;
+}
+
+.swagger-section .swagger-ui-wrap .code {
+	font-size: 15px;
+	font-family: 'Arvo',serif;
+}
+
+.swagger-section .swagger-ui-wrap b {
+	font-family: 'Arvo',serif;
+}
+
+#signin:hover {
+	cursor: pointer;
+}
+
+.dropdown-menu {
+	padding: 15px;
+}
+
+.navbar-right .dropdown-menu {
+	left: 0;
+	right: auto;
+}
+
+#signinbutton {
+	width: 100%;
+	height: 32px;
+	font-size: 13px;
+	font-weight: bold;
+	color: #08b;
+}
+
+.navbar-default .nav > li .details {
+	color: #000000;
+	text-transform: none;
+	font-size: 15px;
+	font-weight: normal;
+	font-family: 'Open Sans', sans-serif;
+	font-style: italic;
+	line-height: 20px;
+	top: -2px;
+}
+
+.navbar-default .nav > li .details:hover {
+	color: black;
+
+}
+
+#signout {
+	width: 100%;
+	height: 32px;
+	font-size: 13px;
+	font-weight: bold;
+	color: #08b;
+}

src/main/template/apikey_button_view.handlebars

@@ -1,9 +1,9 @@
 <!--div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div-->
 <div class='auth_container' id='apikey_container'>
   <div class='key_input_container'>
-    <div class='auth_label'>{{keyName}}</div>
+    <div class='auth_label'><label for='input_apiKey_entry'>{{keyName}}</label></div>
-    <input placeholder="api_key" class="auth_input" id="input_apiKey_entry" name="apiKey" type="text"/>
+    <input placeholder='api_key' class='auth_input' id='input_apiKey_entry' name='apiKey' type='text'/>
-    <div class='auth_submit'><a class='auth_submit_button' id="apply_api_key" href="#">apply</a></div>
+    <div class='auth_submit'><a class='auth_submit_button' id='apply_api_key' href='#''>apply</a></div>
   </div>
 </div>
 

src/main/template/basic_auth_button_view.handlebars

@@ -1,9 +1,9 @@
 <div class='auth_button' id='basic_auth_button'><img class='auth_icon' src='images/password.jpeg'></div>
 <div class='auth_container' id='basic_auth_container'>
   <div class='key_input_container'>
-    <div class="auth_label">Username</div>
+    <div class="auth_label"><label for="input_username">Username</label></div>
     <input placeholder="username" class="auth_input" id="input_username" name="username" type="text"/>
-    <div class="auth_label">Password</div>
+    <div class="auth_label"><label for="password">Password</label></div>
     <input placeholder="password" class="auth_input" id="input_password" name="password" type="password"/>
     <div class='auth_submit'><a class='auth_submit_button' id="apply_basic_auth" href="#">apply</a></div>
   </div>

src/main/template/content_type.handlebars

@@ -1,5 +1,5 @@
-<label for="contentType"></label>
+<label for="{{contentTypeId}}">Response Content Type</label>
-<select name="contentType">
+<select name="contentType" id="{{contentTypeId}}">
 {{#if produces}}
   {{#each produces}}
 	<option value="{{{this}}}">{{{this}}}</option>

src/main/template/main.handlebars

@@ -3,7 +3,6 @@
   <div class="info_title">{{info.title}}</div>
   <div class="info_description markdown">{{{info.description}}}</div>
   {{#if externalDocs}}
-  <h5>More documentations</h5>
   <p>{{externalDocs.description}}</p>
   <a href="{{externalDocs.url}}" target="_blank">{{externalDocs.url}}</a>
   {{/if}}

src/main/template/operation.handlebars

@@ -92,8 +92,14 @@
           {{/if}}
         </form>
         <div class='response' style='display:none'>
+          <h4>Curl</h4>
+          <div class='block curl'></div>
           <h4>Request URL</h4>
           <div class='block request_url'></div>
+          {{#if showRequestHeaders}}
+          <h4>Request Headers</h4>
+          <div class='block request_headers'></div>
+          {{/if}}
           <h4>Response Body</h4>
           <div class='block response_body'></div>
           <h4>Response Code</h4>

src/main/template/param.handlebars

@@ -1,24 +1,24 @@
-<td class='code'>{{name}}</td>
+<td class='code'><label for='{{valueId}}'>{{name}}</label></td>
 <td>
 
 	{{#if isBody}}
 		{{#if isFile}}
-			<input type="file" name='{{name}}'/>
+			<input type="file" name='{{name}}' id='{{valueId}}'/>
 			<div class="parameter-content-type" />
 		{{else}}
 			{{#if default}}
-				<textarea class='body-textarea' name='{{name}}'>{{default}}</textarea>
+				<textarea class='body-textarea' name='{{name}}' id='{{valueId}}'>{{default}}</textarea>
         <br />
         <div class="parameter-content-type" />
 			{{else}}
-				<textarea class='body-textarea' name='{{name}}'></textarea>
+				<textarea class='body-textarea' name='{{name}}' id='{{valueId}}'></textarea>
 				<br />
 				<div class="parameter-content-type" />
 			{{/if}}
 		{{/if}}
 	{{else}}
 		{{#if isFile}}
-			<input type="file" name='{{name}}'/>
+			<input type="file" name='{{name}}' id='{{valueId}}'/>
 			<div class="parameter-content-type" />
 		{{else}}
 			{{#renderTextParam this}}

src/main/template/param_list.handlebars

@@ -1,27 +1,17 @@
-{{#if required}}
+<td class='code{{#if required}} required{{/if}}'><label for='{{valueId}}'>{{name}}</labe></td>
-<td class='code required'>{{name}}</td>
-{{else}}
-<td class='code'>{{name}}</td>
-{{/if}}
 <td>
-  <select {{#isArray this}} multiple='multiple'{{/isArray}} class={{#if required}}'parameter required'{{else}}'parameter'{{/if}} name='{{name}}'>
+  <select {{#isArray this}} multiple="multiple"{{/isArray}} class="parameter {{#if required}} required {{/if}}" name="{{name}}" id="{{valueId}}">
-    {{#if required}}
+
-    {{else}}
+    {{#unless required}}
-      {{#if default}}
+      <option {{#unless hasDefault}}  selected="" {{/unless}} value=''></option>
-      {{else}}
+    {{/unless}}
-        {{#isArray this}}
+
-        {{else}}
-          <option selected="" value=''></option>
-        {{/isArray}}
-      {{/if}}
-    {{/if}}
     {{#each allowableValues.descriptiveValues}}
-      {{#if isDefault}}
+
-        <option selected="" value='{{value}}'>{{value}} (default)</option>
+      <option {{#if isDefault}} selected=""  {{/if}}  value='{{value}}'> {{value}} {{#if isDefault}} (default) {{/if}} </option>
-      {{else}}
+
-        <option value='{{value}}'>{{value}}</option>
-      {{/if}}
     {{/each}}
+
   </select>
 </td>
 <td class="markdown">{{#if required}}<strong>{{/if}}{{{description}}}{{#if required}}</strong>{{/if}}</td>

src/main/template/param_readonly.handlebars

@@ -1,7 +1,7 @@
-<td class='code'>{{name}}</td>
+<td class='code'><label for='{{valueId}}'>{{name}}</label></td>
 <td>
     {{#if isBody}}
-        <textarea class='body-textarea' readonly='readonly' name='{{name}}'>{{default}}</textarea>
+        <textarea class='body-textarea' readonly='readonly' name='{{name}}' id='{{valueId}}'>{{default}}</textarea>
     {{else}}
         {{#if default}}
             {{default}}

src/main/template/param_readonly_required.handlebars

@@ -1,7 +1,7 @@
-<td class='code required'>{{name}}</td>
+<td class='code required'><label for='{{valueId}}'>{{name}}</label></td>
 <td>
     {{#if isBody}}
-        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
+        <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='{{name}}' id='{{valueId}}'>{{default}}</textarea>
     {{else}}
         {{#if default}}
             {{default}}

src/main/template/param_required.handlebars

@@ -1,22 +1,22 @@
-<td class='code required'>{{name}}</td>
+<td class='code required'><label for='{{valueId}}'>{{name}}</label></td>
 <td>
 	{{#if isBody}}
 		{{#if isFile}}
-			<input type="file" name='{{name}}'/>
+			<input type="file" name='{{name}}' id='{{valueId}}'/>
 		{{else}}
 			{{#if default}}
-				<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
+				<textarea class='body-textarea required' placeholder='(required)' name='{{name}}' id="{{valueId}}">{{default}}</textarea>
         <br />
         <div class="parameter-content-type" />
 			{{else}}
-				<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'></textarea>
+				<textarea class='body-textarea required' placeholder='(required)' name='{{name}}' id='{{valueId}}'></textarea>
 				<br />
 				<div class="parameter-content-type" />
 			{{/if}}
 		{{/if}}
 	{{else}}
 		{{#if isFile}}
-			<input class='parameter' class='required' type='file' name='{{name}}'/>
+			<input class='parameter' class='required' type='file' name='{{name}}' id='{{valueId}}'/>
 		{{else}}
 			{{#renderTextParam this}}
 			{{/renderTextParam}}

src/main/template/parameter_content_type.handlebars

@@ -1,5 +1,5 @@
-<label for="parameterContentType"></label>
+<label for="{{parameterContentTypeId}}">Parameter content type:</label>
-<select name="parameterContentType">
+<select name="parameterContentType" id="{{parameterContentTypeId}}">
 {{#if consumes}}
   {{#each consumes}}
   <option value="{{{this}}}">{{{this}}}</option>

src/main/template/response_content_type.handlebars

@@ -1,5 +1,5 @@
-<label for="responseContentType"></label>
+<label for="{{responseContentTypeId}}">Response Content Type</label>
-<select name="responseContentType">
+<select name="responseContentType" id="{{responseContentTypeId}}">
 {{#if produces}}
   {{#each produces}}
   <option value="{{{this}}}">{{{this}}}</option>

test/specs/v1.2/petstore/api-docs.json

@@ -52,7 +52,7 @@
   "info": {
     "title": "Swagger Sample App",
     "description": "This is a sample server Petstore server.  You can find out more about Swagger \n    at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample,\n    you can use the api key \"special-key\" to test the authorization filters",
-    "termsOfServiceUrl": "http://helloreverb.com/terms/",
+    "termsOfServiceUrl": "http://swagger.io/terms/",
     "contact": "apiteam@swagger.io",
     "license": "Apache 2.0",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.html"

test/specs/v2/petstore.json

@@ -4,7 +4,7 @@
     "description": "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
     "version": "1.0.0",
     "title": "Swagger Petstore",
-    "termsOfService": "http://helloreverb.com/terms/",
+    "termsOfService": "http://swagger.io/terms/",
     "contact": {
       "url": "http://swagger.io",
       "name": "Your pals at Swagger",