Work on mirror repo

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 0ab1c9e420a063a5565750686c47635a2aea6a8d..32c198f2f43eddf3f029d0dd8e0871dbd1f71a92 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -55,36 +55,34 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
        ctx.Handle(200, "repo.Create", err)
 }
 
-func Import(ctx *middleware.Context, form auth.CreateRepoForm) {
-       ctx.Data["Title"] = "Import repository"
+func Mirror(ctx *middleware.Context, form auth.CreateRepoForm) {
+       ctx.Data["Title"] = "Mirror repository"
        ctx.Data["PageIsNewRepo"] = true // For navbar arrow.
-       ctx.Data["LanguageIgns"] = models.LanguageIgns
-       ctx.Data["Licenses"] = models.Licenses
 
        if ctx.Req.Method == "GET" {
-               ctx.HTML(200, "repo/import")
+               ctx.HTML(200, "repo/mirror")
                return
        }
 
        if ctx.HasError() {
-               ctx.HTML(200, "repo/import")
+               ctx.HTML(200, "repo/mirror")
                return
        }
 
        _, err := models.CreateRepository(ctx.User, form.RepoName, form.Description,
-               form.Language, form.License, form.Visibility == "private", form.InitReadme == "on")
+               "", form.License, form.Visibility == "private", false)
        if err == nil {
                log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, form.RepoName)
                ctx.Redirect("/" + ctx.User.Name + "/" + form.RepoName)
                return
        } else if err == models.ErrRepoAlreadyExist {
-               ctx.RenderWithErr("Repository name has already been used", "repo/import", &form)
+               ctx.RenderWithErr("Repository name has already been used", "repo/mirror", &form)
                return
        } else if err == models.ErrRepoNameIllegal {
-               ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "repo/import", &form)
+               ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "repo/mirror", &form)
                return
        }
