midgard/tab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15 from ZeusWPI/bug/7/select2html5

Browse source 
Fix #7
This commit is contained in:
benji 2016-02-01 19:25:38 +01:00
commit d128b2c1c0
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -240,7 +240,7 @@ GEM
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
select2-rails (3.5.9.3) select2-rails (4.0.1)
thor (~> 0.14) thor (~> 0.14)
sexp_processor (4.6.0) sexp_processor (4.6.0)
simplecov (0.10.0) simplecov (0.10.0)

5
app/assets/javascripts/application.js
View file

@ -23,12 +23,11 @@
ready = function() { ready = function() {
$.each($(".select2-selector"), function(index, val) { $.each($(".select2-selector"), function(index, val) {
$(val).select2({ $(val).select2({
width: 'resolve', width: $(val).data('width'),
placeholder: $(".select2-selector"), placeholder: $(".select2-selector"),
allowClear: true allowClear: true
}); });
} })
)
} }
$(document).ready(ready) $(document).ready(ready)

2
app/assets/stylesheets/application.css.scss
View file

@ -14,9 +14,9 @@
*= require dataTables/extras/dataTables.responsive *= require dataTables/extras/dataTables.responsive
*= require dataTables/jquery.dataTables *= require dataTables/jquery.dataTables
*= require select2 *= require select2
*= require select2-bootstrap
*= require_self *= require_self
*= require purecss *= require purecss
*= require select2-bootstrap
*/ */
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@import "bootstrap"; @import "bootstrap";

2
app/views/transactions/_new.html.haml
View file

@ -7,7 +7,7 @@
= f.select :creditor, = f.select :creditor,
options_from_collection_for_select(User.all.order(:name), :name, :name), options_from_collection_for_select(User.all.order(:name), :name, :name),
{ include_blank: true }, { include_blank: true },
{ class: 'select2-selector', size: 50, required: true, data: { placeholder: "Creditor" } } { class: 'select2-selector', required: true, data: { placeholder: "Creditor", width: 150 } }
= f.text_field :message, placeholder: "Message", size: 75, class: "form-control", required: true = f.text_field :message, placeholder: "Message", size: 75, class: "form-control", required: true
.input-group .input-group
%span.input-group-addon %span.input-group-addon

0
app/views/transactions/index.html.haml
View file

4
app/views/users/show.html.haml
View file

@ -42,12 +42,12 @@
.input-listen{ 'data-input-type': 'text', 'data-filter-name': 'Issuer' } .input-listen{ 'data-input-type': 'text', 'data-filter-name': 'Issuer' }
= grouped_collection_select nil, nil, [User, Client], :all, :name, :name, :name, = grouped_collection_select nil, nil, [User, Client], :all, :name, :name, :name,
{ include_blank: true }, { include_blank: true },
{ data: { placeholder: "Filter on Issuer" }, class: "select2-selector form-control value-thing" } { data: { placeholder: "Filter on Issuer", width: 265 }, class: "select2-selector form-control value-thing" }
.col-md-4 .col-md-4
.input-listen{ 'data-input-type': 'text', 'data-filter-name': 'Peer' } .input-listen{ 'data-input-type': 'text', 'data-filter-name': 'Peer' }
= select_tag nil, = select_tag nil,
options_from_collection_for_select(User.all.order(:name), :name, :name), options_from_collection_for_select(User.all.order(:name), :name, :name),
include_blank: true, class: "select2-selector form-control value-thing", data: { placeholder: "Filter on Peer" } include_blank: true, class: "select2-selector form-control value-thing", data: { placeholder: "Filter on Peer", width: 265 }
.col-md-4 .col-md-4
.input-listen{ 'data-input-type': 'text', 'data-filter-name': 'Message' } .input-listen{ 'data-input-type': 'text', 'data-filter-name': 'Message' }
%input.live-updating.value-thing{type: 'text', placeholder: 'Filter on Message', %input.live-updating.value-thing{type: 'text', placeholder: 'Filter on Message',