diff --git a/Gemfile b/Gemfile index 0d4deeef0..05ffb7fd4 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ gem "acts_as_unvlogable" gem 'youtube_it' gem 'gotcha' + # gem "memcached", "~> 1.4.3" # gem "memcache-client" diff --git a/app/assets/images/loading.gif b/app/assets/images/loading.gif new file mode 100644 index 000000000..d84f65378 Binary files /dev/null and b/app/assets/images/loading.gif differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c0c227fe5..414125b81 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -5,3 +5,4 @@ *= require_self *= require social-share-button */ + diff --git a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb index c4d159d84..b3f269e78 100644 --- a/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb +++ b/vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb @@ -15,10 +15,6 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController @ask_question = AskQuestion.new(params[:ask_question]) if gotcha_valid? && @ask_question.save @acknowledgement = AskAcknowledgement.last - respond_to do |format| - format.js - # format.js { render :thank_you, notice: 'Your question has been successfully sent.' } - end @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new #@ask_question.save redirect_to root_path @@ -27,6 +23,10 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id) end # redirect_to panel_ask_front_end_thank_you_path + respond_to do |format| + format.js + # format.js { render :thank_you, notice: 'Your question has been successfully sent.' } + end end end diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb index afb14ab2f..e38c86be6 100644 --- a/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb +++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb @@ -1,4 +1,34 @@ + + + +