Convert Javascript links to buttons.
This commit is contained in:
parent
ada6c6080b
commit
55d9809055
10 changed files with 15 additions and 14 deletions
|
@ -44,7 +44,7 @@
|
|||
Projects (#{@projects.total_count})
|
||||
.panel-head-actions
|
||||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%span.light sort:
|
||||
- if @sort.present?
|
||||
= @sort.humanize
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
.pull-right
|
||||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%span.light sort:
|
||||
- if @sort.present?
|
||||
= @sort.humanize
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
.pull-right
|
||||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%span.light sort:
|
||||
- if @sort.present?
|
||||
= @sort.humanize
|
||||
|
|
|
@ -14,7 +14,8 @@
|
|||
%strong= member.human_access
|
||||
- if show_controls
|
||||
- if can?(current_user, :modify, member)
|
||||
= link_to '#', class: "btn-tiny btn js-toggle-button", title: 'Edit access level' do
|
||||
= button_tag class: "btn-tiny btn js-toggle-button",
|
||||
title: 'Edit access level', type: 'button' do
|
||||
%i.fa.fa-pencil-square-o
|
||||
- if can?(current_user, :destroy, member)
|
||||
- if current_user == member.user
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
- if current_user && current_user.can?(:manage_group, @group)
|
||||
.pull-right
|
||||
= link_to '#', class: 'btn btn-new js-toggle-button' do
|
||||
= button_tag class: 'btn btn-new js-toggle-button', type: 'button' do
|
||||
Add members
|
||||
%i.fa.fa-chevron-down
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
New branch
|
||||
|
||||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%span.light sort:
|
||||
- if @sort.present?
|
||||
= @sort.humanize
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.dropdown.inline
|
||||
%a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn.btn-small{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%i.fa.fa-tags
|
||||
%span.light Group:
|
||||
- if @group.present?
|
||||
|
@ -17,7 +17,7 @@
|
|||
= group.name
|
||||
|
||||
.dropdown.inline.prepend-left-10.project-filter
|
||||
%a.dropdown-toggle.btn.btn-small{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn.btn-small{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%i.fa.fa-tags
|
||||
%span.light Project:
|
||||
- if @project.present?
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
All
|
||||
|
||||
.dropdown.inline.assignee-filter
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%i.fa.fa-user
|
||||
%span.light assignee:
|
||||
- if @assignee.present?
|
||||
|
@ -38,7 +38,7 @@
|
|||
= user.name
|
||||
|
||||
.dropdown.inline.prepend-left-10.author-filter
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%i.fa.fa-user
|
||||
%span.light author:
|
||||
- if @author.present?
|
||||
|
@ -61,7 +61,7 @@
|
|||
= user.name
|
||||
|
||||
.dropdown.inline.prepend-left-10.milestone-filter
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%i.fa.fa-clock-o
|
||||
%span.light milestone:
|
||||
- if @milestone.present?
|
||||
|
@ -85,7 +85,7 @@
|
|||
|
||||
- if @project
|
||||
.dropdown.inline.prepend-left-10.labels-filter
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%i.fa.fa-tags
|
||||
%span.light label:
|
||||
- if params[:label_name].present?
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.dropdown.inline.prepend-left-10
|
||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
|
||||
%span.light sort:
|
||||
- if @sort.present?
|
||||
= @sort
|
||||
|
|
|
@ -29,7 +29,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
|
|||
|
||||
step 'I select user "Mary Jane" from list with role "Reporter"' do
|
||||
user = User.find_by(name: "Mary Jane") || create(:user, name: "Mary Jane")
|
||||
click_link 'Add members'
|
||||
click_button 'Add members'
|
||||
within ".users-group-form" do
|
||||
select2(user.id, from: "#user_ids", multiple: true)
|
||||
select "Reporter", from: "access_level"
|
||||
|
|
Loading…
Reference in a new issue