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

Merged from develop_2.0

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "swagger-ui",
   "main": "dist/index.html",
-  "version": "2.1.4-M2",
+  "version": "2.1.5-M2",
   "authors": [
     "Mohsen Azimi <me@azimi.me>"
   ],

dist/css/print.css

@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }

dist/css/screen.css

@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }

dist/index.html

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

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.4-M2",
+  "version": "2.1.5-M2",
   "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.5-M2"
+    "swagger-client": "2.1.6-M2"
   }
 }

src/main/html/css/print.css

@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }

src/main/html/css/screen.css

@@ -1069,6 +1069,9 @@
 .swagger-section .swagger-ui-wrap form.form_box p strong {
   color: black;
 }
+.swagger-section .swagger-ui-wrap .operation-status td.markdown > p:last-child {
+  padding-bottom: 0;
+}
 .swagger-section .title {
   font-style: bold;
 }

src/main/html/index.html

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

src/main/javascript/SwaggerUi.js

@@ -90,7 +90,9 @@ window.SwaggerUi = Backbone.Router.extend({
     if (url && url.indexOf('http') !== 0) {
       url = this.buildUrl(window.location.href.toString(), url);
     }
-
+    if(this.api) {
+      this.options.authorizations = this.api.clientAuthorizations;
+    }
     this.options.url = url;
     this.headerView.update(url);
 

src/main/less/specs.less

@@ -1085,6 +1085,10 @@
             }
         }
     }
+
+    .operation-status td.markdown > p:last-child {
+        padding-bottom: 0;
+    }
 }
 
 }

src/main/template/param_list.handlebars

@@ -24,6 +24,6 @@
     {{/each}}
   </select>
 </td>
-<td class="markdown">{{{description}}}</td>
+<td class="markdown">{{#if required}}<strong>{{/if}}{{{description}}}{{#if required}}</strong>{{/if}}</td>
 <td>{{{paramType}}}</td>
 <td><span class="model-signature"></span></td>

src/main/template/status_code.handlebars

@@ -1,5 +1,5 @@
 <td width='15%' class='code'>{{code}}</td>
-<td>{{{message}}}</td>
+<td class="markdown">{{{message}}}</td>
 <td width='50%'><span class="model-signature" /></td>
 <td class="headers">
   <table>