From c631a4a9b988e63bd8b07dfdeee1f1d4b3ad7d45 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Fri, 15 Jan 2016 18:00:39 +0800
Subject: [PATCH] URL fix for #2287

---
 models/action.go                    |  4 ++++
 public/css/gogs.css                 |  7 +++++++
 public/less/_dashboard.less         |  7 +++++++
 templates/user/dashboard/feeds.tmpl | 18 +++++++++---------
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/models/action.go b/models/action.go
index 4e5f461a3..33d5246ee 100644
--- a/models/action.go
+++ b/models/action.go
@@ -123,6 +123,10 @@ func (a *Action) ShortRepoName() string {
 }
 
 func (a *Action) GetRepoPath() string {
+	return path.Join(a.RepoUserName, a.RepoName)
+}
+
+func (a *Action) ShortRepoPath() string {
 	return path.Join(a.ShortRepoUserName(), a.ShortRepoName())
 }
 
diff --git a/public/css/gogs.css b/public/css/gogs.css
index 452d4a19a..e37d7bdc9 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -3030,6 +3030,13 @@ footer .container .links > *:first-child {
 .feeds .news .commit-id {
   font-family: Consolas, monospace;
 }
+.feeds .news code {
+  padding: 1px;
+  font-size: 85%;
+  background-color: rgba(0, 0, 0, 0.04);
+  border-radius: 3px;
+  word-break: break-all;
+}
 .feeds .list .header {
   padding-top: 10px;
   padding-bottom: 5px;
diff --git a/public/less/_dashboard.less b/public/less/_dashboard.less
index f194dc128..b5dff32d5 100644
--- a/public/less/_dashboard.less
+++ b/public/less/_dashboard.less
@@ -86,6 +86,13 @@
 		.commit-id {
 			font-family: Consolas, monospace;
 		}
+		code {
+			padding: 1px;
+			font-size: 85%;
+			background-color: rgba(0, 0, 0, 0.04);
+			border-radius: 3px;
+			word-break: break-all;
+		}
 	}
 
 	.list {
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index ac68ea692..17b40d953 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -9,28 +9,28 @@
 					<p>
 						<a href="{{AppSubUrl}}/{{.GetActUserName}}">{{.ShortActUserName}}</a>
 						{{if eq .GetOpType 1}}
-							{{$.i18n.Tr "action.create_repo" .GetRepoLink .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.create_repo" .GetRepoLink .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 2}}
-							{{$.i18n.Tr "action.rename_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.rename_repo" .GetContent .GetRepoLink .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 5}}
 							{{ $branchLink := .GetBranch | EscapePound}}
-							{{$.i18n.Tr "action.commit_repo" .GetRepoLink $branchLink .GetBranch .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.commit_repo" .GetRepoLink $branchLink .GetBranch .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 6}}
 							{{ $index := index .GetIssueInfos 0}}
-							{{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.create_issue" .GetRepoLink $index .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 7}}
 							{{ $index := index .GetIssueInfos 0}}
-							{{$.i18n.Tr "action.create_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.create_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 8}}
-							{{$.i18n.Tr "action.transfer_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.transfer_repo" .GetContent .GetRepoLink .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 9}}
-							{{$.i18n.Tr "action.push_tag" .GetRepoLink .GetBranch .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.push_tag" .GetRepoLink .GetBranch .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 10}}
 							{{ $index := index .GetIssueInfos 0}}
-							{{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .ShortRepoPath | Str2html}}
 						{{else if eq .GetOpType 11}}
 							{{ $index := index .GetIssueInfos 0}}
-							{{$.i18n.Tr "action.merge_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}}
+							{{$.i18n.Tr "action.merge_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}}
 						{{end}}
 					</p>
 					{{if eq .GetOpType 5}}