deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor buttons pt1

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-29 22:18:19 +02:00
parent 9fdbdc662a
commit 033aa1a885
75 changed files with 139 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/merge_requests/_form.html.haml
View file

@ -51,19 +51,19 @@
.form-actions
- if @merge_request.new_record?
= f.submit 'Submit merge request', class: "btn success"
= f.submit 'Submit merge request', class: "btn btn-create"
-else
= f.submit 'Save changes', class: "save-btn btn"
= f.submit 'Save changes', class: "btn btn-save"
- if @merge_request.new_record?
= link_to project_merge_requests_path(@project), class: "btn cancel-btn" do
= link_to project_merge_requests_path(@project), class: "btn btn-cancel" do
Cancel
- else
= link_to project_merge_request_path(@project, @merge_request), class: "btn cancel-btn" do
= link_to project_merge_request_path(@project, @merge_request), class: "btn btn-cancel" do
Cancel
:javascript
$(function(){
disableButtonIfEmptyField("#merge_request_title", ".save-btn");
disableButtonIfEmptyField("#merge_request_title", ".btn-save");
var source_branch = $("#merge_request_source_branch")
, target_branch = $("#merge_request_target_branch");

2
app/views/merge_requests/index.html.haml
View file

@ -1,5 +1,5 @@
- if can? current_user, :write_merge_request, @project
= link_to new_project_merge_request_path(@project), class: "right btn primary", title: "New Merge Request" do
= link_to new_project_merge_request_path(@project), class: "right btn btn-primary", title: "New Merge Request" do
%i.icon-plus
New Merge Request
%h3.page_title