thanks to dan, GS works great now MS RS
This commit is contained in:
parent
67123c664a
commit
ee9acc5c82
4 changed files with 32 additions and 14 deletions
|
|
@ -57,9 +57,29 @@
|
||||||
}, function() {
|
}, function() {
|
||||||
$(this).children(".destroy_link").fadeOut(0);
|
$(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
|
%body
|
||||||
- flash.each do |name, msg|
|
- flash.each do |name, msg|
|
||||||
= content_tag :div, msg, :id => "flash_#{name}"
|
= content_tag :div, msg, :id => "flash_#{name}"
|
||||||
|
|
|
||||||
10
public/javascripts/satisfaction-display.js
Normal file
10
public/javascripts/satisfaction-display.js
Normal file
|
|
@ -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);
|
||||||
|
|
@ -1,14 +1,3 @@
|
||||||
var is_ssl = ("https:" == document.location.protocol);
|
var is_ssl = ("https:" == document.location.protocol);
|
||||||
var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
|
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"));
|
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);
|
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@ $(document).ready(function(){
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130);
|
$('#flash_notice, #flash_error, #flash_alert').delay(1500).slideUp(130);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue