admin: fix template error

Also a try to display key-value pairs in table.

conf/locale/locale_en-US.ini

@@ -1181,7 +1181,8 @@ config.git_pull_timeout = Pull Operation Timeout
 config.git_gc_timeout = GC Operation Timeout
 
 config.log_config = Log Configuration
-config.log_mode = Log Mode
+config.log_mode = Mode
+config.log_options = Options
 
 monitor.cron = Cron Tasks
 monitor.name = Name

public/css/gogs.css

@@ -3019,6 +3019,13 @@ footer .ui.language .menu {
 .admin.config #test-mail-btn {
   margin-left: 5px;
 }
+.admin.config table tbody tr td:first-child {
+  font-weight: bold;
+}
+.admin.config pre {
+  background-color: #f7f7f7;
+  padding: 5px;
+}
 .explore {
   padding-top: 15px;
   padding-bottom: 80px;

public/less/_admin.less

@@ -62,5 +62,12 @@
 		#test-mail-btn {
 			margin-left: 5px;
 		}
+		table tbody tr td:first-child {
+			font-weight: bold;
+		}
+		pre {
+			background-color: #f7f7f7;
+			padding: 5px;
+		}
 	}
 }

routers/admin/admin.go

@@ -240,7 +240,7 @@ func Config(ctx *context.Context) {
 			Mode: strings.Title(setting.LogModes[i]),
 		}
 
-		result, _ := json.Marshal(setting.LogConfigs[i])
+		result, _ := json.MarshalIndent(setting.LogConfigs[i], "", "  ")
 		loggers[i].Config = string(result)
 	}
 	ctx.Data["Loggers"] = loggers

templates/admin/config.tmpl

@@ -170,7 +170,7 @@
 						<dd><i class="fa fa{{if .MailerEnabled}}-check{{end}}-square-o"></i></dd>
 						{{if .MailerEnabled}}
 							<dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt>
-							<dd>{{.Mailer.Name}}</dd>
+							<dd>{{.Mailer.Subject}}</dd>
 							<dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt>
 							<dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd>
 							<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
@@ -275,15 +275,19 @@
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.config.log_config"}}
 				</h4>
-				<div class="ui attached table segment">
+				<div class="ui attached segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
+					<table class="ui very basic table">
 						{{range .Loggers}}
-							<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
+							<tr>
-							<dd>{{.Mode}}</dd>
+								<td>{{$.i18n.Tr "admin.config.log_mode"}}</td>
-							<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
+								<td>{{.Mode}}</td>
-							<dd><pre><code>{{.Config}}</code></pre></dd>
+							<tr>
+							</tr>
+								<td>{{$.i18n.Tr "admin.config.log_options"}}</td>
+								<td><pre><code>{{.Config}}</code></pre></td>
+							</tr>
 						{{end}}
-					</dl>
+					</table>
 				</div>
 			</div>
 		</div>