Merge pull request DamageLabs#139 from gabceb/master

jrgifford · jrgifford · commit b13494f84e05 · 2013-02-27T13:26:02.000-08:00
Removed reference to cloudfuji profile from JS templates
diff --git a/app/assets/javascripts/backbone/plugins/user_list.js.coffee b/app/assets/javascripts/backbone/plugins/user_list.js.coffee
@@ -6,7 +6,7 @@ class Kandan.Plugins.UserList
 
   @template: _.template '''
     <div class="user clearfix">
-      <img class="avatar" src="http://gravatar.com/avatar/<%= gravatarHash %>?s=25&d=https://cloudfuji.com/images/profile.png"/>
+      <img class="avatar" src="http://gravatar.com/avatar/<%= gravatarHash %>?s=25"/>
       <span class="name"><%= name %></span>
     </div>
   '''
diff --git a/app/assets/templates/activity_base.jst.eco b/app/assets/templates/activity_base.jst.eco
@@ -1,7 +1,7 @@
 <span class="posted_at">
   <%= new Date(@activity.created_at).toRelativeTime(Kandan.options.nowThreshold) %>
 </span>
-<img class="avatar" src="http://gravatar.com/avatar/<%= @activity.user.gravatar_hash %>?s=30&d=https://cloudfuji.com/images/profile.png"/>
+<img class="avatar" src="http://gravatar.com/avatar/<%= @activity.user.gravatar_hash %>?s=30"/>
 
 <div class="readable">
   <div class="content">
diff --git a/app/assets/templates/current_user.jst.eco b/app/assets/templates/current_user.jst.eco
@@ -1,2 +1,2 @@
-<img src="http://gravatar.com/avatar/<%= @gravatarHash %>?s=25&d=http://cloudfuji.com/images/profile.png"/>
+<img src="http://gravatar.com/avatar/<%= @gravatarHash %>?s=25"/>
 <span><%= @name %></span>
diff --git a/app/assets/templates/message.jst.eco b/app/assets/templates/message.jst.eco
@@ -1,7 +1,7 @@
 <span class="posted_at">
   <%= new Date(@activity.created_at).toRelativeTime(Kandan.options.nowThreshold) %>
 </span>
-<img class="avatar" src="http://gravatar.com/avatar/<%= @activity.user.gravatar_hash %>?s=30&d=https://cloudfuji.com/images/profile.png"/>
+<img class="avatar" src="http://gravatar.com/avatar/<%= @activity.user.gravatar_hash %>?s=30"/>
 
 <div class="readable">
   <span class="user">
diff --git a/app/assets/templates/user_notification.jst.eco b/app/assets/templates/user_notification.jst.eco
@@ -1,7 +1,7 @@
 <span class="posted_at">
   <%= new Date(@activity.created_at).toRelativeTime(Kandan.options.nowThreshold) %>
 </span>
-<img class="avatar" src="http://gravatar.com/avatar/<%= @activity.user.gravatar_hash %>?s=30&d=https://cloudfuji.com/images/profile.png"/>
+<img class="avatar" src="http://gravatar.com/avatar/<%= @activity.user.gravatar_hash %>?s=30"/>
 
 <div class="readable">
   <span class="user">Kandan bot</span>

-Original file line number
+Diff line change
   @template: _.template '''
     <div class="user clearfix">
 -      <img class="avatar" src="proxy.php?url=http%3A%2F%2Fgravatar.com%2Favatar%2F%26lt%3B%25%3D+gravatarHash+%25%26gt%3B%3Fs%3D25%3Cspan+class%3D"x x-first x-last">&d=https://cloudfuji.com/images/profile.png"/>
 +      <img class="avatar" src="proxy.php?url=http%3A%2F%2Fgravatar.com%2Favatar%2F%26lt%3B%25%3D+gravatarHash+%25%26gt%3B%3Fs%3D25"/>
       <span class="name"><%= name %></span>
     </div>
   '''
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-<img src="http://gravatar.com/avatar/<%= @gravatarHash %>?s=25&d=http://cloudfuji.com/images/profile.png"/>`
	`1`	`+<img src="http://gravatar.com/avatar/<%= @gravatarHash %>?s=25"/>`
`2`	`2`	`<span><%= @name %></span>`