Download as
Browse Code »

Commit 0b747a0f4ab3917ea1593b0f25169e600cd1059f

Authored by Dmitriy Zaporozhets
1 parent 84565840
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Minor UI improvements

Showing 3 changed files with 13 additions and 14 deletions   Show diff stats
app/views/projects/deploy_keys/index.html.haml
  Diff comments   View file @0b747a0
1   -%p.slead
  1 +%h3.page-title
2 2 Deploy keys allow read-only access to repository
3 3  
4 4 = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do
... ... @@ -13,9 +13,9 @@
13 13  
14 14 .row
15 15 .span5.enabled-keys
16   - %h5.cgreen
17   - Enabled deploy keys
18   - %small for this project
  16 + %h5
  17 + %strong.cgreen Enabled deploy keys
  18 + for this project
19 19 %ul.bordered-list
20 20 = render @enabled_keys
21 21 - if @enabled_keys.blank?
... ... @@ -23,10 +23,10 @@
23 23 %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one
24 24 .span5.available-keys
25 25 %h5
26   - Available deploy keys
27   - %small from projects you are able to manage
  26 + %strong Deploy keys
  27 + from projects available for you
28 28 %ul.bordered-list
29 29 = render @available_keys
30 30 - if @available_keys.blank?
31 31 .light-well
32   - %p.nothing_here_message All deploy keys created in projects you own will be displayed here
  32 + %p.nothing_here_message All deploy keys created in projects you participate will be displayed here
... ...
app/views/projects/team_members/import.html.haml
  Diff comments   View file @0b747a0
1 1 %h3.page-title
2   - = "Import team from another project"
  2 + = "Import members from another project"
  3 +%p.light
  4 + Only project members will be improted. Group members will be skipped.
3 5 %hr
4   -%p.slead
5   - Read more about project team import #{link_to "here", '#', class: 'vlink'}.
6 6 = form_tag apply_import_project_team_members_path(@project), method: 'post' do
7   - %p.slead Choose project you want to use as team source:
8 7 .padded
9 8 = label_tag :source_project_id, "Project"
10 9 .input= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen xxlarge", required: true)
11 10  
12 11 .actions
13   - = submit_tag 'Import', class: "btn btn-save"
  12 + = submit_tag 'Import project members', class: "btn btn-create"
14 13 = link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
15 14  
... ...
app/views/projects/team_members/index.html.haml
  Diff comments   View file @0b747a0
... ... @@ -3,10 +3,10 @@
3 3  
4 4 - if can? current_user, :admin_team_member, @project
5 5 %span.pull-right
6   - = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
7   - Import team from another project
8 6 = link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
9 7 New Team Member
  8 + = link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
  9 + Import members
10 10  
11 11 %p.light
12 12 Read more about project permissions
... ...