From 5bd929b697883906f053f3f5dbb1e9f07bf7a952 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Sun, 22 Jan 2012 20:46:13 -0800
Subject: [PATCH] Remove references to GetSatisfaction

---
 app/views/layouts/application.html.haml | 16 ---------
 config/locales/diaspora/en.yml          |  4 ---
 public/500.html                         | 44 +------------------------
 public/be_back_soon.html                |  1 -
 public/default.html                     |  1 -
 5 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 6b679f174..1dea77dc8 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -147,19 +147,3 @@
           %li= link_to t('.whats_new'), 'https://github.com/diaspora/diaspora/wiki/Changelog'
           %li= link_to(t('layouts.application.toggle'), toggle_mobile_path)  if is_mobile_device?
         = image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"
-
-    -if !@landing_page && request.url.match(/joindiaspora.com/)
-      :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);
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dc2c60bb1..b43741914 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -184,11 +184,7 @@ en:
         tag_bug: "bug"
         feature_suggestion: "... have a %{link} suggestion?"
         tag_feature: "feature"
-
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
-
-
-        satisfaction: "%{link}: Community-powered support"
         email_feedback: "%{link} your feedback, if you prefer"
       cubbies:
         heading: "Connect to Cubbi.es"
diff --git a/public/500.html b/public/500.html
index 9170d54ce..92944bfab 100644
--- a/public/500.html
+++ b/public/500.html
@@ -28,26 +28,6 @@
 			color: #444;
 			line-height: 1.5em;
 		}
-
-		#satisfaction {
-			display:inline-block;
-			width: 800px;
-			margin-top: 50px;
-			background-color: #fff;
-
-			position: relative;
-			padding: 12px;
-			background-color: white;
-			-webkit-box-shadow: 0 1px 3px #333333;
-			-moz-box-shadow: 0 1px 3px #333333;
-			-webkit-border-radius: 2px;
-			-moz-border-radius: 2px;
-			border-radius: 2px;
-			border-bottom: 1px solid #cccccc;
-			border-top: 1px solid white;
-
-			max-height: 300px;
-		}
 	</style>
 </head>
 
@@ -61,29 +41,7 @@
 		500: Internal server error.
 	</h1>
 	<h3>
-		Our bad!  Want to tell us how you got here?
+		Our bad! Sorry about that. :(
 	</h3>
-
-	<div id="satisfaction">
-		<script type="text/javascript" charset="utf-8">
-      if(window.location.hostname == 'joindiaspora.com'){
-			  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"));
-      }
-		</script>
-
-		<script type="text/javascript" charset="utf-8">
-      if(window.location.hostname == 'joindiaspora.com'){
-			  var feedback_widget_options = {};
-			  feedback_widget_options.display = "inline";  
-			  feedback_widget_options.company = "diaspora";
-			  feedback_widget_options.style = 'problem';
-        var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
-      }
-		</script>
-
-	</div>
-
 </body>
 </html>
diff --git a/public/be_back_soon.html b/public/be_back_soon.html
index 17de38125..18651878a 100644
--- a/public/be_back_soon.html
+++ b/public/be_back_soon.html
@@ -149,7 +149,6 @@ new TWTR.Widget({
       <h3>Still need your DIASPORA* fix?</h3>
       <ul>
         <li><a href='http://twitter.com/joindiaspora'>@joindiaspora</a></li>
-        <li><a href='http://getsatisfaction.com/diaspora'>Get Satisfaction</a></li>
         <li><a href='https://github.com'>GitHub</a></li>
       </ul>
 		</div> 
diff --git a/public/default.html b/public/default.html
index 83efc045e..70fbcd1fa 100644
--- a/public/default.html
+++ b/public/default.html
@@ -155,7 +155,6 @@
           <li><a href="http://groups.google.com/group/diaspora-dev" title="Dev mailing list">Discussion - Development</a></li>
         </ul>
         <ul class="section">
-          <li><a href="http://getsatisfaction.com/diaspora/" title="Get Satisfaction">User Feedback</a></li>
           <li><a href="http://guides.rubyonrails.org/">Learn more about Ruby On Rails!</a></li>
         </ul>
       </ul>