merged from develop_2.0

This commit is contained in:
Tony Tam
2015-02-01 02:27:43 -08:00
parent 1be0f9fa35
commit 038443fc22
87 changed files with 11991 additions and 14394 deletions

View File

@@ -1,4 +1,4 @@
<div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div>
<!--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>

View File

@@ -1,9 +1,11 @@
<div class='info' id='api_info'>
{{#if info}}
<div class="info_title">{{info.title}}</div>
<div class="info_description">{{{info.description}}}</div>
{{#if info.termsOfService}}<div class="info_tos"><a href="{{info.termsOfService}}">Terms of service</a></div>{{/if}}
{{#if info.contact}}<div class='info_contact'><a href="mailto:{{info.contact.name}}">Contact the developer</a></div>{{/if}}
<div class="info_description markdown">{{{info.description}}}</div>
{{#if info.termsOfServiceUrl}}<div class="info_tos"><a href="{{info.termsOfServiceUrl}}">Terms of service</a></div>{{/if}}
{{#if info.contact.name}}<div class='info_name'>Created by {{info.contact.name}}</div>{{/if}}
{{#if info.contact.url}}<div class='info_url'>See more at <a href="{{info.contact.url}}">{{info.contact.url}}</a></div>{{/if}}
{{#if info.contact.email}}<div class='info_email'><a href="mailto:{{info.contact.email}}?subject={{info.title}}">Contact the developer</a></div>{{/if}}
{{#if info.license}}<div class='info_license'><a href='{{info.license.url}}'>{{info.license.name}}</a></div>{{/if}}
{{/if}}
</div>

View File

@@ -22,7 +22,7 @@
{{/if}}
{{#if description}}
<h4>Implementation Notes</h4>
<p>{{{description}}}</p>
<p class="markdown">{{{description}}}</p>
{{/if}}
{{#oauth}}
<div class="auth">
@@ -41,7 +41,7 @@
</div>
{{/oauth}}
{{#if type}}
<h4>Response Class</h4>
<h4>Response Class (Status {{successCode}})</h4>
<p><span class="model-signature" /></p>
<br/>
<div class="response-content-type" />

View File

@@ -8,6 +8,8 @@
{{else}}
{{#if default}}
<textarea class='body-textarea' name='{{name}}'>{{default}}</textarea>
<br />
<div class="parameter-content-type" />
{{else}}
<textarea class='body-textarea' name='{{name}}'></textarea>
<br />
@@ -28,7 +30,7 @@
{{/if}}
</td>
<td>{{{description}}}</td>
<td class="markdown">{{{description}}}</td>
<td>{{{paramType}}}</td>
<td>
<span class="model-signature"></span>

View File

@@ -20,6 +20,6 @@
{{/each}}
</select>
</td>
<td>{{{description}}}</td>
<td class="markdown">{{{description}}}</td>
<td>{{{paramType}}}</td>
<td><span class="model-signature"></span></td>

View File

@@ -10,6 +10,6 @@
{{/if}}
{{/if}}
</td>
<td>{{{description}}}</td>
<td class="markdown">{{{description}}}</td>
<td>{{{paramType}}}</td>
<td><span class="model-signature"></span></td>

View File

@@ -10,6 +10,6 @@
{{/if}}
{{/if}}
</td>
<td>{{{description}}}</td>
<td class="markdown">{{{description}}}</td>
<td>{{{paramType}}}</td>
<td><span class="model-signature"></span></td>

View File

@@ -6,6 +6,8 @@
{{else}}
{{#if default}}
<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'>{{default}}</textarea>
<br />
<div class="parameter-content-type" />
{{else}}
<textarea class='body-textarea required' placeholder='(required)' name='{{name}}'></textarea>
<br />
@@ -25,7 +27,7 @@
{{/if}}
</td>
<td>
<strong>{{{description}}}</strong>
<strong><span class="markdown">{{{description}}}</span></strong>
</td>
<td>{{{paramType}}}</td>
<td><span class="model-signature"></span></td>