Change routing

Author: takezoe

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -45,10 +45,23 @@ trait GistControllerBase extends ControllerBase {
   ////////////////////////////////////////////////////////////////////////////////
 
   get("/gist"){
-    if(context.loginAccount.isDefined){
-      val gists = getRecentGists(context.loginAccount.get.userName, 0, 4)
-      html.edit(gists, None, Seq(("", JGitUtil.ContentInfo("text", None, Some("UTF-8")))))
-    } else _discoverGists()
+    val page = request.getParameter("page") match {
+      case ""|null => 1
+      case s => s.toInt
+    }
+    val result = getVisibleGists((page - 1) * Limit, Limit, None)
+    val count  = countPublicGists()
+
+    val gists: Seq[(Gist, GistInfo)] = result.map { gist =>
+      val userName = gist.userName
+      val repoName = gist.repositoryName
+      val files = getGistFiles(userName, repoName)
+      val (fileName, source) = files.head
+
+      (gist, GistInfo(fileName, getLines(source), files.length, getForkedCount(userName, repoName), getCommentCount(userName, repoName)))
+    }
+
+    html.list(None, gists, page, page * Limit < count)
   }
 
   get("/gist/:userName/:repoName"){
@@ -265,20 +278,20 @@ trait GistControllerBase extends ControllerBase {
     }
   }
 
-
   get("/gist/:userName"){
     _gist(params("userName"))
   }
 
+  get("/gist/_new")(usersOnly {
+    val gists = getRecentGists(context.loginAccount.get.userName, 0, 4)
+    html.edit(gists, None, Seq(("", JGitUtil.ContentInfo("text", None, Some("UTF-8")))))
+  })
+
   get("/gist/_add"){
     val count = params("count").toInt
     html.editor(count, "", JGitUtil.ContentInfo("text", None, Some("UTF-8")))
   }
 
-  get("/gist/discover"){
-    _discoverGists()
-  }
-
   ////////////////////////////////////////////////////////////////////////////////
   //
   // Fork Actions
@@ -413,25 +426,6 @@ trait GistControllerBase extends ControllerBase {
   // Private Methods
   //
   ////////////////////////////////////////////////////////////////////////////////
-  private def _discoverGists(): Html = {
-    val page = request.getParameter("page") match {
-      case ""|null => 1
-      case s => s.toInt
-    }
-    val result = getVisibleGists((page - 1) * Limit, Limit, None)
-    val count  = countPublicGists()
-
-    val gists: Seq[(Gist, GistInfo)] = result.map { gist =>
-      val userName = gist.userName
-      val repoName = gist.repositoryName
-      val files = getGistFiles(userName, repoName)
-      val (fileName, source) = files.head
-
-      (gist, GistInfo(fileName, getLines(source), files.length, getForkedCount(userName, repoName), getCommentCount(userName, repoName)))
-    }
-
-    html.list(None, gists, page, page * Limit < count)
-  }
 
   private def _gist(userName: String, repoName: Option[String] = None, revision: String = "master"): Html = {
     repoName match {

src/main/twirl/gitbucket/gist/edit.scala.html

@@ -54,7 +54,7 @@
   <hr style="margin-bottom: 20px;"/>
   <div class="container body">
     <form id="form" method="POST" action="#" class="form-inline">
-      <input type="text" name="description" id="description" class="form-control input-lg" style="width: 900px; margin-bottom: 8px;" value="@gist.map(_.description)" placeholder="Snippet descriptions..."/>
+      <input type="text" name="description" id="description" class="form-control input-lg" style="width: 950px; margin-bottom: 8px;" value="@gist.map(_.description)" placeholder="Snippet descriptions..."/>
       <div id="editors">
         @files.zipWithIndex.map { case ((fileName, content), i) =>
           @gitbucket.gist.html.editor(i, fileName, content)

src/main/twirl/gitbucket/gist/list.scala.html

@@ -8,7 +8,12 @@
   @gitbucket.gist.html.style()
   <div class="container">
   @if(gistUser.isEmpty){
-    <div class="head">Discover Snippets</div>
+    <div class="head">
+      Discover Snippets
+      <div class="pull-right">
+        <a href="@path/gist/_new" class="btn btn-default">New snippet</a>
+      </div>
+    </div>
   } else {
     <div class="head">
       @avatar(gistUser.get.userName, 24)