Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ba4bf27f
Commit
ba4bf27f
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use table-holder where appropriate
parent
9ea72430
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
49 deletions
+51
-49
app/views/profiles/applications.html.haml
app/views/profiles/applications.html.haml
+43
-41
app/views/profiles/keys/_key_table.html.haml
app/views/profiles/keys/_key_table.html.haml
+8
-8
No files found.
app/views/profiles/applications.html.haml
View file @
ba4bf27f
...
@@ -15,24 +15,25 @@
...
@@ -15,24 +15,25 @@
.pull-right
.pull-right
=
link_to
'New Application'
,
new_oauth_application_path
,
class:
'btn btn-success'
=
link_to
'New Application'
,
new_oauth_application_path
,
class:
'btn btn-success'
-
if
@applications
.
any?
-
if
@applications
.
any?
%table
.table.table-striped
.table-holder
%thead
%table
.table.table-striped
%tr
%thead
%th
Name
%tr
%th
Callback URL
%th
Name
%th
Clients
%th
Callback URL
%th
%th
Clients
%th
%th
%tbody
%th
-
@applications
.
each
do
|
application
|
%tbody
%tr
{
:id
=>
"application_#{application.id}"
}
-
@applications
.
each
do
|
application
|
%td
=
link_to
application
.
name
,
oauth_application_path
(
application
)
%tr
{
:id
=>
"application_#{application.id}"
}
%td
%td
=
link_to
application
.
name
,
oauth_application_path
(
application
)
-
application
.
redirect_uri
.
split
.
each
do
|
uri
|
%td
%div
=
uri
-
application
.
redirect_uri
.
split
.
each
do
|
uri
|
%td
=
application
.
access_tokens
.
count
%div
=
uri
%td
=
link_to
'Edit'
,
edit_oauth_application_path
(
application
),
class:
'btn btn-link btn-sm'
%td
=
application
.
access_tokens
.
count
%td
=
render
'doorkeeper/applications/delete_form'
,
application:
application
%td
=
link_to
'Edit'
,
edit_oauth_application_path
(
application
),
class:
'btn btn-link btn-sm'
%td
=
render
'doorkeeper/applications/delete_form'
,
application:
application
.oauth-authorized-applications.prepend-top-20
.oauth-authorized-applications.prepend-top-20
-
if
user_oauth_applications?
-
if
user_oauth_applications?
...
@@ -40,29 +41,30 @@
...
@@ -40,29 +41,30 @@
Authorized applications
Authorized applications
-
if
@authorized_tokens
.
any?
-
if
@authorized_tokens
.
any?
%table
.table.table-striped
.table-holder
%thead
%table
.table.table-striped
%tr
%thead
%th
Name
%th
Authorized At
%th
Scope
%th
%tbody
-
@authorized_apps
.
each
do
|
app
|
-
token
=
app
.
authorized_tokens
.
order
(
'created_at desc'
).
first
%tr
{
:id
=>
"application_#{app.id}"
}
%td
=
app
.
name
%td
=
token
.
created_at
%td
=
token
.
scopes
%td
=
render
'doorkeeper/authorized_applications/delete_form'
,
application:
app
-
@authorized_anonymous_tokens
.
each
do
|
token
|
%tr
%tr
%td
%th
Name
Anonymous
%th
Authorized At
%div
.help-block
%th
Scope
%em
Authorization was granted by entering your username and password in the application.
%th
%td
=
token
.
created_at
%tbody
%td
=
token
.
scopes
-
@authorized_apps
.
each
do
|
app
|
%td
=
render
'doorkeeper/authorized_applications/delete_form'
,
token:
token
-
token
=
app
.
authorized_tokens
.
order
(
'created_at desc'
).
first
%tr
{
:id
=>
"application_#{app.id}"
}
%td
=
app
.
name
%td
=
token
.
created_at
%td
=
token
.
scopes
%td
=
render
'doorkeeper/authorized_applications/delete_form'
,
application:
app
-
@authorized_anonymous_tokens
.
each
do
|
token
|
%tr
%td
Anonymous
%div
.help-block
%em
Authorization was granted by entering your username and password in the application.
%td
=
token
.
created_at
%td
=
token
.
scopes
%td
=
render
'doorkeeper/authorized_applications/delete_form'
,
token:
token
-
else
-
else
%p
.light
You don't have any authorized applications
%p
.light
You don't have any authorized applications
app/views/profiles/keys/_key_table.html.haml
View file @
ba4bf27f
-
is_admin
=
defined?
(
admin
)
?
true
:
false
-
is_admin
=
defined?
(
admin
)
?
true
:
false
.panel.panel-default
-
if
@keys
.
any?
-
if
@keys
.
any?
.table-holder
%table
.table
%table
.table
%thead
.panel-heading
%thead
.panel-heading
%tr
%tr
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
%tbody
%tbody
-
@keys
.
each
do
|
key
|
-
@keys
.
each
do
|
key
|
=
render
'profiles/keys/key'
,
key:
key
,
is_admin:
is_admin
=
render
'profiles/keys/key'
,
key:
key
,
is_admin:
is_admin
-
else
-
else
.nothing-here-block
.nothing-here-block
-
if
is_admin
-
if
is_admin
User has no ssh keys
User has no ssh keys
-
else
-
else
There are no SSH keys with access to your account.
There are no SSH keys with access to your account.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment