diff options
Diffstat (limited to 'templates/user')
-rw-r--r-- | templates/user/dashboard/dashboard.tmpl | 2 | ||||
-rw-r--r-- | templates/user/dashboard/issues.tmpl | 8 | ||||
-rw-r--r-- | templates/user/dashboard/navbar.tmpl | 8 | ||||
-rw-r--r-- | templates/user/meta/header.tmpl | 8 | ||||
-rw-r--r-- | templates/user/profile.tmpl | 14 | ||||
-rw-r--r-- | templates/user/settings/organizations.tmpl | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 6dd3ccb9..b9a5d340 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -42,7 +42,7 @@ {{end}} {{if gt .ContextUser.NumRepos .MaxShowRepoNum}} <li> - <a href="{{.ContextUser.HomeLink}}">{{.i18n.Tr "home.show_more_repos"}}</a> + <a href="{{.ContextUser.HomeURLPath}}">{{.i18n.Tr "home.show_more_repos"}}</a> </li> {{end}} </ul> diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index b1b6f602..2efada37 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -73,7 +73,7 @@ {{if .NumComments}} <span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span> {{end}} - + <div> <span class="ui right"> {{range .Labels}} @@ -83,10 +83,10 @@ </div> <p class="desc"> - {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeURLPath .Poster.Name | Safe}} {{if .Assignee}} - <a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center"> - <img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> + <a class="ui right assignee poping up" href="{{.Assignee.HomeURLPath}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center"> + <img class="ui avatar image" src="{{.Assignee.AvatarURLPath}}"> </a> {{end}} </p> diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 3ba9f2c2..5a97e1bb 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -1,7 +1,7 @@ <div class="ui container"> <div class="ui floating dropdown link jump"> <span class="text"> - <img class="ui avatar image" src="{{.ContextUser.RelAvatarLink}}"> + <img class="ui avatar image" src="{{.ContextUser.AvatarURLPath}}"> {{.ContextUser.ShortName 20}} <i class="dropdown icon"></i> </span> @@ -11,12 +11,12 @@ </div> <div class="items"> <a class="{{if eq .ContextUser.ID .LoggedUser.ID}}active selected{{end}} item" href="{{AppSubURL}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}"> - <img class="ui avatar image" src="{{.LoggedUser.RelAvatarLink}}"> + <img class="ui avatar image" src="{{.LoggedUser.AvatarURLPath}}"> {{.LoggedUser.Name}} </a> {{range .Orgs}} <a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" href="{{AppSubURL}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else}}dashboard{{end}}"> - <img class="ui avatar image" src="{{.RelAvatarLink}}"> + <img class="ui avatar image" src="{{.AvatarURLPath}}"> {{.ShortName 20}} </a> {{end}} @@ -41,7 +41,7 @@ </a> <div class="right menu"> <div class="item"> - <a class="ui blue basic button" href="{{.ContextUser.HomeLink}}"> + <a class="ui blue basic button" href="{{.ContextUser.HomeURLPath}}"> {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}} </a> </div> diff --git a/templates/user/meta/header.tmpl b/templates/user/meta/header.tmpl index 3d1fce03..9d164ae3 100644 --- a/templates/user/meta/header.tmpl +++ b/templates/user/meta/header.tmpl @@ -1,8 +1,8 @@ {{with .Owner}} <div class="ui container"> - <img class="ui avatar image" src="{{.RelAvatarLink}}"> + <img class="ui avatar image" src="{{.AvatarURLPath}}"> <span class="header name"> - <a href="{{.HomeLink}}">{{.Name}}</a> + <a href="{{.HomeURLPath}}">{{.Name}}</a> {{with .FullName}}({{.}}){{end}} </span> @@ -11,9 +11,9 @@ {{if and $.IsLogged (ne $.LoggedUserName .Name)}} <div class="follow"> {{if $.LoggedUser.IsFollowing .ID}} - <a class="ui small basic red button" href="{{.HomeLink}}/action/unfollow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{$.i18n.Tr "user.unfollow"}}</a> + <a class="ui small basic red button" href="{{.HomeURLPath}}/action/unfollow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{$.i18n.Tr "user.unfollow"}}</a> {{else}} - <a class="ui small basic green button" href="{{.HomeLink}}/action/follow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{$.i18n.Tr "user.follow"}}</a> + <a class="ui small basic green button" href="{{.HomeURLPath}}/action/follow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{$.i18n.Tr "user.follow"}}</a> {{end}} </div> {{end}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 9849a804..7e2c6bc6 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -6,11 +6,11 @@ <div class="ui card"> {{if eq .LoggedUserName .Owner.Name}} <a class="profile-avatar image poping up" href="{{AppSubURL}}/user/settings/avatar" id="profile-avatar" data-content="{{.i18n.Tr "user.change_avatar"}}" data-variation="inverted tiny" data-position="bottom center"> - <img src="{{AppendAvatarSize .Owner.RelAvatarLink 287}}" title="{{.Owner.Name}}"/> + <img src="{{AppendAvatarSize .Owner.AvatarURLPath 287}}" title="{{.Owner.Name}}"/> </a> {{else}} <span class="profile-avatar image"> - <img src="{{AppendAvatarSize .Owner.RelAvatarLink 287}}" title="{{.Owner.Name}}"/> + <img src="{{AppendAvatarSize .Owner.AvatarURLPath 287}}" title="{{.Owner.Name}}"/> </span> {{end}} <div class="content"> @@ -37,11 +37,11 @@ <li><i class="octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}</li> <li> <i class="octicon octicon-person"></i> - <a href="{{.Owner.HomeLink}}/followers"> + <a href="{{.Owner.HomeURLPath}}/followers"> {{.Owner.NumFollowers}} {{.i18n.Tr "user.followers"}} </a> - - <a href="{{.Owner.HomeLink}}/following"> + <a href="{{.Owner.HomeURLPath}}/following"> {{.Owner.NumFollowing}} {{.i18n.Tr "user.following"}} </a> </li> @@ -56,7 +56,7 @@ {{if .Orgs}} <li> {{range .Orgs}} - <a href="{{.HomeURLPath}}"><img class="ui mini image poping up" src="{{.RelAvatarLink}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a> + <a href="{{.HomeURLPath}}"><img class="ui mini image poping up" src="{{.AvatarURLPath}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a> {{end}} </li> {{end}} @@ -85,11 +85,11 @@ </div> <div class="ui eleven wide column"> <div class="ui secondary pointing menu"> - <a class="{{if ne .TabName "activity"}}active{{end}} item" href="{{.Owner.HomeLink}}"> + <a class="{{if ne .TabName "activity"}}active{{end}} item" href="{{.Owner.HomeURLPath}}"> <i class="octicon octicon-repo"></i> {{.i18n.Tr "user.repositories"}} </a> <a class="item"> - <a class="{{if eq .TabName "activity"}}active{{end}} item" href="{{.Owner.HomeLink}}?tab=activity"> + <a class="{{if eq .TabName "activity"}}active{{end}} item" href="{{.Owner.HomeURLPath}}?tab=activity"> <i class="octicon octicon-rss"></i> {{.i18n.Tr "user.activity"}} </a> </a> diff --git a/templates/user/settings/organizations.tmpl b/templates/user/settings/organizations.tmpl index fc4551cc..e376e079 100644 --- a/templates/user/settings/organizations.tmpl +++ b/templates/user/settings/organizations.tmpl @@ -21,9 +21,9 @@ {{$.i18n.Tr "org.members.leave"}} </button> </div> - <img class="ui mini image" src="{{.RelAvatarLink}}"> + <img class="ui mini image" src="{{.AvatarURLPath}}"> <div class="content"> - <a href="{{.HomeLink}}">{{.Name}}</a> + <a href="{{.HomeURLPath}}">{{.Name}}</a> </div> </div> {{end}} |