merged from auth_2.0 branch

This commit is contained in:
Tony Tam
2014-11-11 00:16:13 -08:00
parent 8e20a32344
commit 329772af4c
11 changed files with 168 additions and 355 deletions

View File

@@ -52,7 +52,6 @@ class OperationView extends Backbone.View
if @model.description
@model.description = @model.description.replace(/(?:\r\n|\r|\n)/g, '<br />')
@model.oauth = null
log @model.authorizations
if @model.authorizations
if Array.isArray @model.authorizations
for auths in @model.authorizations

View File

@@ -1100,85 +1100,6 @@
.swagger-section .api-popup-actions {
padding-top: 10px;
}
.auth {
text-align: right;
height: 15px;
float: right;
clear: both;
display: inline-block;
position: relative;
z-index: 3;
}
.auth_icon {
float: right;
}
.auth_container_2 {
visibility: visible;
position: absolute;
width: 250px;
margin-top: 26px;
float: left;
display: none;
border: solid 2px;
background: white;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-o-border-radius: 4px;
-ms-border-radius: 4px;
-khtml-border-radius: 4px;
z-index: 2;
}
.auth_label {
text-align: left;
clear: left;
float: left;
padding-left: 10px;
width: 90px;
}
.auth_submit {
border-left: 1px;
border-right: 1px;
margin-top: 25px;
margin-bottom: 25px;
text-align: center;
}
.auth_button {
display: block;
float: right;
text-align: right;
}
.auth_submit_button {
display: block;
text-decoration: none;
font-weight: bold;
padding: 6px 8px;
font-size: 0.9em;
color: white;
float: right;
text-align: center;
background: #547f00;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-o-border-radius: 4px;
-ms-border-radius: 4px;
-khtml-border-radius: 4px;
margin-top: 10px;
margin-bottom: 10px;
margin-right: 10px;
}
.auth_input {
float: left;
}
.authentication_container {
float: left;
display: block;
background: yellow;
}
.auth_button .auth_icon {
width: 25px;
height: 25px;
cursor: pointer;
}
.swagger-section .access {
float: right;
}

View File

@@ -81,94 +81,3 @@
}
}
.auth {
text-align: right;
height: 15px;
float: right;
clear: both;
display: inline-block;
position: relative;
z-index: 3;
}
.auth_icon {
float: right;
}
.auth_container_2 {
visibility: visible;
position: absolute;
width: 250px;
float:left;
margin-top: 26px;
float: left;
display: none;
border: solid 2px;
background: white;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-o-border-radius: 4px;
-ms-border-radius: 4px;
-khtml-border-radius: 4px;
z-index: 2;
}
.auth_label {
text-align: left;
clear: left;
float: left;
padding-left: 10px;
width: 90px;
}
.auth_submit {
border-left: 1px;
border-right: 1px;
margin-top: 25px;
margin-bottom: 25px;
text-align: center;
}
.auth_button {
display: block;
float: right;
text-align: right;
}
.auth_submit_button {
display: block;
text-decoration: none;
font-weight: bold;
padding: 6px 8px;
font-size: 0.9em;
color: white;
float: right;
text-align: center;
background: #547f00;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-o-border-radius: 4px;
-ms-border-radius: 4px;
-khtml-border-radius: 4px;
margin-top: 10px;
margin-bottom: 10px;
margin-right: 10px;
}
.auth_input {
float: left;
}
.authentication_container {
float: left;
display: block;
background: yellow;
}
.auth_button .auth_icon {
width: 25px;
height: 25px;
cursor: pointer;
}