aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/time_table_combinations
diff options
context:
space:
mode:
authorMichel Etienne2014-08-22 10:57:46 +0200
committerMichel Etienne2014-08-22 10:57:46 +0200
commitb827bc2007a820341314da284a83a431803a573f (patch)
tree4691456f15b771bba8c8eb287d129f10031ff39b /app/views/time_table_combinations
parent194bb28c4acbc144493c2096341d9126ffeaae35 (diff)
downloadchouette-core-b827bc2007a820341314da284a83a431803a573f.tar.bz2
clean correctly modal combine form
Diffstat (limited to 'app/views/time_table_combinations')
-rw-r--r--app/views/time_table_combinations/_combine.html.erb2
-rw-r--r--app/views/time_table_combinations/new.js.erb4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/time_table_combinations/_combine.html.erb b/app/views/time_table_combinations/_combine.html.erb
index 85fc5ab26..27b5f056f 100644
--- a/app/views/time_table_combinations/_combine.html.erb
+++ b/app/views/time_table_combinations/_combine.html.erb
@@ -1,4 +1,4 @@
-<div id="combine_form" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div id="modal_combine" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/app/views/time_table_combinations/new.js.erb b/app/views/time_table_combinations/new.js.erb
new file mode 100644
index 000000000..ea98d9aaf
--- /dev/null
+++ b/app/views/time_table_combinations/new.js.erb
@@ -0,0 +1,4 @@
+var combine_form_partial = '<%= j render "time_table_combinations/combine_form" %> ';
+$('#new_time_table_combination').replaceWith(combine_form_partial);
+
+