-       ctx.Handle(200, "repo.Import", err)
+       ctx.Handle(200, "repo.Mirror", err)
 }
 
 func Single(ctx *middleware.Context, params martini.Params) {

diff --git a/templates/repo/import.tmpl b/templates/repo/import.tmpl
deleted file mode 100644 (file)
index 75d928d..0000000
--- a/templates/repo/import.tmpl
+++ /dev/null
@@ -1,112 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div class="container" id="body">
-    <form action="/repo/create" method="post" class="form-horizontal card" id="repo-create">
-        {{.CsrfTokenHtml}}
-        <h3>Import Repository</h3>
-        <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
-        <div class="form-group">
-            <label class="col-md-2 control-label">From<strong class="text-danger">*</strong></label>
-            <div class="col-md-8">
-                <select class="form-control" name="from">
-                    <option value="">GitHub</option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-md-2 control-label">URL<strong class="text-danger">*</strong></label>
-            <div class="col-md-8">
-                <input name="url" type="text" class="form-control" placeholder="Type your imported repository url link" required="required">
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-8">
-                <a class="btn btn-default" data-toggle="collapse" data-target="#repo-import-auth">Need Authorization</a>
-            </div>
-            <div id="repo-import-auth" class="collapse">
-                <div class="form-group">
-                    <label class="col-md-2 control-label">Username</label>
-                    <div class="col-md-8">
-                        <input name="auth-username" type="text" class="form-control">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-md-2 control-label">Password</label>
-                    <div class="col-md-8">
-                        <input name="auth-password" type="text" class="form-control">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <hr/>
-        <div class="form-group">
-            <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
-            <div class="col-md-8">
-                <p class="form-control-static">{{.SignedUserName}}</p>
-                <input type="hidden" value="{{.SignedUserId}}" name="userId"/>
-            </div>
-        </div>
-
-        <div class="form-group {{if .Err_RepoName}}has-error has-feedback{{end}}">
-            <label class="col-md-2 control-label">Repository<strong class="text-danger">*</strong></label>
-            <div class="col-md-8">
-                <input name="repo" type="text" class="form-control" placeholder="Type your repository name" value="{{.repo}}" required="required">
-                <span class="help-block">Great repository names are short and memorable. </span>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label class="col-md-2 control-label">Visibility<strong class="text-danger">*</strong></label>
-            <div class="col-md-8">
-                <p class="form-control-static">Public</p>
-                <input type="hidden" value="public" name="visibility"/>
-            </div>
-        </div>
-
-        <div class="form-group {{if .Err_Description}}has-error has-feedback{{end}}">
-            <label class="col-md-2 control-label">Description</label>
-            <div class="col-md-8">
-                <textarea name="desc" class="form-control" placeholder="Type your repository description">{{.desc}}</textarea>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label class="col-md-2 control-label">Language</label>
-            <div class="col-md-8">
-                <select class="form-control" name="language">
-                    <option value="">Select a language</option>
-                    {{range .LanguageIgns}}<option value="{{.}}">{{.}}</option>{{end}}
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label class="col-md-2 control-label">License</label>
-            <div class="col-md-8">
-                <select class="form-control" name="license">
-                    <option value="">Select a license</option>
-                    {{range .Licenses}}<option value="{{.}}">{{.}}</option>{{end}}
-                </select>
-            </div>
-        </div>
-
-        <!--<div class="form-group">
-            <div class="col-md-8 col-md-offset-2">
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" name="initReadme" {{if .initReadme}}checked{{end}}>
-                        <strong>Initialize this repository with a README</strong>
-                    </label>
-                </div>
-            </div>
-        </div>-->
-
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-8">
-                <button type="submit" class="btn btn-lg btn-primary">Import repository</button>
-                <a href="/" class="text-danger">Cancel</a>
-            </div>
-        </div>
-    </form>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/repo/mirror.tmpl b/templates/repo/mirror.tmpl
new file mode 100644 (file)
index 0000000..c69f47a
--- /dev/null
+++ b/templates/repo/mirror.tmpl
@@ -0,0 +1,81 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div class="container" id="body">
+    <form action="/repo/create" method="post" class="form-horizontal card" id="repo-create">
+        {{.CsrfTokenHtml}}
+        <h3>Import Repository</h3>
+        <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+        <div class="form-group">
+            <label class="col-md-2 control-label">From<strong class="text-danger">*</strong></label>
+            <div class="col-md-8">
+                <select class="form-control" name="from">
+                    <option value="">GitHub</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-2 control-label">URL<strong class="text-danger">*</strong></label>
+            <div class="col-md-8">
+                <input name="url" type="text" class="form-control" placeholder="Type your mirror repository url link" required="required">
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-8">
+                <a class="btn btn-default" data-toggle="collapse" data-target="#repo-import-auth">Need Authorization</a>
+            </div>
+            <div id="repo-import-auth" class="collapse">
+                <div class="form-group">
+                    <label class="col-md-2 control-label">Username</label>
+                    <div class="col-md-8">
+                        <input name="auth-username" type="text" class="form-control">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-md-2 control-label">Password</label>
+                    <div class="col-md-8">
+                        <input name="auth-password" type="text" class="form-control">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <hr/>
+        <div class="form-group">
+            <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
+            <div class="col-md-8">
+                <p class="form-control-static">{{.SignedUserName}}</p>
+                <input type="hidden" value="{{.SignedUserId}}" name="userId"/>
+            </div>
+        </div>
+
+        <div class="form-group {{if .Err_RepoName}}has-error has-feedback{{end}}">
+            <label class="col-md-2 control-label">Repository<strong class="text-danger">*</strong></label>
+            <div class="col-md-8">
+                <input name="repo" type="text" class="form-control" placeholder="Type your repository name" value="{{.repo}}" required="required">
+                <span class="help-block">Great repository names are short and memorable. </span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-md-2 control-label">Visibility<strong class="text-danger">*</strong></label>
+            <div class="col-md-8">
+                <p class="form-control-static">Public</p>
+                <input type="hidden" value="public" name="visibility"/>
+            </div>
+        </div>
+
+        <div class="form-group {{if .Err_Description}}has-error has-feedback{{end}}">
+            <label class="col-md-2 control-label">Description</label>
+            <div class="col-md-8">
+                <textarea name="desc" class="form-control" placeholder="Type your repository description">{{.desc}}</textarea>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-8">
+                <button type="submit" class="btn btn-lg btn-primary">Mirror repository</button>
+                <a href="/" class="text-danger">Cancel</a>
+            </div>
+        </div>
+    </form>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index f0a0a0ccaa98a971f26517bc8faa28df0058d536..cd55b651dfce30ba5749029d512874e310fbd3de 100644 (file)
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -37,7 +37,7 @@
                     <div class="dropdown-menu dropdown-menu-right">
                        <ul class="list-unstyled">
                            <li><a href="/repo/create"><i class="fa fa-book"></i>Repository</a></li>
-                           <li><a href="/repo/import"><i class="fa fa-clipboard"></i>Mirror</a></li>
+                           <li><a href="/repo/mirror"><i class="fa fa-clipboard"></i>Mirror</a></li>
                            <li><a href="#"><i class="fa fa-users"></i>Organization</a></li>
                        </ul>
 

diff --git a/web.go b/web.go
index 5dae84b64c5d3bf341d130cc5db653a2ce0d9d12..1a9c292f3e6714b0091b2f7c88155f4ef9bb501b 100644 (file)
--- a/web.go
+++ b/web.go
@@ -116,7 +116,7 @@ func runWeb(*cli.Context) {
        m.Get("/user/:username", ignSignIn, user.Profile)
 
        m.Any("/repo/create", reqSignIn, binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
-       m.Any("/repo/import", reqSignIn, binding.BindIgnErr(auth.CreateRepoForm{}), repo.Import)
+       m.Any("/repo/mirror", reqSignIn, binding.BindIgnErr(auth.CreateRepoForm{}), repo.Mirror)
 
        adminReq := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true, AdminRequire: true})