Merge branch 'master' of github.com:gogits/gogs

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)

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;

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")
+}

routers/repo/issue.go

@@ -45,6 +45,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
 	}
 
 	ctx.Data["Title"] = "Create issue"
+	ctx.Data["IsRepoToolbarIssues"] = true
 
 	if ctx.Req.Method == "GET" {
 		ctx.HTML(200, "issue/create")

templates/install.tmpl

@@ -0,0 +1,70 @@
+{{template "base/head" .}}
+<div id="gogs-body" class="container">
+    <form action="/install" method="post" class="form-horizontal gogs-card" id="gogs-install-card">
+        {{.CsrfTokenHtml}}
+        <h3>Install Steps</h3>
+        <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+        <p class="help-block text-center">GoGits need MySQL or PostgreSQL server</p>
+        <div class="form-group {{if .Err_User}}has-error has-feedback{{end}}">
+            <label class="col-md-3 control-label"><strong>MySQL </strong>Host: </label>
+            <div class="col-md-8">
+                <input name="host" class="form-control" placeholder="Type mysql server ip or domain" value="localhost" required="required">
+            </div>
+        </div>
+        <div class="form-group {{if .Err_User}}has-error has-feedback{{end}}">
+            <label class="col-md-3 control-label">Port: </label>
+            <div class="col-md-8">
+                <input name="port" class="form-control" placeholder="Type mysql server port" value="3306" required="required">
+            </div>
+        </div>
+        <div class="form-group {{if .Err_User}}has-error has-feedback{{end}}">
+            <label class="col-md-3 control-label">User: </label>
+            <div class="col-md-8">
+                <input name="user" class="form-control" placeholder="Type mysql username" required="required">
+            </div>
+        </div>
+        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
+            <label class="col-md-3 control-label">Password: </label>
+            <div class="col-md-8">
+                <input name="passwd" type="password" class="form-control" placeholder="Type mysql password" required="required">
+            </div>
+        </div>
+        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
+            <label class="col-md-3 control-label">Database: </label>
+            <div class="col-md-8">
+                <input name="database" type="text" class="form-control" placeholder="Type mysql database name" value="gogs" required="required">
+                <p class="help-block">Recommend use INNODB engine with utf8_general_ci charset.</p>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-8 col-md-offset-3">
+                   <button class="btn btn-sm btn-info">Test Connection</button>
+            </div>
+        </div>
+
+        <hr/>
+
+        <p class="help-block text-center">General settings for GoGits</p>
+
+        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
+            <label class="col-md-3 control-label">Repository Path: </label>
+            <div class="col-md-8">
+                <input name="repo-path" type="text" class="form-control" placeholder="Type your repository directory" value="/var/gogs/repostiory" required="required">
+                <p class="help-block">The git copy of each repository is saved in this directory.</p>
+            </div>
+        </div>
+        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
+            <label class="col-md-3 control-label">System User: </label>
+            <div class="col-md-8">
+                <input name="system-user" type="text" class="form-control" placeholder="Type mysql password" value="root" required="required">
+                <p class="help-block">The user has access to visit and run GoGits.</p>
+            </div>
+        </div>
+        <hr/>
+        <div class="form-group text-center">
+            <a class="btn btn-danger btn-lg">Install GoGits</a>
+        </div>
+    </form>
+</div>
+{{template "base/footer" .}}

templates/issue/create.tmpl

@@ -0,0 +1,10 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="gogs-body" class="container">
+    <div id="gogs-source">
+        new-issues
+    </div>
+</div>
+{{template "base/footer" .}}

templates/repo/issues.tmpl

@@ -4,6 +4,7 @@
 {{template "repo/toolbar" .}}
 <div id="gogs-body" class="container">
     <div id="gogs-source">
+        issues
     </div>
 </div>
 {{template "base/footer" .}}

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)