diff --git a/app/assets/javascripts/experiments/index.js b/app/assets/javascripts/experiments/index.js index 7fb43df6e..18a8d0874 100644 --- a/app/assets/javascripts/experiments/index.js +++ b/app/assets/javascripts/experiments/index.js @@ -27,13 +27,15 @@ // Initialize edit experiment form function initializeEditExperimentModal(){ + console.log($("#edit-experiment").data('id')); + var id = '#edit-experiment-modal-' + $("#edit-experiment").data('id'); $("#edit-experiment") .on("ajax:beforeSend", function(){ animateSpinner(); }) .on("ajax:success", function(e, data){ $('body').append($.parseHTML(data.html)); - $('#edit-experiment-modal').modal('show',{ + $(id).modal('show',{ backdrop: true, keyboard: false, }); diff --git a/app/assets/javascripts/projects/show.js b/app/assets/javascripts/projects/show.js new file mode 100644 index 000000000..4021b8935 --- /dev/null +++ b/app/assets/javascripts/projects/show.js @@ -0,0 +1,57 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. + +(function(){ + + // Initialize new experiment form + function initializeNewExperimentModal(){ + $("#new-experiment") + .on("ajax:beforeSend", function(){ + animateSpinner(); + }) + .on("ajax:success", function(e, data){ + $('body').append($.parseHTML(data.html)); + $('#new-experiment-modal').modal('show',{ + backdrop: true, + keyboard: false, + }); + }) + .on("ajax:error", function() { + animateSpinner(null, false); + // TODO + }) + .on("ajax:complete", function(){ + animateSpinner(null, false); + }); + } + + // Initialize edit experiment form + function initializeEditExperimentsModal(){ + $.each($(".experiment-panel"), function(){ + var id = '#edit-experiment-modal-' + $(this).data('id'); + $(this) + .on("ajax:beforeSend", function(){ + animateSpinner(); + }) + .on("ajax:success", function(e, data){ + console.log("request success"); + $('body').append($.parseHTML(data.html)); + $(id).modal('show',{ + backdrop: true, + keyboard: false, + }); + }) + .on("ajax:error", function() { + animateSpinner(null, false); + // TODO + }) + .on("ajax:complete", function(){ + animateSpinner(null, false); + }); + }); + } + + // init modals + initializeNewExperimentModal(); + initializeEditExperimentsModal(); +})(); diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index ddbb4f5a7..985a8bee6 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -405,4 +405,21 @@ li.module-hover { .create-new-tag-btn { margin-right: 15px; } -} \ No newline at end of file +} + +// EXPERIMENT PANEL + +.experiment-panel{ + max-width: 650px; + margin: 0 auto; + margin-top: 25px; + @include box-shadow(0px 4px 8px 0px $color-dove-gray); + +} + +// SHOW +.center-btn{ + margin: 0 auto; + display: block; + max-width: 200px; +} diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 1aff48317..b6118e43f 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -57,7 +57,7 @@ class ExperimentsController < ApplicationController if @experiment.save flash[:success] = t('experiments.update.success_flash', experiment: @experiment.name) - redirect_to canvas_experiment_path(@experiment) + redirect_to project_path(@experiment.project) else flash[:alert] = t('experiments.update.error_flash') redirect_to :back diff --git a/app/views/experiments/_edit_modal.html.erb b/app/views/experiments/_edit_modal.html.erb index 2fb063ad3..b3a362e29 100644 --- a/app/views/experiments/_edit_modal.html.erb +++ b/app/views/experiments/_edit_modal.html.erb @@ -1,5 +1,9 @@ -