Merge branch 'V2_5' of github.com:afimb/chouette2 into V2_5

afimb · Dec 4, 2014 · 5bb1db4 · 5bb1db4
2 parents 19c8ff4 + f96d76e
commit 5bb1db4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/inputs/search_stop_area_input.rb b/app/inputs/search_stop_area_input.rb
@@ -38,6 +38,7 @@ def search
            };
 
            $('##{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
@@ -15,10 +15,11 @@ def search
               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 @@ def search
              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 @@ def input_html_options
                   :required          => nil,
                   :autofocus         => nil,
                   :class             => 'token-input',
-                  'data-model-name' => object.class.model_name.human
+                  'data-model-name' => object.class.model_name.human                  
                 })
   end