Merge branch 'master' into develop

polaris1119 · polaris1119 · commit f4817d8f13c1 · 2014-11-15T15:24:53.000+08:00
diff --git a/websites/code/studygolang/src/util/tool.go b/websites/code/studygolang/src/util/tool.go
@@ -37,5 +37,5 @@ func Gravatar(emailI interface{}, size uint16) string {
 		// TODO:给一个默认的？
 		return ""
 	}
-	return fmt.Sprintf("http://www.gravatar.com/avatar/%s?s=%d", Md5(email), size)
+	return fmt.Sprintf("http://gravatar.duoshuo.com/avatar/%s?s=%d", Md5(email), size)
 }
diff --git a/websites/code/studygolang/static/js/comment.js b/websites/code/studygolang/static/js/comment.js
@@ -78,7 +78,7 @@
 
 						var avatar = user.avatar;
 						if (avatar == "") {
-							avatar = 'http://www.gravatar.com/avatar/'+md5(user.email)+"?s=48";
+							avatar = 'http://gravatar.duoshuo.com/avatar/'+md5(user.email)+"?s=48";
 						}
 						
 						var cmtTime = SG.timeago(comments[i].ctime);
diff --git a/websites/code/studygolang/static/js/sidebar.js b/websites/code/studygolang/static/js/sidebar.js
@@ -148,7 +148,7 @@ $(function(){
 
 				var avatar = user.avatar;
 				if (avatar == "") {
-					avatar = 'http://www.gravatar.com/avatar/'+md5(user.email)+"?s=40";
+					avatar = 'http://gravatar.duoshuo.com/avatar/'+md5(user.email)+"?s=40";
 				}
 				
 				var cmtTime = SG.timeago(comments[i].ctime);
@@ -198,7 +198,7 @@ $(function(){
 			for(var	i in data) {
 				var avatar = data[i].avatar;
 				if (avatar == "") {
-					avatar = 'http://www.gravatar.com/avatar/'+md5(data[i].email)+"?s=40";
+					avatar = 'http://gravatar.duoshuo.com/avatar/'+md5(data[i].email)+"?s=40";
 				}
 				
 				content	+= '<li	class="pull-left">'+

Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ func Gravatar(emailI interface{}, size uint16) string {`
`37`	`37`	`// TODO:给一个默认的？`
`38`	`38`	`return ""`
`39`	`39`	`}`
`40`		`- return fmt.Sprintf("http://www.gravatar.com/avatar/%s?s=%d", Md5(email), size)`
	`40`	`+ return fmt.Sprintf("http://gravatar.duoshuo.com/avatar/%s?s=%d", Md5(email), size)`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`
`79`	`79`	`var avatar = user.avatar;`
`80`	`80`	`if (avatar == "") {`
`81`		`- avatar = 'http://www.gravatar.com/avatar/'+md5(user.email)+"?s=48";`
	`81`	`+ avatar = 'http://gravatar.duoshuo.com/avatar/'+md5(user.email)+"?s=48";`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`var cmtTime = SG.timeago(comments[i].ctime);`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ $(function(){`
`148`	`148`
`149`	`149`	`var avatar = user.avatar;`
`150`	`150`	`if (avatar == "") {`
`151`		`- avatar = 'http://www.gravatar.com/avatar/'+md5(user.email)+"?s=40";`
	`151`	`+ avatar = 'http://gravatar.duoshuo.com/avatar/'+md5(user.email)+"?s=40";`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`var cmtTime = SG.timeago(comments[i].ctime);`
`@@ -198,7 +198,7 @@ $(function(){`
`198`	`198`	`for(var i in data) {`
`199`	`199`	`var avatar = data[i].avatar;`
`200`	`200`	`if (avatar == "") {`
`201`		`- avatar = 'http://www.gravatar.com/avatar/'+md5(data[i].email)+"?s=40";`
	`201`	`+ avatar = 'http://gravatar.duoshuo.com/avatar/'+md5(data[i].email)+"?s=40";`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`content += '<li class="pull-left">'+`