Merge branch 'master' of github.com:pose/swagger-ui

Conflicts:
	lib/swagger.js

src/main/template/operation.handlebars

@@ -7,7 +7,7 @@
                     <a href='#!/{{resourceName}}/{{nickname}}_{{httpMethod}}' class="toggleOperation">{{httpMethod}}</a>
                   </span>
                   <span class='path'>
-                    <a href='#!/{{resourceName}}/{{nickname}}_{{httpMethod}}' class="toggleOperation">{{pathJson}}</a>
+                    <a href='#!/{{resourceName}}/{{nickname}}_{{httpMethod}}' class="toggleOperation">{{path}}</a>
                   </span>
                 </h3>
                 <ul class='options'>
@@ -21,15 +21,24 @@
                 <h4>Implementation Notes</h4>
                 <p>{{{notes}}}</p>
                 {{/if}}
+                {{#if responseClass}}
+                    <h4>Response Class</h4>
+                    {{#if responseClassSignature}}
+                        <p><span class="model-signature">{{{responseClassSignature}}}</span></p>
+                    {{else}}
+                        <p>{{{responseClass}}}</p>
+                    {{/if}}
+                {{/if}}
                 <form accept-charset='UTF-8' class='sandbox'>
                     <div style='margin:0;padding:0;display:inline'></div>
                     <h4>Parameters</h4>
                     <table class='fullwidth'>
                         <thead>
                         <tr>
-                            <th>Parameter</th>
-                            <th>Value</th>
-                            <th>Description</th>
+                            <th style="width: 100px; max-width: 100px" >Parameter</th>
+                            <th style="width: 310px; max-width: 310px">Value</th>
+                            <th style="width: 200px; max-width: 200px">Description</th>
+                            <th style="width: 320px; max-width: 330px">Data Type</th>
                         </tr>
                         </thead>
                         <tbody class="operation-params">

src/main/template/param.handlebars

@@ -17,5 +17,8 @@
 	{{/if}}
 
 </td>
-<td width='500'>{{{description}}}</td>
+<td>{{{description}}}</td>
+<td>
+    <span class="model-signature">{{{signature}}}</span>
+</td>
 

src/main/template/param_list.handlebars

@@ -17,5 +17,5 @@
         {{/each}}
     </select>
 </td>
-<td width='500'>{{{description}}}</td>
-
+<td>{{{description}}}</td>
+<td><span class="model-signature">{{{signature}}}</span></td>

src/main/template/param_readonly.handlebars

@@ -6,5 +6,5 @@
         {{defaultValue}}
     {{/if}}
 </td>
-<td width='500'>{{{description}}}</td>
-
+<td>{{{description}}}</td>
+<td><span class="model-signature">{{{signature}}}</span></td>

src/main/template/param_readonly_required.handlebars

@@ -6,4 +6,5 @@
         {{defaultValue}}
     {{/if}}
 </td>
-<td width='500'>{{{description}}}</td>
+<td>{{{description}}}</td>
+<td><span class="model-signature">{{{signature}}}</span></td>

src/main/template/param_required.handlebars

@@ -15,6 +15,7 @@
 		{{/if}}
 	{{/if}}
 </td>
-<td width='500'>
+<td>
     <strong>{{{description}}}</strong>
 </td>
+<td><span class="model-signature">{{{signature}}}</span></td>