diff options
| -rw-r--r-- | app/views/admin/groups/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/hooks/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/teams/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/users/_form.html.haml | 3 | ||||
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 12 |
7 files changed, 14 insertions, 13 deletions
diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index bb1398f66cd..af87503128e 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -27,5 +27,5 @@ %li It will change the git path to repositories under this group. .form-actions - = f.submit 'Edit group', class: "btn btn-remove" + = f.submit 'Save changes', class: "btn btn-primary" = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel" diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml index 6f76ee648ae..2da654ec764 100644 --- a/app/views/admin/groups/new.html.haml +++ b/app/views/admin/groups/new.html.haml @@ -15,7 +15,7 @@ = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 .form-actions - = f.submit 'Create group', class: "btn btn-primary" + = f.submit 'Create group', class: "btn btn-create" %hr .padded diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 63ea78fdd99..e73321a5bab 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -94,7 +94,7 @@ %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"} %tr - %td= submit_tag 'Add user to projects in group', class: "btn btn-primary" + %td= submit_tag 'Add user to projects in group', class: "btn btn-create" %td Read more about project permissions %strong= link_to "here", help_permissions_path, class: "vlink" @@ -116,7 +116,7 @@ .input = select_tag :project_ids, options_from_collection_for_select(@projects , :id, :name_with_namespace), multiple: true, data: {placeholder: 'Select projects'}, class: 'chosen span5' .form-actions - = submit_tag 'Add', class: "btn btn-primary" + = submit_tag 'Move projects', class: "btn btn-create" :javascript $(function(){ diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index acbf7a108b8..316e8235cbe 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -15,7 +15,7 @@ .input = f.text_field :url, class: "text_field xxlarge" - = f.submit "Add System Hook", class: "btn btn-primary" + = f.submit "Add System Hook", class: "btn btn-create" %hr -if @hooks.any? diff --git a/app/views/admin/teams/new.html.haml b/app/views/admin/teams/new.html.haml index 1c90cb20c10..8bccdacc351 100644 --- a/app/views/admin/teams/new.html.haml +++ b/app/views/admin/teams/new.html.haml @@ -16,7 +16,7 @@ = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 .form-actions - = f.submit 'Create team', class: "btn btn-primary" + = f.submit 'Create team', class: "btn btn-create" %hr .padded diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index 1d1fe341c5b..9bde50f8947 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -80,8 +80,9 @@ .input= f.text_field :twitter .actions - = f.submit 'Save', class: "btn btn-save" - if @admin_user.new_record? + = f.submit 'Create user', class: "btn btn-create" = link_to 'Cancel', admin_users_path, class: "btn btn-cancel" - else + = f.submit 'Save changes', class: "btn btn-save" = link_to 'Cancel', admin_user_path(@admin_user), class: "btn btn-cancel" diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 22d1ee91480..a6cf5299791 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -30,11 +30,11 @@ describe "Admin::Users" do end it "should create new user" do - expect { click_button "Save" }.to change {User.count}.by(1) + expect { click_button "Create user" }.to change {User.count}.by(1) end it "should create user with valid data" do - click_button "Save" + click_button "Create user" user = User.last user.name.should == "Big Bang" user.email.should == "bigbang@mail.com" @@ -44,14 +44,14 @@ describe "Admin::Users" do Notify.should_receive(:new_user_email) User.observers.enable :user_observer do - click_button "Save" + click_button "Create user" end end it "should send valid email to user with email & password" do Gitlab.config.gitlab.stub(:signup_enabled).and_return(false) User.observers.enable :user_observer do - click_button "Save" + click_button "Create user" user = User.last email = ActionMailer::Base.deliveries.last email.subject.should have_content("Account was created") @@ -63,7 +63,7 @@ describe "Admin::Users" do it "should send valid email to user with email without password when signup is enabled" do Gitlab.config.gitlab.stub(:signup_enabled).and_return(true) User.observers.enable :user_observer do - click_button "Save" + click_button "Create user" user = User.last email = ActionMailer::Base.deliveries.last email.subject.should have_content("Account was created") @@ -102,7 +102,7 @@ describe "Admin::Users" do fill_in "user_name", with: "Big Bang" fill_in "user_email", with: "bigbang@mail.com" check "user_admin" - click_button "Save" + click_button "Save changes" end it "should show page with new data" do |