From ff362484191d08db2e2bda238934b780139b9048 Mon Sep 17 00:00:00 2001 From: slene Date: Mon, 24 Mar 2014 23:56:32 +0800 Subject: raw download --- modules/base/markdown.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'modules/base') diff --git a/modules/base/markdown.go b/modules/base/markdown.go index 05ce0c83..c722f04b 100644 --- a/modules/base/markdown.go +++ b/modules/base/markdown.go @@ -6,6 +6,7 @@ package base import ( "bytes" + "net/http" "path" "path/filepath" "strings" @@ -42,6 +43,14 @@ func IsMarkdownFile(name string) bool { return false } +func IsTextFile(data []byte) (string, bool) { + contentType := http.DetectContentType(data) + if strings.Index(contentType, "text/") != -1 { + return contentType, true + } + return contentType, false +} + func IsReadmeFile(name string) bool { name = strings.ToLower(name) if len(name) < 6 { -- cgit v1.2.3 From 6337d3bf193491aeb9f6a03b260e7c7089c59f76 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 24 Mar 2014 11:58:46 -0400 Subject: Show dashbard --- modules/base/conf.go | 4 ++-- serve.go | 2 +- web.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/base') diff --git a/modules/base/conf.go b/modules/base/conf.go index b4e0de97..d3122a53 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -100,7 +100,7 @@ func newService() { Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false) } -func NewLogService() { +func newLogService() { // Get and check log mode. LogMode = Cfg.MustValue("log", "MODE", "console") modeSec := "log." + LogMode @@ -296,7 +296,7 @@ func NewConfigContext() { func NewServices() { newService() - NewLogService() + newLogService() newCacheService() newSessionService() newMailService() diff --git a/serve.go b/serve.go index 06815b65..c3eb233c 100644 --- a/serve.go +++ b/serve.go @@ -45,6 +45,7 @@ gogs serv provide access auth for repositories`, } func init() { + os.MkdirAll("log", os.ModePerm) log.NewLogger(10000, "file", fmt.Sprintf(`{"filename":"%s"}`, "log/serv.log")) } @@ -72,7 +73,6 @@ func runServ(k *cli.Context) { base.NewConfigContext() models.LoadModelsConfig() models.NewEngine() - base.NewLogService() keys := strings.Split(os.Args[2], "-") if len(keys) != 2 { diff --git a/web.go b/web.go index 9717c938..70da899a 100644 --- a/web.go +++ b/web.go @@ -89,7 +89,7 @@ func runWeb(*cli.Context) { reqSignOut := middleware.Toggle(&middleware.ToggleOptions{SignOutRequire: true}) // Routers. - m.Get("/", reqSignIn, routers.Home) + m.Get("/", ignSignIn, routers.Home) m.Get("/issues", reqSignIn, user.Issues) m.Get("/pulls", reqSignIn, user.Pulls) m.Get("/stars", reqSignIn, user.Stars) -- cgit v1.2.3 From 7f6126dd04142c23fe5565a4c1f8cd8c93158460 Mon Sep 17 00:00:00 2001 From: FuXiaoHei Date: Tue, 25 Mar 2014 16:51:42 +0800 Subject: install sample page --- modules/base/conf.go | 2 +- public/css/gogs.css | 11 +++++++- routers/install.go | 13 ++++++++++ templates/install.tmpl | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ web.go | 1 + 5 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 routers/install.go create mode 100644 templates/install.tmpl (limited to 'modules/base') diff --git a/modules/base/conf.go b/modules/base/conf.go index d3122a53..90b35476 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -243,7 +243,7 @@ func newNotifyMailService() { } func NewConfigContext() { - var err error + //var err error workDir, err := exeDir() if err != nil { fmt.Printf("Fail to get work directory: %s\n", err) diff --git a/public/css/gogs.css b/public/css/gogs.css index 8b031d6e..2254ef5a 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -224,6 +224,15 @@ html, body { line-height: 30px; } +#gogs-install-card{ + width: 800px; +} + +#gogs-install-card .form-group { + margin-left: 0; + margin-right: 0; +} + .gogs-card .btn { cursor: pointer; margin-right: 1.2em; @@ -676,7 +685,7 @@ html, body { margin: 0 .5em 0 0; } -.file-content .file-head .file-size{ +.file-content .file-head .file-size { font-size: 13px; color: #888; margin-left: 1em; diff --git a/routers/install.go b/routers/install.go new file mode 100644 index 00000000..d7d5159e --- /dev/null +++ b/routers/install.go @@ -0,0 +1,13 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package routers + +import "github.com/gogits/gogs/modules/middleware" + +func Install(ctx *middleware.Context){ + ctx.Data["PageIsInstall"] = true + ctx.Data["Title"] = "Install" + ctx.HTML(200,"install") +} diff --git a/templates/install.tmpl b/templates/install.tmpl new file mode 100644 index 00000000..a13f2190 --- /dev/null +++ b/templates/install.tmpl @@ -0,0 +1,70 @@ +{{template "base/head" .}} +
+
+ {{.CsrfTokenHtml}} +

Install Steps

+
{{.ErrorMsg}}
+

GoGits need MySQL or PostgreSQL server

+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +

Recommend use INNODB engine with utf8_general_ci charset.

+
+
+ +
+
+ +
+
+ +
+ +

General settings for GoGits

+ +
+ +
+ +

The git copy of each repository is saved in this directory.

+
+
+
+ +
+ +

The user has access to visit and run GoGits.

+
+
+
+
+ Install GoGits +
+
+
+{{template "base/footer" .}} \ No newline at end of file diff --git a/web.go b/web.go index 0747f224..6538c61f 100644 --- a/web.go +++ b/web.go @@ -90,6 +90,7 @@ func runWeb(*cli.Context) { // Routers. m.Get("/", ignSignIn, routers.Home) + m.Get("/install",routers.Install) m.Get("/issues", reqSignIn, user.Issues) m.Get("/pulls", reqSignIn, user.Pulls) m.Get("/stars", reqSignIn, user.Stars) -- cgit v1.2.3