diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/VERSION | 2 | ||||
| -rw-r--r-- | templates/admin/monitor/cron.tmpl | 40 | ||||
| -rw-r--r-- | templates/admin/nav.tmpl | 1 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/signin.tmpl | 2 |
5 files changed, 44 insertions, 3 deletions
diff --git a/templates/VERSION b/templates/VERSION index 8e45ca5921..c2606e903b 100644 --- a/templates/VERSION +++ b/templates/VERSION @@ -1 +1 @@ -0.4.4.0612 Alpha
\ No newline at end of file +0.4.4.0613 Alpha
\ No newline at end of file diff --git a/templates/admin/monitor/cron.tmpl b/templates/admin/monitor/cron.tmpl new file mode 100644 index 0000000000..a04c017e29 --- /dev/null +++ b/templates/admin/monitor/cron.tmpl @@ -0,0 +1,40 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +<div id="body" class="container" data-page="admin"> + {{template "admin/nav" .}} + <div id="admin-container" class="col-md-10"> + <ul class="nav nav-tabs"> + <li{{if .PageIsMonitorCron}} class="active"{{end}}><a href="/admin/monitor">Cron Tasks</a></li> + <li{{if .PageIsMonitorProcess}} class="active"{{end}}><a href="/admin/monitor?tab=process">Processes</a></li> + </ul> + <div class="panel panel-default"> + <div class="panel-body"> + {{if .PageIsMonitorCron}} + <table class="table table-striped"> + <thead> + <tr> + <th>Name</th> + <th>Schedule</th> + <th>Next Time</th> + <th>Previous Time</th> + <th>Execute Times</th> + </tr> + </thead> + <tbody> + {{range .Entries}} + <tr> + <td>{{.Description}}</td> + <td>{{.Spec}}</td> + <td>{{.Next}}</td> + <td>{{.Prev}}</td> + <td>{{.ExecTimes}}</td> + </tr> + {{end}} + </tbody> + </table> + {{end}} + </div> + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/admin/nav.tmpl b/templates/admin/nav.tmpl index 5ba4495796..b78e0bd17d 100644 --- a/templates/admin/nav.tmpl +++ b/templates/admin/nav.tmpl @@ -5,5 +5,6 @@ <li class="list-group-item{{if .PageIsRepos}} active{{end}}"><a href="/admin/repos"><i class="fa fa-book fa-lg"></i> Repositories</a></li> <li class="list-group-item{{if .PageIsAuths}} active{{end}}"><a href="/admin/auths"><i class="fa fa-certificate fa-lg"></i> Authentication</a></li> <li class="list-group-item{{if .PageIsConfig}} active{{end}}"><a href="/admin/config"><i class="fa fa-cogs fa-lg"></i> Configuration</a></li> + <li class="list-group-item{{if .PageIsMonitor}} active{{end}}"><a href="/admin/monitor"><i class="fa fa-th fa-lg"></i> Monitoring</a></li> </ul> </div>
\ No newline at end of file diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index e7759c2985..a58299f8cf 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -14,7 +14,7 @@ <!-- Stylesheets --> {{if CdnMode}} <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"> - <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet"> + <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet"> <script src="//code.jquery.com/jquery-1.11.0.min.js"></script> <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl index 09ce249f7f..9a8aa1992d 100644 --- a/templates/user/signin.tmpl +++ b/templates/user/signin.tmpl @@ -62,7 +62,7 @@ {{if .OauthService.GitHub}}<a href="/user/login/github?next=/user/sign_up" class="btn btn-default"><i class="fa fa-github-square fa-2x"></i><span>GitHub</span></a>{{end}} {{if .OauthService.Google}}<a href="/user/login/google?next=/user/sign_up" class="btn btn-default"><i class="fa fa-google-plus-square fa-2x"></i><span>Google</span></a>{{end}} {{if .OauthService.Twitter}}<a href="/user/login/twitter?next=/user/sign_up" class="btn btn-default"><i class="fa fa-twitter-square fa-2x"></i><span>Twitter</span></a>{{end}} - {{if .OauthService.Tencent}}<a href="/user/login/qq?next=/user/sign_up" class="btn btn-default"><i class="fa fa-linux fa-2x"></i><span>Tencent QQ</span></a>{{end}} + {{if not .OauthService.Tencent}}<a href="/user/login/qq?next=/user/sign_up" class="btn btn-default"><i class="fa fa-qq fa-2x"></i><span>Tencent QQ</span></a>{{end}} {{if .OauthService.Weibo}}<a href="/user/login/weibo?next=/user/sign_up" class="btn btn-default"><i class="fa fa-weibo fa-2x"></i><span>Weibo</span></a>{{end}} </div> {{end}}{{end}} |