diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/explore/repo_list.tmpl | 38 | ||||
| -rw-r--r-- | templates/org/team/repositories.tmpl | 1 | ||||
| -rw-r--r-- | templates/repo/header.tmpl | 8 | ||||
| -rw-r--r-- | templates/repo/settings/options.tmpl | 1 | ||||
| -rw-r--r-- | templates/user/dashboard/dashboard.tmpl | 8 |
6 files changed, 27 insertions, 31 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 95a1ce39..94f0604e 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.57.0617
\ No newline at end of file +0.11.58.0617 diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 413cdc53..f215c21c 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -2,31 +2,29 @@ {{range .Repos}} <div class="item"> <div class="ui grid"> - <div class="ui two wide column middle aligned"> + <div class="ui two wide column middle aligned center"> {{if .RelAvatarLink}}<img class="ui tiny image" src="{{.RelAvatarLink}}">{{else}}<i class="mega-octicon octicon-repo"></i>{{end}} </div> - <div class="ui fourteen wide column"> - <div class="ui header"> - <a class="name" href="{{AppSubURL}}/{{if .Owner}}{{.Owner.Name}}{{else if $.Org}}{{$.Org.Name}}{{else}}{{$.Owner.Name}}{{end}}/{{.Name}}">{{if $.PageIsExplore}}{{.Owner.Name}} / {{end}}{{.Name}}</a> - {{if .IsPrivate}} - <span class="text gold"><i class="octicon octicon-lock"></i></span> - {{else if .IsFork}} - <span><i class="octicon octicon-repo-forked"></i></span> - {{else if .IsMirror}} - <span><i class="octicon octicon-repo-clone"></i></span> - {{else}} - <span class="text"><i class="octicon octicon-globe"></i></span> - {{end}} + <div class="ui fourteen wide column no-padding-left"> + <div class="ui header"> + <a class="name" href="{{AppSubURL}}/{{if .Owner}}{{.Owner.Name}}{{else if $.Org}}{{$.Org.Name}}{{else}}{{$.Owner.Name}}{{end}}/{{.Name}}">{{if $.PageIsExplore}}{{.Owner.Name}} / {{end}}{{.Name}}</a> + {{if .IsPrivate}} + <span class="text gold"><i class="octicon octicon-lock"></i></span> + {{else if .IsFork}} + <span><i class="octicon octicon-repo-forked"></i></span> + {{else if .IsMirror}} + <span><i class="octicon octicon-repo-clone"></i></span> + {{end}} - <div class="ui right metas"> - <span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span> - <span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span> + <div class="ui right metas"> + <span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span> + <span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span> + </div> + </div> + {{if .Description}}<p class="has-emoji">{{.Description | Str2html}}</p>{{end}} + <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> </div> </div> - {{if .Description}}<p class="has-emoji">{{.Description | Str2html}}</p>{{end}} - <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> - </div> - </div> </div> {{end}} </div> diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index e2cfbe95..4f1ad313 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -17,7 +17,6 @@ <a class="ui red small button right" href="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/remove?repoid={{.ID}}">{{$.i18n.Tr "org.teams.remove_repo"}}</a> {{end}} <a class="member" href="{{AppSubURL}}/{{$.Org.Name}}/{{.Name}}"> - <img height="16px" class="octicon" src="{{.RelAvatarLink}}" /> <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i> <strong>{{$.Org.Name}}/{{.Name}}</strong> </a> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 1bef1903..561f7f5d 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -5,8 +5,12 @@ <div class="column"><!-- start column --> <div class="ui header"> <div class="ui huge breadcrumb"> - {{if .RelAvatarLink}}<img class="ui mini spaced image" src="{{.RelAvatarLink}}">{{else}}<i class="mega-octicon octicon-repo"></i>{{end}} - <i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}globe{{end}}"></i> + {{if .UseCustomAvatar}} + <img class="ui mini spaced image" src="{{.RelAvatarLink}}"> + <i class="{{if .IsPrivate}}mega-octicon octicon-lock{{else if .IsMirror}}mega-octicon octicon-repo-clone{{else if .IsFork}}mega-octicon octicon-repo-forked{{end}}"></i> + {{else}} + <i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i> + {{end}} <a href="{{AppSubURL}}/{{.Owner.Name}}">{{.Owner.Name}}</a> <div class="divider"> / </div> <a href="{{$.RepoLink}}">{{.Name}}</a> diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 8aa4a1f7..f380e984 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -41,7 +41,6 @@ <div class="field"> <button class="ui green button">{{$.i18n.Tr "repo.settings.update_settings"}}</button> </div> - </form> <div class="ui divider"></div> diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index f9f97447..4a0c90a2 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -32,8 +32,7 @@ {{range .Repos}} <li {{if .IsPrivate}}class="private"{{end}}> <a href="{{AppSubURL}}/{{$.ContextUser.Name}}/{{.Name}}"> - {{if .RelAvatarLink}}<img class="ui micro image" src="{{.RelAvatarLink}}" />{{else}}<i class="octicon octicon-repo"></i>{{end}} - <i class="octicon octicon-{{if .IsFork}}repo-forked{{else if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else}}globe{{end}}"></i> + <i class="octicon octicon-{{if .IsFork}}repo-forked{{else if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i> <strong class="text truncate item-name">{{.Name}}</strong> <span class="ui right text light grey"> {{.NumStars}} <i class="octicon octicon-star rear"></i> @@ -58,8 +57,7 @@ {{range .CollaborativeRepos}} <li {{if .IsPrivate}}class="private"{{end}}> <a href="{{AppSubURL}}/{{.Owner.Name}}/{{.Name}}"> - {{if .RelAvatarLink}}<img class="ui micro image" src="{{.RelAvatarLink}}" />{{else}}<i class="octicon octicon-repo"></i>{{end}} - <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}globe{{end}}"></i> + <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i> <span class="text truncate owner-and-repo"> <span class="text truncate owner-name">{{.Owner.Name}}</span> / <strong>{{.Name}}</strong> </span> @@ -90,7 +88,6 @@ {{range .ContextUser.Orgs}} <li> <a href="{{AppSubURL}}/{{.Name}}"> - {{if .RelAvatarLink}}<img class="ui micro image" src="{{.RelAvatarLink}}" />{{else}}<i class="octicon octicon-repo"></i>{{end}} <i class="octicon octicon-organization"></i> <strong class="text truncate item-name">{{.Name}}</strong> <span class="ui right text light grey"> @@ -119,7 +116,6 @@ {{range .Mirrors}} <li {{if .IsPrivate}}class="private"{{end}}> <a href="{{AppSubURL}}/{{$.ContextUser.Name}}/{{.Name}}"> - {{if .RelAvatarLink}}<img class="ui micro image" src="{{.RelAvatarLink}}" />{{else}}<i class="octicon octicon-repo"></i>{{end}} <i class="octicon octicon-repo-clone"></i> <strong class="text truncate item-name">{{.Name}}</strong> <span class="ui right text light grey"> |