From 9bc63bda7ded31b77ad4aaf3495582a7c8555d2f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 30 Aug 2014 20:49:51 +0800 Subject: [PATCH] Finish all new admin pages. --- README.md | 2 +- README_ZH.md | 2 +- conf/locale/locale_en-US.ini | 76 +++++ conf/locale/locale_zh-CN.ini | 76 +++++ gogs.go | 2 +- modules/setting/setting.go | 2 +- routers/admin/admin.go | 32 +- templates/.VERSION | 2 +- templates/admin/config.tmpl | 454 +++++++++++++-------------- templates/admin/monitor.tmpl | 74 +++++ templates/admin/monitor/cron.tmpl | 40 --- templates/admin/monitor/process.tmpl | 38 --- 12 files changed, 469 insertions(+), 331 deletions(-) create mode 100644 templates/admin/monitor.tmpl delete mode 100644 templates/admin/monitor/cron.tmpl delete mode 100644 templates/admin/monitor/process.tmpl diff --git a/README.md b/README.md index 0d9e7338460b..38e081f46420 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Gogs(Go Git Service) is a painless self-hosted Git Service written in Go. ![Demo](http://gowalker.org/public/gogs_demo.gif) -##### Current version: 0.4.8 Beta +##### Current version: 0.4.9 Beta ### NOTICES diff --git a/README_ZH.md b/README_ZH.md index 3bf67f38d803..b830d416435e 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个基于 Go 语言的自助 Git 服务。 ![Demo](http://gowalker.org/public/gogs_demo.gif) -##### 当前版本：0.4.8 Beta +##### 当前版本：0.4.9 Beta ## 开发目的 diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index f14958e4b6f8..c69f68c311ca 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -404,6 +404,80 @@ auths.update_success = Authorization setting has been successfully updated. auths.update = Update Authorization Setting auths.delete = Delete This Authorization +config.server_config = Server Configuration +config.app_name = Application Name +config.app_ver = Application Version +config.app_url = Application URL +config.domain = Domain +config.offline_mode = Offline Mode +config.disable_router_log = Disable Router Log +config.run_user = Run User +config.run_mode = Run Mode +config.repo_root_path = Repository Root Path +config.static_file_root_path = Static File Root Path +config.log_file_root_path = Log File Root Path +config.script_type = Script Type +config.reverse_auth_user = Reverse Authentication User +config.db_config = Database Configuration +config.db_type = Type +config.db_host = Host +config.db_name = Name +config.db_user = User +config.db_ssl_mode = SSL Mode +config.db_ssl_mode_helper = (for "postgres" only) +config.db_path = Path +config.db_path_helper = (for "sqlite3" only) +config.service_config = Service Configuration +config.register_email_confirm = Register Email Confirmation +config.disable_register = Disable Registration +config.require_sign_in_view = Require Sign In View +config.mail_notify = Mail Notification +config.enable_cache_avatar = Enable Cache Avatar +config.active_code_lives = Active Code Lives +config.reset_password_code_lives = Reset Password Code Lives +config.webhook_config = Webhook Configuration +config.task_interval = Task Interval +config.deliver_timeout = Deliver Timeout +config.mailer_config = Mailer Configuration +config.mailer_enabled = Enabled +config.mailer_name = Name +config.mailer_host = Host +config.mailer_user = User +config.oauth_config = OAuth Configuration +config.oauth_enabled = Enabled +config.cache_config = Cache Configuration +config.cache_adapter = Cache Adapter +config.cache_interval = Cache Interval +config.cache_conn = Cache Connection +config.session_config = Session Configuration +config.session_provider = Session Provider +config.provider_config = Provider Config +config.cookie_name = Cookie Name +config.enable_set_cookie = Enable Set Cookie +config.gc_interval_time = GC Interval Time +config.session_life_time = Session Life Time +config.https_only = HTTPS Only +config.cookie_life_time = Cookie Life Time +config.session_hash_function = Session ID Hash Function +config.session_hash_key = Session ID Hash Key +config.picture_config = Picture Configuration +config.picture_service = Picture Service +config.disable_gravatar = Disable Gravatar +config.log_config = Log Configuration +config.log_mode = Log Mode +config.log_config = Log Config + +monitor.cron = Cron Tasks +monitor.name = Name +monitor.schedule = Schedule +monitor.next = Next Time +monitor.previous = Previous Time +monitor.execute_times = Execute Times +monitor.process = Running Processes +monitor.desc = Description +monitor.start = Start Time +monitor.execute_time = Execution Time + [action] create_repo = created repository %s commit_repo = pushed to %s at %s @@ -428,6 +502,8 @@ days = %d days %s weeks = %d weeks %s months = %d months %s years = %d years %s +raw_seconds = seconds +raw_minutes = minutes diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 310bc8c96859..e39feefde761 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -403,6 +403,80 @@ auths.update_success = 授权认证设置更新成功！ auths.update = 更新授权认证信息 auths.delete = 删除该授权认证 +config.server_config = 服务器配置 +config.app_name = 应用名称 +config.app_ver = 应用版本 +config.app_url = 应用 URL +config.domain = 应用域名 +config.offline_mode = 离线模式 +config.disable_router_log = 关闭路由日志 +config.run_user = 运行用户 +config.run_mode = 运行模式 +config.repo_root_path = 仓库根目录 +config.static_file_root_path = 静态文件根目录 +config.log_file_root_path = 日志文件根目录 +config.script_type = 脚本类型 +config.reverse_auth_user = 反向代理认证 +config.db_config = 数据库配置 +config.db_type = 数据库类型 +config.db_host = 主机地址 +config.db_name = 数据库名称 +config.db_user = 连接用户 +config.db_ssl_mode = SSL 模式 +config.db_ssl_mode_helper = （仅限 "postgres" 使用） +config.db_path = 数据库路径 +config.db_path_helper = （仅限 "sqlite3" 使用） +config.service_config = 服务配置 +config.register_email_confirm = 注册邮件确认 +config.disable_register = 关闭注册功能 +config.require_sign_in_view = 强制登录浏览 +config.mail_notify = 邮件通知提醒 +config.enable_cache_avatar = 开启缓存头像 +config.active_code_lives = 激活用户链接有效期 +config.reset_password_code_lives = 重置密码链接有效期 +config.webhook_config = Web 钩子配置 +config.task_interval = 任务周期 +config.deliver_timeout = 推送超时 +config.mailer_config = 邮件配置 +config.mailer_enabled = 启用服务 +config.mailer_name = 发送者名称 +config.mailer_host = 邮件主机地址 +config.mailer_user = 发送者帐号 +config.oauth_config = 社交帐号配置 +config.oauth_enabled = 启用服务 +config.cache_config = Cache 配置 +config.cache_adapter = Cache 适配器 +config.cache_interval = Cache 周期 +config.cache_conn = Cache 连接字符串 +config.session_config = Session 配置 +config.session_provider = Session 提供者 +config.provider_config = 提供者配置 +config.cookie_name = Cookie 名称 +config.enable_set_cookie = 启用设置 Cookie +config.gc_interval_time = GC 周期 +config.session_life_time = Session 生命周期 +config.https_only = 仅限 HTTPS +config.cookie_life_time = Cookie 生命周期 +config.session_hash_function = Session ID 哈希函数 +config.session_hash_key = Session ID 哈希健值 +config.picture_config = 图片配置 +config.picture_service = 图片服务 +config.disable_gravatar = 禁用 Gravatar 头像 +config.log_config = 日志配置 +config.log_mode = 日志模式 +config.log_config = 日志配置 + +monitor.cron = Cron 任务 +monitor.name = 任务名称 +monitor.schedule = 任务安排 +monitor.next = 下次执行时间 +monitor.previous = 上次执行时间 +monitor.execute_times = 执行次数 +monitor.process = 运行中进程 +monitor.desc = 进程描述 +monitor.start = 开始时间 +monitor.execute_time = 已执行时间 + [action] create_repo = 创建了仓库 %s commit_repo = 推送了 %s 分支的代码到 %s @@ -427,6 +501,8 @@ days = %d 天%s weeks = %d 周%s months = %d 月%s years = %d 年%s +raw_seconds = 秒 +raw_minutes = 分钟 diff --git a/gogs.go b/gogs.go index 2e23ecfc40b6..4361bdb204d8 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.4.8.0829 Alpha" +const APP_VER = "0.4.9.0830 Alpha" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index deb16518957a..ebc1020a3339 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -371,7 +371,7 @@ func newSessionService() { SessionConfig.Maxlifetime = Cfg.MustInt64("session", "SESSION_LIFE_TIME", 86400) SessionConfig.SessionIDHashFunc = Cfg.MustValueRange("session", "SESSION_ID_HASHFUNC", "sha1", []string{"sha1", "sha256", "md5"}) - SessionConfig.SessionIDHashKey = Cfg.MustValue("session", "SESSION_ID_HASHKEY") + SessionConfig.SessionIDHashKey = Cfg.MustValue("session", "SESSION_ID_HASHKEY", string(com.RandomCreateBytes(16))) if SessionProvider == "file" { os.MkdirAll(path.Dir(SessionConfig.ProviderConfig), os.ModePerm) diff --git a/routers/admin/admin.go b/routers/admin/admin.go index b2c932c98f7b..756d76c0f793 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -22,10 +22,9 @@ import ( ) const ( - DASHBOARD base.TplName = "admin/dashboard" - CONFIG base.TplName = "admin/config" - MONITOR_PROCESS base.TplName = "admin/monitor/process" - MONITOR_CRON base.TplName = "admin/monitor/cron" + DASHBOARD base.TplName = "admin/dashboard" + CONFIG base.TplName = "admin/config" + MONITOR base.TplName = "admin/monitor" ) var ( @@ -155,8 +154,9 @@ func Dashboard(ctx *middleware.Context) { } func Config(ctx *middleware.Context) { - ctx.Data["Title"] = "Server Configuration" - ctx.Data["PageIsConfig"] = true + ctx.Data["Title"] = ctx.Tr("admin.users") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminConfig"] = true ctx.Data["AppUrl"] = setting.AppUrl ctx.Data["Domain"] = setting.Domain @@ -212,18 +212,10 @@ func Config(ctx *middleware.Context) { } func Monitor(ctx *middleware.Context) { - ctx.Data["Title"] = "Monitoring Center" - ctx.Data["PageIsMonitor"] = true - - tab := ctx.Query("tab") - switch tab { - case "process": - ctx.Data["PageIsMonitorProcess"] = true - ctx.Data["Processes"] = process.Processes - ctx.HTML(200, MONITOR_PROCESS) - default: - ctx.Data["PageIsMonitorCron"] = true - ctx.Data["Entries"] = cron.ListEntries() - ctx.HTML(200, MONITOR_CRON) - } + ctx.Data["Title"] = ctx.Tr("admin.monitor") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageIsAdminMonitor"] = true + ctx.Data["Processes"] = process.Processes + ctx.Data["Entries"] = cron.ListEntries() + ctx.HTML(200, MONITOR) } diff --git a/templates/.VERSION b/templates/.VERSION index 6b8f7aafd27c..681da0e6de21 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.4.8.0829 Alpha \ No newline at end of file +0.4.9.0830 Alpha \ No newline at end of file diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 34e710bf6210..e5a210c200e3 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -1,232 +1,230 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "admin/nav" .}} -
-
-
- Server Configuration -
- -
-
-
Application Name
-
{{AppName}}
-
Application Version
-
{{AppVer}}
-
Application URL
-
{{.AppUrl}}
-
Domain
-
{{.Domain}}
-
Offline Mode
-
-
Disable Router Log
-
-
-
Run User
-
{{.RunUser}}
-
Run Mode
-
{{.RunMode}}
-
-
Repository Root Path
-
{{.RepoRootPath}}
-
Static File Root Path
-
{{.StaticRootPath}}
-
Log File Root Path
-
{{.LogRootPath}}
-
Script Type
-
{{.ScriptType}}
-
Reverse Authentication User
-
{{.ReverseProxyAuthUser}}
-
-
-
- -
-
- Database Configuration -
- -
-
-
Type
-
{{.DbCfg.Type}}
-
Host
-
{{.DbCfg.Host}}
-
Name
-
{{.DbCfg.Name}}
-
User
-
{{.DbCfg.User}}
-
SslMode
-
{{.DbCfg.SslMode}} (for "postgres" only)
-
Path
-
{{.DbCfg.Path}} (for "sqlite3" only)
-
-
-
- -
-
- Service Configuration -
- -
-
-
Register Email Confirmation
-
-
Disable Registration
-
-
Require Sign In View
-
-
Mail Notification
-
-
Enable Cache Avatar
-
-
-
Active Code Lives
-
{{.Service.ActiveCodeLives}} minutes
-
Reset Password Code Lives
-
{{.Service.ResetPwdCodeLives}} minutes
-
-
-
- -
-
- Webhook Configuration -
- -
-
-
Task Interval
-
{{.WebhookTaskInterval}} minutes
-
Deliver Timeout
-
{{.WebhookDeliverTimeout}} seconds
-
-
-
- -
-
- Mailer Configuration -
- -
-
-
Enabled
-
- {{if .MailerEnabled}}
Name
-
{{.Mailer.Name}}
-
Host
-
{{.Mailer.Host}}
-
User
-
{{.Mailer.User}}
{{end}} -
-
-
- -
-
- OAuth Configuration -
- -
-
-
Enabled
-
- {{if .OauthEnabled}}
GitHub
-
-
Google
-
-
Tencent QQ
-
-
Weibo
-
- {{end}} -
-
-
- -
-
- Cache Configuration -
- -
-
-
Cache Adapter
-
{{.CacheAdapter}}
-
Cache Config
- 
{{.CacheConfig}}
-
-
-
- -
-
- Session Configuration -
- -
-
-
Session Provider
-
{{.SessionProvider}}
-
Cookie Name
-
{{.SessionConfig.CookieName}}
-
Enable Set Cookie
-
-
GC Interval Time
-
{{.SessionConfig.Gclifetime}} seconds
-
Session Life Time
-
{{.SessionConfig.Maxlifetime}} seconds
-
HTTPS Only
-
-
Cookie Life Time
-
{{.SessionConfig.CookieLifeTime}} seconds
-
Session ID Hash Function
-
{{.SessionConfig.SessionIDHashFunc}}
-
Session ID Hash Key
-
{{.SessionConfig.SessionIDHashKey}}
-
Provider Config
-
{{.SessionConfig.ProviderConfig}}
-
-
-
- -
-
- Picture Configuration -
- -
-
-
Picture Service
-
{{.PictureService}}
-
Disable Gravatar
-
-
-
-
- -
-
- Log Configuration -
- -
-
- {{range .Loggers}} -
Log Mode
-
{{.Mode}}
-
Log Config
-
- 
{{.Config}}
-
- {{end}} -
- +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+
+ {{template "admin/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+
+ {{.i18n.Tr "admin.config.server_config"}} +
+
+
+
{{.i18n.Tr "admin.config.app_name"}}
+
{{AppName}}
+
{{.i18n.Tr "admin.config.app_ver"}}
+
{{AppVer}}
+
{{.i18n.Tr "admin.config.app_url"}}
+
{{.AppUrl}}
+
{{.i18n.Tr "admin.config.domain"}}
+
{{.Domain}}
+
{{.i18n.Tr "admin.config.offline_mode"}}
+
+
{{.i18n.Tr "admin.config.disable_router_log"}}
+
+
+
{{.i18n.Tr "admin.config.run_user"}}
+
{{.RunUser}}
+
{{.i18n.Tr "admin.config.run_mode"}}
+
{{.RunMode}}
+
+
{{.i18n.Tr "admin.config.repo_root_path"}}
+
{{.RepoRootPath}}
+
{{.i18n.Tr "admin.config.static_file_root_path"}}
+
{{.StaticRootPath}}
+
{{.i18n.Tr "admin.config.log_file_root_path"}}
+
{{.LogRootPath}}
+
{{.i18n.Tr "admin.config.script_type"}}
+
{{.ScriptType}}
+
{{.i18n.Tr "admin.config.reverse_auth_user"}}
+
{{.ReverseProxyAuthUser}}
+
+
+
+
+
+
+ {{.i18n.Tr "admin.config.db_config"}} +
+
+
+
{{.i18n.Tr "admin.config.db_type"}}
+
{{.DbCfg.Type}}
+
{{.i18n.Tr "admin.config.db_host"}}
+
{{.DbCfg.Host}}
+
{{.i18n.Tr "admin.config.db_name"}}
+
{{.DbCfg.Name}}
+
{{.i18n.Tr "admin.config.db_user"}}
+
{{.DbCfg.User}}
+
{{.i18n.Tr "admin.config.db_ssl_mode"}}
+
{{.DbCfg.SslMode}} {{.i18n.Tr "admin.config.db_ssl_mode_helper"}}
+
{{.i18n.Tr "admin.config.db_path"}}
+
{{.DbCfg.Path}} {{.i18n.Tr "admin.config.db_path_helper"}}
+
+
+
+
+
+
+ {{.i18n.Tr "admin.config.service_config"}} +
+
+
+
{{.i18n.Tr "admin.config.register_email_confirm"}}
+
+
{{.i18n.Tr "admin.config.disable_register"}}
+
+
{{.i18n.Tr "admin.config.require_sign_in_view"}}
+
+
{{.i18n.Tr "admin.config.mail_notify"}}
+
+
{{.i18n.Tr "admin.config.enable_cache_avatar"}}
+
+
+
{{.i18n.Tr "admin.config.active_code_lives"}}
+
{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
+
{{.i18n.Tr "admin.config.reset_password_code_lives"}}
+
{{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
+
+
+
+
+
+
+ {{.i18n.Tr "admin.config.webhook_config"}} +
+
+
+
{{.i18n.Tr "admin.config.task_interval"}}
+
{{.WebhookTaskInterval}} {{.i18n.Tr "tool.raw_minutes"}}
+
{{.i18n.Tr "admin.config.deliver_timeout"}}
+
{{.WebhookDeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
+
+
+
+
+
+
+ {{.i18n.Tr "admin.config.mailer_config"}} +
+
+
+
{{.i18n.Tr "admin.config.mailer_enabled"}}
+
+ {{if .MailerEnabled}}
{{.i18n.Tr "admin.config.mailer_name"}}
+
{{.Mailer.Name}}
+
{{.i18n.Tr "admin.config.mailer_host"}}
+
{{.Mailer.Host}}
+
{{.i18n.Tr "admin.config.mailer_user"}}
+
{{.Mailer.User}}
{{end}} +
+
+
+
+
+
+ {{.i18n.Tr "admin.config.oauth_config"}} +
+
+
+
{{.i18n.Tr "admin.config.oauth_enabled"}}
+
+ {{if .OauthEnabled}}
GitHub
+
+
Google
+
+
腾讯 QQ
+
+
新浪微博
+
+ {{end}} +
+
+
+
+
+
+ {{.i18n.Tr "admin.config.cache_config"}} +
+
+
+
{{.i18n.Tr "admin.config.cache_adapter"}}
+
{{.CacheAdapter}}
+
{{.i18n.Tr "admin.config.cache_interval"}}
+
{{.CacheInternal}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.cache_conn"}}
+ 
{{.CacheConn}}
+
+
+
+
+
+
+ {{.i18n.Tr "admin.config.session_config"}} +
+
+
+
{{.i18n.Tr "admin.config.session_provider"}}
+
{{.SessionProvider}}
+
{{.i18n.Tr "admin.config.provider_config"}}
+ 
{{.SessionConfig.ProviderConfig}}
+
{{.i18n.Tr "admin.config.cookie_name"}}
+
{{.SessionConfig.CookieName}}
+
{{.i18n.Tr "admin.config.enable_set_cookie"}}
+
+
{{.i18n.Tr "admin.config.gc_interval_time"}}
+
{{.SessionConfig.Gclifetime}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.session_life_time"}}
+
{{.SessionConfig.Maxlifetime}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.https_only"}}
+
+
{{.i18n.Tr "admin.config.cookie_life_time"}}
+
{{.SessionConfig.CookieLifeTime}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.session_hash_function"}}
+
{{.SessionConfig.SessionIDHashFunc}}
+
{{.i18n.Tr "admin.config.session_hash_key"}}
+
{{.SessionConfig.SessionIDHashKey}}
+
+
+
+
+
+
+ {{.i18n.Tr "admin.config.picture_config"}} +
+
+
+
{{.i18n.Tr "admin.config.picture_service"}}
+
{{.PictureService}}
+
{{.i18n.Tr "admin.config.disable_gravatar"}}
+
+
+
+
+
+
+
+ {{.i18n.Tr "admin.config.log_config"}} +
+
+
+ {{range .Loggers}} +
{{$.i18n.Tr "admin.config.log_mode"}}
+
{{.Mode}}
+
{{$.i18n.Tr "admin.config.log_config"}}
+ 
{{.Config}}
+ {{end}} +
+
+
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl new file mode 100644 index 000000000000..b94f92b6641b --- /dev/null +++ b/templates/admin/monitor.tmpl @@ -0,0 +1,74 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+
+
+ {{template "admin/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+
+ {{.i18n.Tr "admin.monitor.cron"}} +
+
+ + + + + + + + + + + + {{range .Entries}} + + + + + + + + {{end}} + +
{{.i18n.Tr "admin.monitor.name"}}{{.i18n.Tr "admin.monitor.schedule"}}{{.i18n.Tr "admin.monitor.next"}}{{.i18n.Tr "admin.monitor.previous"}}{{.i18n.Tr "admin.monitor.execute_times"}}
{{.Description}}{{.Spec}}{{.Next}}{{.Prev}}{{.ExecTimes}}
+
+
+
+
+
+ {{.i18n.Tr "admin.monitor.process"}} +
+
+ + + + + + + + + + + {{range .Processes}} + + + + + + + {{end}} + +
Pid{{.i18n.Tr "admin.monitor.desc"}}{{.i18n.Tr "admin.monitor.start"}}{{.i18n.Tr "admin.monitor.execute_time"}}
{{.Pid}}{{.Description}}{{.Start}}{{TimeSince .Start}}
+
+
+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/admin/monitor/cron.tmpl b/templates/admin/monitor/cron.tmpl deleted file mode 100644 index a04c017e29f4..000000000000 --- a/templates/admin/monitor/cron.tmpl +++ /dev/null @@ -1,40 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "admin/nav" .}} -
- -
-
- {{if .PageIsMonitorCron}} - - - - - - - - - - - - {{range .Entries}} - - - - - - - - {{end}} - -
NameScheduleNext TimePrevious TimeExecute Times
{{.Description}}{{.Spec}}{{.Next}}{{.Prev}}{{.ExecTimes}}
- {{end}} -
-
-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/admin/monitor/process.tmpl b/templates/admin/monitor/process.tmpl deleted file mode 100644 index 2d60ff689513..000000000000 --- a/templates/admin/monitor/process.tmpl +++ /dev/null @@ -1,38 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
- {{template "admin/nav" .}} -
- -
-
- {{if .PageIsMonitorProcess}} - - - - - - - - - - - {{range .Processes}} - - - - - - - {{end}} - -
PidDescriptionStart TimeExecution Time
{{.Pid}}{{.Description}}{{.Start}}{{TimeSince .Start}}
- {{end}} -
-
-
-
-{{template "base/footer" .}} \ No newline at end of file