diff --git a/Gemfile.lock b/Gemfile.lock index 1fc7e6af..3c159ef2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,7 @@ GEM rails (~> 3.1) builder (3.0.4) cancan (1.6.10) + celluloid (0.10.0) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.4) @@ -50,6 +51,7 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + connection_pool (0.9.3) devise (3.2.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -94,10 +96,13 @@ GEM mime-types pg (0.17.1) pg (0.17.1-x86-mingw32) + phantomjs (1.9.7.1) polyglot (0.3.4) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) + rack-protection (1.5.3) + rack rack-ssl (1.3.4) rack rack-test (0.6.2) @@ -123,16 +128,32 @@ GEM rdoc (3.12.2) json (~> 1.4) redis (2.2.2) + redis-namespace (1.1.1) + redis (< 3.0.0) sass (3.3.7) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sidekiq (1.2.1) + celluloid (~> 0.10.0) + connection_pool (~> 0.9.0) + multi_json (~> 1) + redis + redis-namespace + sinatra (1.4.5) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + slim (2.0.3) + temple (~> 0.6.6) + tilt (>= 1.3.3, < 2.1) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + temple (0.6.8) thor (0.19.1) thread_safe (0.3.3) tilt (1.4.1) @@ -168,9 +189,13 @@ DEPENDENCIES kaminari paperclip pg + phantomjs rails (= 3.2.17) rails3-jquery-autocomplete redis (= 2.2.2) sass-rails + sidekiq + sinatra + slim uglifier (>= 1.0.3) uservoice-ruby diff --git a/app/assets/barometer.js b/app/assets/barometer.js deleted file mode 100644 index 30b1451e..00000000 --- a/app/assets/barometer.js +++ /dev/null @@ -1,32 +0,0 @@ -var BAROMETER; -if(BAROMETER == undefined) { - BAROMETER = {}; -} - -//BAROMETER.load = function(barometer_id) { - this.barometer_id = barometer_id; - this.empty_url = "http://getbarometer.s3.amazonaws.com/assets/barometer/images/transparent.gif"; - this.feedback_url = 'http://getbarometer.com/system/feedback_form/' + this.barometer_id; - - this.tab_html = 'Feedback'; - this.overlay_html = ''; - - document.write(this.tab_html); - document.write(this.overlay_html); -}; - -BAROMETER.show = function() { - document.getElementById('barometer_iframe').setAttribute("src", this.feedback_url); - document.getElementById('barometer_overlay').style.display = "block"; - return false; -}; \ No newline at end of file