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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
05a7e8b9
Commit
05a7e8b9
authored
Jun 24, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better design for SSH keys page
parent
15f62fcc
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
48 deletions
+52
-48
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+7
-0
app/controllers/profiles/keys_controller.rb
app/controllers/profiles/keys_controller.rb
+1
-1
app/views/profiles/keys/_form.html.haml
app/views/profiles/keys/_form.html.haml
+3
-4
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+8
-11
app/views/profiles/keys/edit.html.haml
app/views/profiles/keys/edit.html.haml
+0
-7
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/index.html.haml
+17
-14
app/views/profiles/keys/show.html.haml
app/views/profiles/keys/show.html.haml
+16
-11
No files found.
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
05a7e8b9
...
@@ -87,3 +87,10 @@ fieldset legend { font-size: 17px; }
...
@@ -87,3 +87,10 @@ fieldset legend { font-size: 17px; }
color
:
#333
;
color
:
#333
;
text-shadow
:
0
1px
1px
#FFF
;
text-shadow
:
0
1px
1px
#FFF
;
}
}
pre
.well-pre
{
border
:
1px
solid
#EEE
;
background
:
#f9f9f9
;
border-radius
:
0
;
color
:
#555
;
}
app/controllers/profiles/keys_controller.rb
View file @
05a7e8b9
...
@@ -2,7 +2,7 @@ class Profiles::KeysController < ApplicationController
...
@@ -2,7 +2,7 @@ class Profiles::KeysController < ApplicationController
layout
"profile"
layout
"profile"
def
index
def
index
@keys
=
current_user
.
keys
.
all
@keys
=
current_user
.
keys
.
order
(
'id DESC'
).
all
end
end
def
show
def
show
...
...
app/views/profiles/keys/_form.html.haml
View file @
05a7e8b9
...
@@ -12,13 +12,12 @@
...
@@ -12,13 +12,12 @@
.clearfix
.clearfix
=
f
.
label
:key
=
f
.
label
:key
.input
.input
%p
.light
Paste your public key here. Read more about how generate it
#{
link_to
"here"
,
help_ssh_path
}
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
=
f
.
text_area
:key
,
class:
[
:xxlarge
,
:thin_area
]
%p
.hint
Paste your public key here. Read more about how generate it
=
link_to
"here"
,
help_ssh_path
.actions
.actions
=
f
.
submit
'
Save'
,
class:
"btn btn-sav
e"
=
f
.
submit
'
Add key'
,
class:
"btn btn-creat
e"
=
link_to
"Cancel"
,
profile_keys_path
,
class:
"btn btn-cancel"
=
link_to
"Cancel"
,
profile_keys_path
,
class:
"btn btn-cancel"
app/views/profiles/keys/_key.html.haml
View file @
05a7e8b9
%tr
%li
%td
=
link_to
profile_key_path
(
key
)
do
=
link_to
profile_key_path
(
key
)
do
%strong
=
key
.
title
%strong
=
key
.
title
%td
%span
.cgray
%span
.cgray
A
dded
a
dded
=
time_ago_in_words
(
key
.
created_at
)
=
time_ago_in_words
(
key
.
created_at
)
ago
ago
%td
=
link_to
'Remove'
,
profile_key_path
(
key
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"btn btn-small btn-remove delete-key pull-right"
=
link_to
'Remove'
,
profile_key_path
(
key
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"btn btn-small btn-remove delete-key pull-right"
app/views/profiles/keys/edit.html.haml
deleted
100644 → 0
View file @
15f62fcc
%h1
Editing key
=
render
'form'
=
link_to
'Show'
,
profile_keys_path
(
key
)
\|
=
link_to
'Back'
,
profile_keys_path
app/views/profiles/keys/index.html.haml
View file @
05a7e8b9
%h3
.page_title
%h3
.page_title
SSH Keys
SSH Keys
=
link_to
"Add
new"
,
new_profile_key_path
,
class:
"btn pull-right
"
=
link_to
"Add
SSH Key"
,
new_profile_key_path
,
class:
"btn pull-right btn-primary
"
%
h
r
%
b
r
%p
.
slead
%p
.
light
SSH key allows you to establish a secure connection between your computer and GitLab
SSH key allows you to establish a secure connection between your computer and GitLab
%p
.light
Before you can add ssh key you need to
=
link_to
"generate it"
,
help_ssh_path
%table
#keys-table
%thead
.ui-box
%tr
%h5
.title
%th
Name
SSH Keys (
#{
@keys
.
count
}
)
%th
Added
.pull-right
%th
%ul
.well-list
#keys-table
=
render
@keys
=
render
@keys
-
if
@keys
.
blank?
-
if
@keys
.
blank?
%tr
%li
%td
{
colspan:
3
}
%h3
.nothing_here_message
There are no SSH keys with access to your account.
%p
.nothing_here_message
There are no SSH keys with access to your account.
app/views/profiles/keys/show.html.haml
View file @
05a7e8b9
%h3
.page_title
.row
Public key:
.span4
=
@key
.
title
.ui-box
%small
%h5
.title
created at
SSH Key
=
@key
.
created_at
.
stamp
(
"Aug 21, 2011"
)
%ul
.well-list
.back_link
%li
=
link_to
profile_keys_path
do
%span
.light
Title:
←
To keys list
%strong
=
@key
.
title
%hr
%li
%span
.light
Created at:
%strong
=
@key
.
created_at
.
stamp
(
"Aug 21, 2011"
)
.span8
%pre
.well-pre
=
@key
.
key
%pre
=
@key
.
key
.pull-right
.pull-right
=
link_to
'Remove'
,
profile_key_path
(
@key
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"btn btn-remove delete-key"
=
link_to
'Remove'
,
profile_key_path
(
@key
),
confirm:
'Are you sure?'
,
method: :delete
,
class:
"btn btn-remove delete-key"
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