Download as
Browse Code »

Commit 1af2aeffc8e7a0319026fe7b6a218ffc0c69d872

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

Minor usability improvements

Showing 7 changed files with 14 additions and 13 deletions   Show diff stats
app/views/admin/groups/edit.html.haml
  Diff comments   View file @1af2aef
... ... @@ -27,5 +27,5 @@
27 27 %li It will change the git path to repositories under this group.
28 28  
29 29 .form-actions
30   - = f.submit 'Edit group', class: "btn btn-remove"
  30 + = f.submit 'Save changes', class: "btn btn-primary"
31 31 = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel"
... ...
app/views/admin/groups/new.html.haml
  Diff comments   View file @1af2aef
... ... @@ -15,7 +15,7 @@
15 15 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
16 16  
17 17 .form-actions
18   - = f.submit 'Create group', class: "btn btn-primary"
  18 + = f.submit 'Create group', class: "btn btn-create"
19 19  
20 20 %hr
21 21 .padded
... ...
app/views/admin/groups/show.html.haml
  Diff comments   View file @1af2aef
... ... @@ -94,7 +94,7 @@
94 94 %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"}
95 95  
96 96 %tr
97   - %td= submit_tag 'Add user to projects in group', class: "btn btn-primary"
  97 + %td= submit_tag 'Add user to projects in group', class: "btn btn-create"
98 98 %td
99 99 Read more about project permissions
100 100 %strong= link_to "here", help_permissions_path, class: "vlink"
... ... @@ -116,7 +116,7 @@
116 116 .input
117 117 = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5'
118 118 .form-actions
119   - = submit_tag 'Add', class: "btn btn-primary"
  119 + = submit_tag 'Move projects', class: "btn btn-create"
120 120  
121 121 :javascript
122 122 $(function(){
... ...
app/views/admin/hooks/index.html.haml
  Diff comments   View file @1af2aef
... ... @@ -15,7 +15,7 @@
15 15 .input
16 16 = f.text_field :url, class: "text_field xxlarge"
17 17  
18   - = f.submit "Add System Hook", class: "btn btn-primary"
  18 + = f.submit "Add System Hook", class: "btn btn-create"
19 19 %hr
20 20  
21 21 -if @hooks.any?
... ...
app/views/admin/teams/new.html.haml
  Diff comments   View file @1af2aef
... ... @@ -16,7 +16,7 @@
16 16 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
17 17  
18 18 .form-actions
19   - = f.submit 'Create team', class: "btn btn-primary"
  19 + = f.submit 'Create team', class: "btn btn-create"
20 20  
21 21 %hr
22 22 .padded
... ...
app/views/admin/users/_form.html.haml
  Diff comments   View file @1af2aef
... ... @@ -80,8 +80,9 @@
80 80 .input= f.text_field :twitter
81 81  
82 82 .actions
83   - = f.submit 'Save', class: "btn btn-save"
84 83 - if @admin_user.new_record?
  84 + = f.submit 'Create user', class: "btn btn-create"
85 85 = link_to 'Cancel', admin_users_path, class: "btn btn-cancel"
86 86 - else
  87 + = f.submit 'Save changes', class: "btn btn-save"
87 88 = link_to 'Cancel', admin_user_path(@admin_user), class: "btn btn-cancel"
... ...
spec/features/admin/admin_users_spec.rb
  Diff comments   View file @1af2aef
... ... @@ -30,11 +30,11 @@ describe "Admin::Users" do
30 30 end
31 31  
32 32 it "should create new user" do
33   - expect { click_button "Save" }.to change {User.count}.by(1)
  33 + expect { click_button "Create user" }.to change {User.count}.by(1)
34 34 end
35 35  
36 36 it "should create user with valid data" do
37   - click_button "Save"
  37 + click_button "Create user"
38 38 user = User.last
39 39 user.name.should == "Big Bang"
40 40 user.email.should == "bigbang@mail.com"
... ... @@ -44,14 +44,14 @@ describe "Admin::Users" do
44 44 Notify.should_receive(:new_user_email)
45 45  
46 46 User.observers.enable :user_observer do
47   - click_button "Save"
  47 + click_button "Create user"
48 48 end
49 49 end
50 50  
51 51 it "should send valid email to user with email & password" do
52 52 Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
53 53 User.observers.enable :user_observer do
54   - click_button "Save"
  54 + click_button "Create user"
55 55 user = User.last
56 56 email = ActionMailer::Base.deliveries.last
57 57 email.subject.should have_content("Account was created")
... ... @@ -63,7 +63,7 @@ describe "Admin::Users" do
63 63 it "should send valid email to user with email without password when signup is enabled" do
64 64 Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
65 65 User.observers.enable :user_observer do
66   - click_button "Save"
  66 + click_button "Create user"
67 67 user = User.last
68 68 email = ActionMailer::Base.deliveries.last
69 69 email.subject.should have_content("Account was created")
... ... @@ -102,7 +102,7 @@ describe "Admin::Users" do
102 102 fill_in "user_name", with: "Big Bang"
103 103 fill_in "user_email", with: "bigbang@mail.com"
104 104 check "user_admin"
105   - click_button "Save"
  105 + click_button "Save changes"
106 106 end
107 107  
108 108 it "should show page with new data" do
... ...