vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'swaggerlikeus' of ssh://bitbucket.org/yackob03/quay into swaggerlikeus

Browse source
This commit is contained in:
jakedt 2014-03-18 19:21:53 -04:00
commit 19c7453f99
4 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
auth/scopes.py
View file

@ -63,11 +63,12 @@ def get_scope_information(scopes_string):
scopes = scopes_from_scope_string(scopes_string) scopes = scopes_from_scope_string(scopes_string)
scope_info = [] scope_info = []
for scope in scopes: for scope in scopes:
scope_info.append({ if scope:
'title': ALL_SCOPES[scope]['title'], scope_info.append({
'scope': ALL_SCOPES[scope]['scope'], 'title': ALL_SCOPES[scope]['title'],
'description': ALL_SCOPES[scope]['description'], 'scope': ALL_SCOPES[scope]['scope'],
'icon': ALL_SCOPES[scope]['icon'], 'description': ALL_SCOPES[scope]['description'],
}) 'icon': ALL_SCOPES[scope]['icon'],
})
return scope_info return scope_info

3
endpoints/web.py
View file

@ -278,6 +278,9 @@ def request_authorization_code():
# Load the scope information. # Load the scope information.
scope_info = scopes.get_scope_information(scope) scope_info = scopes.get_scope_information(scope)
if not scope_info:
abort(404)
return
# Load the application information. # Load the application information.
oauth_app = provider.get_application_for_client_id(client_id) oauth_app = provider.get_application_for_client_id(client_id)

15
static/css/quay.css
View file

@ -3451,8 +3451,8 @@ pre.command:before {
display: inline-block; display: inline-block;
} }
.auth-scopes .scope .title:hover { .auth-scopes .scope .title a {
color: #428bca; color: #444;
} }
.auth-scopes .scope .description { .auth-scopes .scope .description {
@ -3462,9 +3462,20 @@ pre.command:before {
.auth-scopes .scope i { .auth-scopes .scope i {
margin-right: 10px; margin-right: 10px;
margin-top: 2px; margin-top: 2px;
}
.auth-scopes .scope i.fa-lg {
font-size: 24px; font-size: 24px;
} }
.auth-scopes .title i.arrow:before {
content: "\f0d7";
}
.auth-scopes .title.collapsed i.arrow:before {
content: "\f0da" !important;
}
.auth-container .button-bar { .auth-container .button-bar {
margin-top: 10px; margin-top: 10px;
padding-top: 10px; padding-top: 10px;

5
templates/oauthorize.html
View file

@ -22,8 +22,9 @@
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<div class="title-container"> <div class="title-container">
<i class="fa {{ scope.icon }} fa-lg"></i> <div class="title collapsed" data-toggle="collapse" data-parent="#scopeGroup" data-target="#description-{{ index }}">
<div class="title" data-toggle="collapse" data-parent="#scopeGroup" data-target="#description-{{ index }}"> <i class="fa arrow"></i>
<i class="fa {{ scope.icon }} fa-lg"></i>
<a data-toggle="collapse" href="#collapseOne"> <a data-toggle="collapse" href="#collapseOne">
{{ scope.title }} {{ scope.title }}
</a> </a>