diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-10 22:21:12 +0800 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-10 22:21:12 +0800 |
commit | 94c7278194694fec728b518d4390b03ba6c237a4 (patch) | |
tree | 2aebf5fe63423b7b2eb14d58697bab1c95ffb3bb /templates/repo | |
parent | 16b6e5d50b665c5376b61ca7d02e3716a1c05ead (diff) | |
parent | 2577940c30f6a6d15390974ab36f8c3d1e00f9f4 (diff) | |
download | gitea-94c7278194694fec728b518d4390b03ba6c237a4.tar.gz gitea-94c7278194694fec728b518d4390b03ba6c237a4.zip |
Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
web.go
Diffstat (limited to 'templates/repo')
-rw-r--r-- | templates/repo/setting.tmpl | 5 | ||||
-rw-r--r-- | templates/repo/toolbar.tmpl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl index 6e2d3bec8b..85d08c5973 100644 --- a/templates/repo/setting.tmpl +++ b/templates/repo/setting.tmpl @@ -23,9 +23,10 @@ {{.CsrfTokenHtml}} <input type="hidden" name="action" value="update"> <div class="form-group"> - <label class="col-md-3 text-right">Name</label> + <label class="col-md-3 text-right" for="repo-setting-name">Name</label> <div class="col-md-9"> - <input class="form-control" name="name" value="{{.Repository.Name}}" title="{{.Repository.Name}}" /> + <input class="form-control" name="name" value="{{.Repository.Name}}" title="{{.Repository.Name}}" id="repo-setting-name"/> + <p class="help-block hidden"><span class="text-danger">Cautious : </span>your repository name is changing !</p> </div> </div> diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl index 5484204832..d8ab26214c 100644 --- a/templates/repo/toolbar.tmpl +++ b/templates/repo/toolbar.tmpl @@ -15,7 +15,7 @@ {{end}} <li class="{{if .IsRepoToolbarReleases}}active{{end}}"><a href="{{.RepoLink}}/releases">{{if .Repository.NumReleases}}<span class="badge">{{.Repository.NumReleases}}</span> {{end}}Releases</a></li> {{if .IsRepoToolbarReleases}} - <li class="tmp"><a href="{{.RepoLink}}/releases/new"><button class="btn btn-primary btn-sm">New Release</button></a></li> + <li class="tmp">{{if not .IsRepoReleaseNew}}<a href="{{.RepoLink}}/releases/new"><button class="btn btn-primary btn-sm">New Release</button></a>{{end}}</li> {{end}} <!-- <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> |