summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-11-18 15:11:37 -0500
committerUnknwon <u@gogs.io>2015-11-18 15:11:37 -0500
commit81d7359fdd3042aed0bcb4a8e5dee24208d34e58 (patch)
tree06ddf73fb2ee69c21f1d73c8b030d72ba92f2e83 /templates
parent9a0902523b36dcf086aa0eafcfb9e93131bc027c (diff)
downloadgitea-81d7359fdd3042aed0bcb4a8e5dee24208d34e58.tar.gz
gitea-81d7359fdd3042aed0bcb4a8e5dee24208d34e58.zip
fix #1981
Diffstat (limited to 'templates')
-rw-r--r--templates/repo/header_old.tmpl42
-rw-r--r--templates/repo/pulls/fork.tmpl4
-rw-r--r--templates/repo/setting_nav.tmpl7
3 files changed, 2 insertions, 51 deletions
diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl
deleted file mode 100644
index 7a51009573..0000000000
--- a/templates/repo/header_old.tmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-{{with .Repository}}
-<div id="repo-header" class="clear">
- <div class="container clear">
- <h1 id="repo-header-name" class="left public">
- <i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
- <a class="author" href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
- <span class="divider">/</span>
- <a class="repo text-bold" href="{{$.RepoLink}}">{{.Name}}</a>
- {{if .IsMirror}}<span class="label label-gray">{{$.i18n.Tr "mirror"}}</span>{{end}}
- {{if .IsFork}}<span class="fork-flag">forked from <a href="{{.BaseRepo.RepoLink}}">{{SubStr .BaseRepo.RepoLink 1 -1}}</a></span>{{end}}
- </h1>
- <ul id="repo-header-meta" class="right menu menu-line">
- <li id="repo-header-watch">
- <a id="repo-header-watch-btn" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch">
- <button class="btn btn-gray text-bold btn-radius">
- <i class="octicon octicon-eye-watch"></i>{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}}<span class="num">{{.NumWatches}}</span>
- </button>
- </a>
- </li>
- <li id="repo-header-star">
- <a id="repo-header-star-btn" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star">
- <button class="btn btn-gray text-bold btn-radius">
- <i class="octicon octicon-star"></i>{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}}
- <span class="num">{{.NumStars}}</span>
- </button>
- </a>
- </li>
- {{if .CanBeForked}}
- <li id="repo-header-fork">
- <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{end}}>
- <button class="btn btn-gray text-bold btn-radius">
- <i class="octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}}
- <span class="num">{{.NumForks}}</span>
- </button>
- </a>
-
- </li>
- {{end}}
- </ul>
- </div>
-</div>
-{{end}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
index cc2005c226..c3e8e1e52c 100644
--- a/templates/repo/pulls/fork.tmpl
+++ b/templates/repo/pulls/fork.tmpl
@@ -52,8 +52,8 @@
<span class="help">{{.i18n.Tr "repo.fork_visiblity_helper"}}</span>
</div>
<div class="inline field {{if .Err_Description}}error{{end}}">
- <label for="desc">{{.i18n.Tr "repo.repo_desc"}}</label>
- <textarea id="desc" name="desc">{{.desc}}</textarea>
+ <label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
+ <textarea id="description" name="description">{{.description}}</textarea>
</div>
<div class="inline field">
diff --git a/templates/repo/setting_nav.tmpl b/templates/repo/setting_nav.tmpl
deleted file mode 100644
index 5aa77f0b85..0000000000
--- a/templates/repo/setting_nav.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="user-setting-nav" class="col-md-2 repo-setting-nav">
- <ul class="list-group">
- <li class="list-group-item{{if .IsRepoToolbarSetting}} active{{end}}"><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings">Options</a></li>
- <li class="list-group-item{{if .IsRepoToolbarCollaboration}} active{{end}}"><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings/collaboration">Collaborators</a></li>
- <li class="list-group-item{{if .IsRepoToolbarWebHooks}} active{{end}}"><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/settings/hooks">Webhooks</a></li>
- </ul>
-</div> \ No newline at end of file