diff options
| -rw-r--r-- | CONTRIBUTING.md | 49 | ||||
| -rw-r--r-- | routers/admin/admin.go | 6 | ||||
| -rw-r--r-- | templates/admin/config.tmpl | 1 | ||||
| -rw-r--r-- | templates/admin/dashboard.tmpl | 9 | ||||
| -rw-r--r-- | templates/repo/nav.tmpl | 6 |
5 files changed, 67 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..08013d3705 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,49 @@ +# Contributing to Gogs + +Want to hack on Gogs? Awesome! Here are instructions to get you +started. They are probably not perfect, please let us know if anything +feels wrong or incomplete. + +## Contribution guidelines + +### Pull requests are always welcome + +We are always thrilled to receive pull requests, and do our best to +process them as fast as possible. Not sure if that typo is worth a pull +request? Do it! We will appreciate it. + +If your pull request is not accepted on the first try, don't be +discouraged! If there's a problem with the implementation, hopefully you +received feedback on what to improve. + +We're trying very hard to keep Gogs lean and focused. We don't want it +to do everything for everybody. This means that we might decide against +incorporating a new feature. + +### Discuss your design on the mailing list + +We recommend discussing your plans [on the mailing +list](https://groups.google.com/forum/#!forum/gogits) +before starting to code - especially for more ambitious contributions. +This gives other contributors a chance to point you in the right +direction, give feedback on your design, and maybe point out if someone +else is working on the same thing. + +We may close your pull request if not first discussed on the mailing +list. We aren't doing this to be jerks. We are doing this to prevent +people from spending large amounts of time on changes that may need +to be designed or architected in a specific way, or may not align with +the vision of the project. + +### Create issues... + +Any significant improvement should be documented as [a GitHub +issue](https://github.com/gogits/gogs/issues) before anybody +starts working on it. + +### ...but check for existing issues first! + +Please take a moment to check that an issue doesn't already exist +documenting your bug report or improvement proposal. If it does, it +never hurts to add a quick "+1" or "I have this problem too". This will +help prioritize the most common problems and requests.
\ No newline at end of file diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 547883f7bc..6d3831a9f3 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -61,7 +61,11 @@ func Config(ctx *middleware.Context) { ctx.Data["DbCfg"] = models.DbCfg - ctx.Data["Mailer"] = base.MailService + ctx.Data["MailerEnabled"] = false + if base.MailService != nil { + ctx.Data["MailerEnabled"] = true + ctx.Data["Mailer"] = base.MailService + } ctx.HTML(200, "admin/config") } diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 9593a545f8..7013c201ae 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -57,6 +57,7 @@ </div> <div class="panel-body"> + <div><b>Enabled:</b> <i class="fa fa{{if .MailerEnabled}}-check{{end}}-square-o"></i></div> <div><b>Name:</b> {{.Mailer.Name}}</div> <div><b>Host:</b> {{.Mailer.Host}}</div> <div><b>User:</b> {{.Mailer.User}}</div> diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 8950f50cac..6088487d62 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -12,6 +12,15 @@ Gogs database has <b>{{.Stats.Counter.User}}</b> users, <b>{{.Stats.Counter.PublicKey}}</b> SSH keys, <b>{{.Stats.Counter.Repo}}</b> repositories, <b>{{.Stats.Counter.Watch}}</b> watches, <b>{{.Stats.Counter.Action}}</b> actions, and <b>{{.Stats.Counter.Access}}</b> accesses. </div> </div> + + <div class="panel panel-default"> + <div class="panel-heading"> + System Status + </div> + + <div class="panel-body"> + </div> + </div> </div> </div> {{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl index 718c429a2b..c61051af25 100644 --- a/templates/repo/nav.tmpl +++ b/templates/repo/nav.tmpl @@ -5,8 +5,8 @@ <h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3> <p class="desc">{{.Repository.Description}}{{if .Repository.Website}}<a href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{end}}</p> </div> - {{if not .IsBareRepo}} <div class="col-md-6 actions text-right"> + {{if not .IsBareRepo}} <div class="btn-group" id="gogs-repo-clone"> <button type="button" class="btn btn-default"><i class="fa fa-download fa-lg fa-m"></i></button> <button type="button" class="btn btn-default dropdown-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-content="<label>SSH:</label><div class='input-group'><input type='text' class='form-control' value='{{.CloneLink.SSH}}'></div>" data-html="1"> @@ -38,11 +38,11 @@ <div class="btn-group"> <button type="button" class="btn btn-default"><i class="fa fa-star"></i>Star {{.Repository.NumStars}}</button> </div> + {{end}} <div class="btn-group"> - <button type="button" class="btn btn-default"><i class="fa fa-code-fork"></i>Fork {{.Repository.NumForks}}</button> + <a type="button" {{if not .IsRepositoryOwner}}href="/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default"><i class="fa fa-code-fork"></i>Fork {{.Repository.NumForks}}</a> </div> </div> - {{end}} </div> </div> </div>
\ No newline at end of file |