Commit 4d9c3f31 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Bootstrap: btn replacing

parent fbdb1da2
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.clear .clear
%br %br
.actions .actions
= f.submit 'Save', :class => "grey-button" = f.submit 'Save', :class => "btn"
:javascript :javascript
$(function(){ $(function(){
......
...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
%td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete
= paginate @admin_projects = paginate @admin_projects
= link_to 'New Project', new_admin_project_path, :class => "grey-button" = link_to 'New Project', new_admin_project_path, :class => "btn"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
= @admin_project.description = @admin_project.description
%tr %tr
%td{:colspan => 2} %td{:colspan => 2}
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "grey-button" = link_to 'Edit', edit_admin_project_path(@admin_project), :class => "btn"
.span-14 .span-14
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
%tr %tr
%td{ :colspan => 3 } %td{ :colspan => 3 }
= submit_tag 'Add', :class => "positive-button" = submit_tag 'Add', :class => "btn primary"
%table.round-borders %table.round-borders
%thead %thead
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
= f.select :repo_access, options_for_select(Repository.access_options, @admin_team_member.repo_access), {}, :class => "repo-access-select" = f.select :repo_access, options_for_select(Repository.access_options, @admin_team_member.repo_access), {}, :class => "repo-access-select"
%br %br
.actions .actions
= f.submit 'Save', :class => "grey-button" = f.submit 'Save', :class => "btn"
:css :css
form select { form select {
......
...@@ -25,4 +25,4 @@ ...@@ -25,4 +25,4 @@
%br %br
= paginate @admin_team_members = paginate @admin_team_members
= link_to 'New Team Member', new_admin_team_member_path, :class => "grey-button" = link_to 'New Team Member', new_admin_team_member_path, :class => "btn"
...@@ -46,4 +46,4 @@ ...@@ -46,4 +46,4 @@
.clear .clear
%br %br
.actions .actions
= f.submit 'Save', :class => "grey-button" = f.submit 'Save', :class => "btn"
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
= paginate @admin_users = paginate @admin_users
%br %br
= link_to 'New User', new_admin_user_path, :class => "grey-button" = link_to 'New User', new_admin_user_path, :class => "btn"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
= @admin_user.twitter = @admin_user.twitter
%tr %tr
%td{:colspan => 2} %td{:colspan => 2}
= link_to 'Edit', edit_admin_user_path(@admin_user), :class => "grey-button" = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "btn"
.span-14 .span-14
%h2 Projects %h2 Projects
...@@ -66,4 +66,4 @@ ...@@ -66,4 +66,4 @@
%td= link_to 'Edit', edit_admin_team_member_path(tm) %td= link_to 'Edit', edit_admin_team_member_path(tm)
%td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "grey-button" = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "btn"
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
%td= f.text_area :key, :style => "width:300px; height:130px" %td= f.text_area :key, :style => "width:300px; height:130px"
%br %br
.merge-tabs .merge-tabs
= f.submit 'Save', :class => "positive-button" = f.submit 'Save', :class => "primary btn"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
%br %br
%br %br
.merge-tabs .merge-tabs
= f.submit 'Save', :class => "positive-button" = f.submit 'Save', :class => "primary btn"
   
- unless @issue.new_record? - unless @issue.new_record?
.right .right
......
...@@ -2,11 +2,4 @@ ...@@ -2,11 +2,4 @@
= link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
%span %span
Merge Requests Merge Requests
- if current_page?(project_merge_requests_path(@project))
- if can? current_user, :write_merge_request, @project
= link_to new_project_merge_request_path(@project), :class => "add_new", :title => "New Merge request" do
Add new
= render "merge_requests/head"
.left.issues_filter .left.issues_filter
= form_tag project_merge_requests_path(@project), :method => :get do = form_tag project_merge_requests_path(@project), :method => :get do
.left .left
...@@ -14,17 +12,17 @@ ...@@ -14,17 +12,17 @@
.clear .clear
%hr %hr
- if @merge_requests.count > 0
%div{ :class => "update-data ui-box ui-box-small ui-box-big" }
.data
= render @merge_requests
.clear
%br
- unless @merge_requests.count > 0 || params[:f] == "2" .row
.notice_holder .span10
%li Merge Requests do not exist yet. - if @merge_requests.count > 0
%div{ :class => "update-data ui-box ui-box-small ui-box-big" }
.data
= render @merge_requests
.span4
- if can? current_user, :write_merge_request, @project - if can? current_user, :write_merge_request, @project
%li You can add a new one by clicking on "Add New" button .alert-message.block-message.info
%p You can open a new merge request.
- if current_page?(project_merge_requests_path(@project))
= link_to new_project_merge_request_path(@project), :class => "btn small", :title => "New Merge request" do
Add new
%div = form_for [@project, @note], :remote => "true", :multipart => true do |f|
%h3 Leave a note %h3 Leave a note
= form_for [@project, @note], :remote => "true", :multipart => true do |f| -if @note.errors.any?
-if @note.errors.any? .alert-message.block-message.error
.errors.error - @note.errors.full_messages.each do |msg|
- @note.errors.full_messages.each do |msg| %div= msg
%div= msg
= f.hidden_field :noteable_id = f.hidden_field :noteable_id
= f.hidden_field :noteable_type = f.hidden_field :noteable_type
= f.text_area :note, :size => 255 = f.text_area :note, :size => 255
.row .row
.span6 .span6
%h5 Notify via email: %h5 Notify via email:
.clearfix .clearfix
= label_tag :notify do = label_tag :notify do
= check_box_tag :notify, 1, @note.noteable_type != "Commit" = check_box_tag :notify, 1, @note.noteable_type != "Commit"
%span Project team %span Project team
-if @note.noteable_type == "Commit" -if @note.noteable_type == "Commit"
= label_tag :notify_author do = label_tag :notify_author do
= check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
%span Commit author %span Commit author
.span6 .span6
%h5 Attachment: %h5 Attachment:
.clearfix .clearfix
= f.label :attachment, "Any file, < 10 MB" = f.label :attachment, "Any file, < 10 MB"
.input= f.file_field :attachment, :class => "input-file" .input= f.file_field :attachment, :class => "input-file"
= f.submit 'Add note', :class => "btn primary", :id => "submit_note" = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
...@@ -18,5 +18,5 @@ ...@@ -18,5 +18,5 @@
Dark code preview Dark code preview
.clear .clear
.buttons .buttons
= f.submit 'Save', :class => "grey-button" = f.submit 'Save', :class => "btn"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%br %br
= f.password_field :password_confirmation = f.password_field :password_confirmation
.buttons .buttons
= f.submit 'Save', :class => "grey-button" = f.submit 'Save', :class => "btn"
.clear .clear
.ui-box.width-100p .ui-box.width-100p
...@@ -40,5 +40,5 @@ ...@@ -40,5 +40,5 @@
- if current_user.private_token - if current_user.private_token
= f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button" = f.submit 'Reset', :confirm => "Are you sure?", :class => "grey-button"
- else - else
= f.submit 'Generate', :class => "positive-button" = f.submit 'Generate', :class => "btn"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
%h3.prepend-top Updating project &amp; repository. Please wait for few minutes %h3.prepend-top Updating project &amp; repository. Please wait for few minutes
.merge-tabs .merge-tabs
= f.submit 'Save', :class => "grey-button" = f.submit 'Save', :class => "btn primary"
&nbsp; &nbsp;
- unless @project.new_record? - unless @project.new_record?
.right .right
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment