diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 96b809e30..6734dfd9c 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -57,9 +57,29 @@
}, function() {
$(this).children(".destroy_link").fadeOut(0);
});
-
});
- = javascript_include_tag 'satisfaction'
+ /= javascript_include_tag 'satisfaction' , 'satisfaction-display'
+ :javascript
+ var is_ssl = ("https:" == document.location.protocol);
+ var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
+ document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+
+ :javascript
+
+ var feedback_widget_options = {};
+
+ feedback_widget_options.display = "overlay";
+ feedback_widget_options.company = "diaspora";
+ feedback_widget_options.placement = "right";
+ feedback_widget_options.color = "#222";
+ feedback_widget_options.style = "idea";
+
+ var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
+
+
+
+
+
%body
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
diff --git a/public/javascripts/satisfaction-display.js b/public/javascripts/satisfaction-display.js
new file mode 100644
index 000000000..57fb36012
--- /dev/null
+++ b/public/javascripts/satisfaction-display.js
@@ -0,0 +1,10 @@
+ var feedback_widget_options = {};
+
+ feedback_widget_options.display = "inline";
+ feedback_widget_options.company = "diaspora";
+ feedback_widget_options.placement = "left";
+ feedback_widget_options.color = "#222";
+ feedback_widget_options.style = "idea";
+
+
+ var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
diff --git a/public/javascripts/satisfaction.js b/public/javascripts/satisfaction.js
index 16dcf52e8..b8efb5890 100644
--- a/public/javascripts/satisfaction.js
+++ b/public/javascripts/satisfaction.js
@@ -1,14 +1,3 @@
var is_ssl = ("https:" == document.location.protocol);
var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
-
- var feedback_widget_options = {};
-
- feedback_widget_options.display = "inline";
- feedback_widget_options.company = "diaspora";
- feedback_widget_options.placement = "left";
- feedback_widget_options.color = "#222";
- feedback_widget_options.style = "idea";
-
-
- var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 4851adf2f..97bd0f111 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -45,7 +45,6 @@ $(document).ready(function(){
});
});
-
$('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130);