diff options
| author | Michel Etienne | 2014-12-04 14:43:08 +0100 |
|---|---|---|
| committer | Michel Etienne | 2014-12-04 14:43:08 +0100 |
| commit | 5bb1db4397b64a331150043d596e85bf36f4750c (patch) | |
| tree | 23f43df28da9fd789540f80a6e3253d8ec651a96 | |
| parent | 19c8ff4838c19eddb299df0a7f43ffaf0efb84c1 (diff) | |
| parent | f96d76e33b5dade18e397158dc365096d1e5f3a0 (diff) | |
| download | chouette-core-5bb1db4397b64a331150043d596e85bf36f4750c.tar.bz2 | |
Merge branch 'V2_5' of github.com:afimb/chouette2 into V2_5
| -rw-r--r-- | app/inputs/search_stop_area_input.rb | 1 | ||||
| -rw-r--r-- | app/inputs/search_time_table_input.rb | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/inputs/search_stop_area_input.rb b/app/inputs/search_stop_area_input.rb index aa5568541..e5cfafc34 100644 --- a/app/inputs/search_stop_area_input.rb +++ b/app/inputs/search_stop_area_input.rb @@ -38,6 +38,7 @@ class SearchStopAreaInput < Formtastic::Inputs::SearchInput }; $('##{dom_id}').tokenInput('#{options[:json]}', { + zindex: 1061, disabled: #{options[:disabled] || false}, crossDomain: false, tokenLimit: #{tokenLimit}, diff --git a/app/inputs/search_time_table_input.rb b/app/inputs/search_time_table_input.rb index 6f40d7e1e..877333592 100644 --- a/app/inputs/search_time_table_input.rb +++ b/app/inputs/search_time_table_input.rb @@ -15,10 +15,11 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput tags = '<div class=\"info\">' + item.tags + '</div>' ; } return '<li><div class=\"comment\">' + item.comment + - '</div><div class=\"info\">' + item.time_table_bounding + day_types + '</div>' + + '</div><div class=\"info\">' + item.time_table_bounding + ' ' + day_types + '</div>' + tags + '</li>'; }; $('##{dom_id}').tokenInput('#{options[:json]}', { + zindex: 1061, crossDomain: false, tokenLimit: #{tokenLimit}, minChars: 2, @@ -29,7 +30,7 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput noResultsText: '#{options[:no_result_text]}', searchingText: '#{options[:searching_text]}', resultsFormatter: time_table_formatter, - tokenFormatter: time_table_formatter, + tokenFormatter: time_table_formatter, }); });").html_safe) end @@ -48,7 +49,7 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput :required => nil, :autofocus => nil, :class => 'token-input', - 'data-model-name' => object.class.model_name.human + 'data-model-name' => object.class.model_name.human }) end |