diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/release/list.tmpl | 86 | ||||
-rw-r--r-- | templates/repo/nav.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/setting.tmpl | 10 | ||||
-rw-r--r-- | templates/repo/single_bare.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/toolbar.tmpl | 14 | ||||
-rw-r--r-- | templates/user/setting.tmpl | 17 |
6 files changed, 117 insertions, 16 deletions
diff --git a/templates/release/list.tmpl b/templates/release/list.tmpl new file mode 100644 index 0000000000..d7c4674e84 --- /dev/null +++ b/templates/release/list.tmpl @@ -0,0 +1,86 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +{{template "repo/nav" .}} +{{template "repo/toolbar" .}} +<div id="body" class="container"> + <div id="release"> + <h4 id="release-head"> + <span class="release"><strong>Release</strong></span> / + <a class="tag" href="/{tag_link}">Tags</a> + <!-- comment : if in tag page, show a.release and span.tag please --> + </h4> + <ul id="release-list" class="list-unstyled"> + <li class="release-item release-tag clearfix" id="release-tag-{release_tag_id}"> + <div class="col-md-2 text-right"> + <a class="commit" href="{commit_link}"><i class="fa fa-code"></i>commit-sha</a> + </div> + <div class="col-md-10"> + <h5 class="title"><a href="{release_single_link}">Release Tag</a><i class="fa fa-tag"></i></h5> + <p class="info"> + <span class="author"><img class="avatar" src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132" alt="" width="20"> + <a href="/user/fuxiaohei">fuxiaohei</a></span> + <span class="time">1 week ago</span> + <span class="ahead"><strong>0</strong> commits since this tag</span> + </p> + <p class="download"> + <a class="download-link" href="{release_download_link}"><i class="fa fa-download"></i>zip</a> + <a class="download-link" href="{release_download_link}"><i class="fa fa-download"></i>tar.gz</a> + </p> + <span class="dot"> </span> + </div> + </li> + <li class="release-item clearfix" id="release-{release_id}"> + <div class="col-md-2 text-right"> + <span class="btn btn-success status stable">Stable</span> + <a class="tag" href="{commit_link}"><i class="fa fa-tag"></i>release tag</a> + <a class="commit" href="{commit_link}"><i class="fa fa-code"></i>commit-sha</a> + </div> + <div class="col-md-10"> + <h4 class="title"><a href="{release_single_link}">Release Title</a></h4> + <p class="info"> + <span class="author"><img class="avatar" src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132" alt="" width="20"> + <a href="/user/fuxiaohei">fuxiaohei</a></span> + <span class="time">1 week ago</span> + <span class="ahead"><strong>0</strong> commits since this tag</span> + </p> + <div class="markdown desc"> + release descriptions, support markdown content + </div> + <p class="download"> + <a class="btn btn-default" href="{release_download_link}"><i class="fa fa-download"></i>Source Code (ZIP)</a> + <a class="btn btn-default" href="{release_download_link}"><i class="fa fa-download"></i>Source Code (TAR.GZ)</a> + </p> + <span class="dot"> </span> + </div> + </li> + <li class="release-item clearfix" id="release-{release_id}"> + <div class="col-md-2 text-right"> + <span class="btn btn-warning status pre-release">Pre-Release</span> + <a class="tag" href="{commit_link}"><i class="fa fa-tag"></i>release tag</a> + <a class="commit" href="{commit_link}"><i class="fa fa-code"></i>commit-sha</a> + </div> + <div class="col-md-10"> + <h4 class="title"><a href="{release_single_link}">Release Title</a></h4> + <p class="info"> + <span class="author"><img class="avatar" src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132" alt="" width="20"> + <a href="/user/fuxiaohei">fuxiaohei</a></span> + <span class="time">1 week ago</span> + <span class="ahead"><strong>0</strong> commits since this tag</span> + </p> + <div class="markdown desc"> + release descriptions, support markdown content + </div> + <p class="download"> + <a class="btn btn-default" href="{release_download_link}"><i class="fa fa-download"></i>Source Code (ZIP)</a> + <a class="btn btn-default" href="{release_download_link}"><i class="fa fa-download"></i>Source Code (TAR.GZ)</a> + </p> + <span class="dot"> </span> + </div> + </li> + </ul> + </div> + {{range .Releases}} + {{.}} + {{end}} +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl index 6156d5791e..3ce27f921e 100644 --- a/templates/repo/nav.tmpl +++ b/templates/repo/nav.tmpl @@ -18,9 +18,9 @@ <button class="btn btn-default" data-link="{{.CloneLink.SSH}}" type="button">SSH</button> <button class="btn btn-default" data-link="{{.CloneLink.HTTPS}}" type="button">HTTPS</button> </span> - <input type="text" class="form-control clone-group-url" value="" readonly/> + <input type="text" class="form-control clone-group-url" value="" readonly id="repo-clone-ipt"/> <span class="input-group-btn"> - <button class="btn btn-default" type="button"><i class="fa fa-copy" data-toggle="tooltip" title="copy to clipboard" data-placement="top"></i></button> + <button class="btn btn-default" type="button" data-toggle="tooltip" title="copy to clipboard" data-placement="top" data-init="copy" data-copy-val="val" data-copy-from="#repo-clone-ipt"><i class="fa fa-copy"></i></button> </span> </div> <p class="help-block text-center">Need help cloning? Visit <a href="#">Help</a>!</p> diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl index ea7a5ddb61..a177aba6ad 100644 --- a/templates/repo/setting.tmpl +++ b/templates/repo/setting.tmpl @@ -12,7 +12,7 @@ </div> <div id="repo-setting-container" class="col-md-9"> - {{if .IsSuccess}}<p class="alert alert-success">Repository option has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}} + {{if .IsSuccess}}<p class="alert alert-success">Repository options has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}} <div class="panel panel-default"> <div class="panel-heading"> Repository Options @@ -23,11 +23,19 @@ {{.CsrfTokenHtml}} <input type="hidden" name="action" value="update"> <div class="form-group"> + <label class="col-md-3 text-right">Name</label> + <div class="col-md-9"> + <input class="form-control" name="name" value="{{.Repository.Name}}" /> + </div> + </div> + + <div class="form-group"> <label class="col-md-3 text-right">Description</label> <div class="col-md-9"> <textarea class="form-control" name="desc" id="repo-desc" rows="3">{{.Repository.Description}}</textarea> </div> </div> + <div class="form-group"> <label class="col-md-3 text-right">Official Site</label> <div class="col-md-9"> diff --git a/templates/repo/single_bare.tmpl b/templates/repo/single_bare.tmpl index 035e78e8b0..fc0a3bd96c 100644 --- a/templates/repo/single_bare.tmpl +++ b/templates/repo/single_bare.tmpl @@ -17,7 +17,7 @@ </span> <input type="text" class="form-control clone-group-url" id="guide-clone-url" value="" readonly/> <span class="input-group-btn"> - <button class="btn btn-default" type="button"><i class="fa fa-copy" data-toggle="tooltip" title="copy to clipboard" data-placement="top"></i></button> + <button class="btn btn-default" type="button" data-toggle="tooltip" title="copy to clipboard" data-placement="top" data-init="copy" data-copy-val="val" data-copy-from="#guide-clone-url"><i class="fa fa-copy"></i></button> </span> </div> <p>We recommend every repository include a <strong>README</strong>, <strong>LICENSE</strong>, and <strong>.gitignore</strong>.</p> diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl index 6b48ecf506..5484204832 100644 --- a/templates/repo/toolbar.tmpl +++ b/templates/repo/toolbar.tmpl @@ -8,18 +8,18 @@ <li class="{{if .IsRepoToolbarCommits}}active{{end}}"><a href="{{.RepoLink}}/commits/{{if .BranchName}}{{.BranchName}}{{else}}master{{end}}">Commits</a></li> <!-- <li class="{{if .IsRepoToolbarBranches}}active{{end}}"><a href="{{.RepoLink}}/branches">Branches</a></li> --> <!-- <li class="{{if .IsRepoToolbarPulls}}active{{end}}"><a href="{{.RepoLink}}/pulls">Pull Requests</a></li> --> - <li class="{{if .IsRepoToolbarIssues}}active{{end}}"><a href="{{.RepoLink}}/issues">Issues <!--<span class="badge">42</span>--></a></li> + <li class="{{if .IsRepoToolbarIssues}}active{{end}}"><a href="{{.RepoLink}}/issues">{{if .Repository.NumOpenIssues}}<span class="badge">{{.Repository.NumOpenIssues}}</span> {{end}}Issues <!--<span class="badge">42</span>--></a></li> {{if .IsRepoToolbarIssues}} - <li class="tmp">{{if .IsRepoToolbarIssuesList}}<a href="{{.RepoLink}}/issues/new"> - <button class="btn btn-primary btn-sm">New Issue</button> - </a>{{else}}<a href="{{.RepoLink}}/issues"> - <button class="btn btn-primary btn-sm">Issues List</button> - </a>{{end}}</li> + <li class="tmp">{{if .IsRepoToolbarIssuesList}}<a href="{{.RepoLink}}/issues/new"><button class="btn btn-primary btn-sm">New Issue</button> + </a>{{else}}<a href="{{.RepoLink}}/issues"><button class="btn btn-primary btn-sm">Issues List</button></a>{{end}}</li> + {{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> {{end}} <!-- <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="{{.RepoLink}}/release">Release</a></li> <li><a href="{{.RepoLink}}/wiki">Wiki</a></li> </ul> </li> -->{{end}} diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl index 283a8df8bf..f44218cdec 100644 --- a/templates/user/setting.tmpl +++ b/templates/user/setting.tmpl @@ -10,30 +10,37 @@ {{if .IsSuccess}}<p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}} <p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p> <div class="form-group"> - <label class="col-md-2 control-label">Email</label> + <label class="col-md-2 control-label">Username<strong class="text-danger">*</strong></label> <div class="col-md-8"> - <input type="text" name="email" class="form-control" placeholder="Type your e-mail address" value="{{.Owner.Email}}"> + <input name="username" class="form-control" placeholder="Type your user name" required="required" value="{{.SignedUser.Name}}"> + </div> + </div> + + <div class="form-group"> + <label class="col-md-2 control-label">Email<strong class="text-danger">*</strong></label> + <div class="col-md-8"> + <input name="email" class="form-control" placeholder="Type your e-mail address" required="required" value="{{.SignedUser.Email}}"> </div> </div> <div class="form-group"> <label class="col-md-2 control-label">Website</label> <div class="col-md-8"> - <input type="text" name="website" class="form-control" placeholder="Type your website URL" value="{{.Owner.Website}}"> + <input name="website" class="form-control" placeholder="Type your website URL" value="{{.SignedUser.Website}}"> </div> </div> <div class="form-group"> <label class="col-md-2 control-label">Location</label> <div class="col-md-8"> - <input type="text" name="location" class="form-control" placeholder="Type your current location" value="{{.Owner.Location}}"> + <input name="location" class="form-control" placeholder="Type your current location" value="{{.SignedUser.Location}}"> </div> </div> <div class="form-group {{if .Err_Avatar}}has-error has-feedback{{end}}"> <label class="col-md-2 control-label">Gravatar Email<strong class="text-danger">*</strong></label> <div class="col-md-8"> - <input type="text" name="avatar" class="form-control" placeholder="Type your Gravatar e-mail address" required="required" value="{{.Owner.AvatarEmail}}"> + <input name="avatar" class="form-control" placeholder="Type your Gravatar e-mail address" required="required" value="{{.SignedUser.AvatarEmail}}"> </div> </div> |