From 896420f8dcf80aa19ec0735f7f40c75e786ea877 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 4 May 2014 17:58:47 +0900 Subject: [PATCH 01/50] Disable AceEditor for non text files --- src/main/twirl/repo/blob.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index 06d8234b0..038ef0acf 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -30,7 +30,7 @@ @link(latestCommit.summary, repository)
- @if(hasWritePermission){ + @if(hasWritePermission && content.viewType == "text"){ Edit } Raw From cf047a8cee636b9fbec2b6f9702230cdc2933432 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 4 May 2014 18:45:58 +0900 Subject: [PATCH 02/50] Migrate: add extension to files which are attached to issue --- src/main/scala/app/FileUploadController.scala | 4 ++- src/main/scala/app/IssuesController.scala | 14 +++++----- .../scala/servlet/AutoUpdateListener.scala | 27 +++++++++++++++++++ src/main/scala/util/FileUtil.scala | 14 ---------- 4 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/main/scala/app/FileUploadController.scala b/src/main/scala/app/FileUploadController.scala index ad8ea2829..9798c0a2a 100644 --- a/src/main/scala/app/FileUploadController.scala +++ b/src/main/scala/app/FileUploadController.scala @@ -25,7 +25,9 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport { post("/image/:owner/:repository"){ execute { (file, fileId) => - FileUtils.writeByteArrayToFile(new java.io.File(getAttachedDir(params("owner"), params("repository")), fileId), file.get) + FileUtils.writeByteArrayToFile(new java.io.File( + getAttachedDir(params("owner"), params("repository")), + fileId + "." + FileUtil.getExtension(file.getName)), file.get) } } diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index 2e6016830..661c1e082 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -274,12 +274,14 @@ trait IssuesControllerBase extends ControllerBase { }) get("/:owner/:repository/_attached/:file")(referrersOnly { repository => - defining(new java.io.File(Directory.getAttachedDir(repository.owner, repository.name), params("file"))){ file => - if(file.exists) { - contentType = FileUtil.getMimeType(file) - file - } else NotFound - } + (Directory.getAttachedDir(repository.owner, repository.name) match { + case dir if(dir.exists && dir.isDirectory) => + dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file => + contentType = FileUtil.getMimeType(file.getName) + file + } + case _ => None + }) getOrElse NotFound }) val assignedUserName = (key: String) => params.get(key) filter (_.trim != "") diff --git a/src/main/scala/servlet/AutoUpdateListener.scala b/src/main/scala/servlet/AutoUpdateListener.scala index 9ffed838e..05dc0eeaf 100644 --- a/src/main/scala/servlet/AutoUpdateListener.scala +++ b/src/main/scala/servlet/AutoUpdateListener.scala @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory import util.Directory._ import util.ControlUtil._ import org.eclipse.jgit.api.Git +import util.Directory object AutoUpdate { @@ -50,6 +51,32 @@ object AutoUpdate { * The history of versions. A head of this sequence is the current BitBucket version. */ val versions = Seq( + new Version(1, 14){ + override def update(conn: Connection): Unit = { + import eu.medsea.mimeutil.{MimeUtil2, MimeType} + + val mimeUtil = new MimeUtil2() + mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector") + + super.update(conn) + using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs => + while(rs.next){ + defining(Directory.getAttachedDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))){ dir => + if(dir.exists && dir.isDirectory){ + dir.listFiles.foreach { file => + if(file.getName.indexOf('.') < 0){ + val mimeType = MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString + if(mimeType.startsWith("image/")){ + file.renameTo(new File(file.getParent, file.getName + "." + mimeType.split("/")(1))) + } + } + } + } + } + } + } + } + }, Version(1, 13), Version(1, 12), Version(1, 11), diff --git a/src/main/scala/util/FileUtil.scala b/src/main/scala/util/FileUtil.scala index 46218eebe..0145db476 100644 --- a/src/main/scala/util/FileUtil.scala +++ b/src/main/scala/util/FileUtil.scala @@ -5,13 +5,9 @@ import java.net.URLConnection import java.io.File import util.ControlUtil._ import scala.util.Random -import eu.medsea.mimeutil.{MimeUtil2, MimeType} object FileUtil { - private val mimeUtil = new MimeUtil2() - mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector") - def getMimeType(name: String): String = defining(URLConnection.getFileNameMap()){ fileNameMap => fileNameMap.getContentTypeFor(name) match { @@ -20,16 +16,6 @@ object FileUtil { } } - /** - * Returns mime type detected by file content. - * - * @param file File object - * @return mime type String - */ - def getMimeType(file: File): String = { - MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString - } - def getContentType(name: String, bytes: Array[Byte]): String = { defining(getMimeType(name)){ mimeType => if(mimeType == "application/octet-stream" && isText(bytes)){ From 6a7fc555725a6f30fc9ace4795e3df9c47ace6da Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 5 May 2014 22:05:41 +0900 Subject: [PATCH 03/50] Global navigation moves to side menu. --- etc/icons.svg | 284 +++++++++++++++++- src/main/twirl/header.scala.html | 198 +++++++++--- src/main/twirl/helper/copy.scala.html | 4 +- src/main/twirl/issues/create.scala.html | 141 ++++----- src/main/twirl/issues/issue.scala.html | 51 ++-- src/main/twirl/issues/list.scala.html | 231 +++++++------- .../twirl/issues/milestones/edit.scala.html | 65 ++-- .../twirl/issues/milestones/list.scala.html | 175 +++++------ src/main/twirl/main.scala.html | 4 +- src/main/twirl/pulls/compare.scala.html | 139 ++++----- src/main/twirl/pulls/list.scala.html | 67 +++-- src/main/twirl/pulls/pullreq.scala.html | 63 ++-- src/main/twirl/repo/blob.scala.html | 107 +++---- src/main/twirl/repo/branches.scala.html | 61 ++-- src/main/twirl/repo/commit.scala.html | 121 ++++---- src/main/twirl/repo/commits.scala.html | 103 +++---- src/main/twirl/repo/delete.scala.html | 83 ++--- src/main/twirl/repo/editor.scala.html | 107 +++---- src/main/twirl/repo/files.scala.html | 161 +++++----- src/main/twirl/repo/forked.scala.html | 49 +-- src/main/twirl/repo/guide.scala.html | 37 +-- src/main/twirl/repo/tab.scala.html | 4 +- src/main/twirl/repo/tags.scala.html | 35 +-- src/main/twirl/search/menu.scala.html | 63 ++-- .../twirl/settings/collaborators.scala.html | 47 +-- src/main/twirl/settings/danger.scala.html | 57 ++-- src/main/twirl/settings/hooks.scala.html | 35 +-- src/main/twirl/settings/options.scala.html | 177 +++++------ src/main/twirl/wiki/compare.scala.html | 51 ++-- src/main/twirl/wiki/edit.scala.html | 51 ++-- src/main/twirl/wiki/history.scala.html | 121 ++++---- src/main/twirl/wiki/page.scala.html | 45 +-- src/main/twirl/wiki/pages.scala.html | 40 +-- src/main/twirl/wiki/tab.scala.html | 2 +- .../webapp/assets/common/css/gitbucket.css | 15 +- 35 files changed, 1704 insertions(+), 1290 deletions(-) diff --git a/etc/icons.svg b/etc/icons.svg index c2efe0e4d..bf4e8338c 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -2,6 +2,7 @@ + id="defs4"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index 165343d54..07f18f39b 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -1,60 +1,162 @@ -@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@(active: String, repository: service.RepositoryService.RepositoryInfo, id: Option[String] = None)(body: Html)(implicit context: app.Context) @import context._ @import view.helpers._ -@if(repository.commitCount > 0){ -
-
- Fork - @repository.forkedCount +
+ @if(repository.commitCount > 0){ +
+
+ Fork + @repository.forkedCount +
+ } +
+ @helper.html.repositoryicon(repository, true) + @repository.owner / @repository.name + + @defining(repository.repository){ x => + @if(repository.repository.originRepositoryName.isDefined){ +
+ forked from @x.parentUserName/@x.parentRepositoryName +
+ } + }
+
+
+ +
+
+
    +
    • +
  • +
    Code +
    • +
  • +
    Issues + @if(repository.issueCount > 0){ +
    @repository.issueCount
    + } +
    • +
  • +
    Pull Requests + @if(repository.pullCount > 0){ +
    @repository.pullCount
    + } +
    • +
  • +
    Wiki +
    • +
  • +
  • +
    Settings +
    • +
+
+ HTTP clone URL +
+ @helper.html.copy("repository-url-copy", repository.httpUrl){ + @* + @if(settings.ssh && loginAccount.isDefined){ +
+ +
+ } else { + HTTP + } + *@ + + } + @if(settings.ssh && loginAccount.isDefined){ +
+ You can clone HTTP or SSH.
} - } -
-@repository.repository.description.map { description => -

@description

-} - - - - - - - - @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ - +
+ @* + Download ZIP + *@ + Download ZIP +
+ +
+ @repository.repository.description.map { description => +

@description

} -
-
- Code - - Issues - @if(repository.issueCount > 0){ - @repository.issueCount - } - - Pull Requests - @if(repository.pullCount > 0){ - @repository.pullCount - } - - Wiki - - Network - - Settings -
+ + + @body +
+
diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index b303ef5d0..697e2bb1c 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -6,62 +6,63 @@ @import context._ @import view.helpers._ @html.main(if(fileName.isEmpty) "New File" else s"Editing ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository) - @tab(branch, repository, "files") -
- -
- @repository.name / - @pathList.zipWithIndex.map { case (section, i) => - @section / - } - - - - -
- - - - - - - -
-
- + @html.header("code", repository){ + @tab(branch, repository, "files") + + +
+ @repository.name / + @pathList.zipWithIndex.map { case (section, i) => + @section / + } + + + + +
+ + + + + + + +
+
+ +
+
+
+
+
@avatar(loginAccount.get.userName, 48)
+
+
+
+ Commit changes +
+
+ +
+
+ @if(fileName.isEmpty){ + Cancel + } else { + Cancel + } + + + +
-
-
-
-
@avatar(loginAccount.get.userName, 48)
-
-
-
- Commit changes -
-
- -
-
- @if(fileName.isEmpty){ - Cancel - } else { - Cancel - } - - - -
-
-
+ + } } + + } } \ No newline at end of file diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html index 7e43b5ace..967e3d098 100644 --- a/src/main/twirl/wiki/page.scala.html +++ b/src/main/twirl/wiki/page.scala.html @@ -5,26 +5,27 @@ @import context._ @import view.helpers._ @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository) - @tab((if(pageName == "Home") "home" else ""), repository) - -
- @markdown(page.content, repository, true, false) -
-
- Last edited by @page.committer at @datetime(page.time) -
+ @html.header("wiki", repository){ + @tab((if(pageName == "Home") "home" else ""), repository) + +
+ @markdown(page.content, repository, true, false) +
+
+ Last edited by @page.committer at @datetime(page.time) +
+ } } diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html index 429c43887..7f5d7dc93 100644 --- a/src/main/twirl/wiki/pages.scala.html +++ b/src/main/twirl/wiki/pages.scala.html @@ -4,24 +4,24 @@ @import context._ @import view.helpers._ @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository) - @tab("pages", repository) -
    -
  • -

    Pages

    -
    • -
  • -
    - @if(hasWritePermission){ - New Page - } -
    -
    • -
-
    - @pages.map { page => -
  • @page
    • - } -
- + @html.header("wiki", repository){ + @tab("pages", repository) +
    +
  • +

    Pages

    +
    • +
  • +
    + @if(hasWritePermission){ + New Page + } +
    +
    • +
+
    + @pages.map { page => +
  • @page
    • + } +
+ } } \ No newline at end of file diff --git a/src/main/twirl/wiki/tab.scala.html b/src/main/twirl/wiki/tab.scala.html index e68c88521..8c281cab5 100644 --- a/src/main/twirl/wiki/tab.scala.html +++ b/src/main/twirl/wiki/tab.scala.html @@ -8,7 +8,7 @@ Pages Wiki History
  • - @helper.html.copy("repository-url-copy", httpUrl(repository), true){ + @helper.html.copy("repository-url-copy", httpUrl(repository)){ @if(settings.ssh && loginAccount.isDefined){
    diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index aac4c8403..a17d73db2 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -3,6 +3,7 @@ /****************************************************************************/ body { color: #333; + line-height: 100%; } li p { @@ -122,7 +123,7 @@ span.error { } .small { - font-size: 85%; + font-size: 80%; } .strong { @@ -436,6 +437,7 @@ table.table-file-list td { th, td, .table th, .table td { padding-top: 4px; padding-bottom: 4px; + line-height: 100%; } div.commit-avatar-image { @@ -458,7 +460,16 @@ pre.commit-description { #repository-url { background-color: white; cursor: default; - width: 300px; + height: 16px; + width: 129px; + color: silver; + font-size: 9pt; + font-family: monospace; +} + +#repository-url-copy { + height: 18px; + padding-top: 2px; } ul#commit-file-list { From 24feeb17be6094f96bb63afe933d9ec6fbf2c52c Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 5 May 2014 22:06:18 +0900 Subject: [PATCH 04/50] Add icons for new UI --- .../assets/common/images/header-branches.png | Bin 0 -> 311 bytes .../assets/common/images/header-commits.png | Bin 0 -> 406 bytes .../webapp/assets/common/images/header-tags.png | Bin 0 -> 371 bytes .../webapp/assets/common/images/menu-code.png | Bin 0 -> 262 bytes .../webapp/assets/common/images/menu-issues.png | Bin 0 -> 404 bytes .../webapp/assets/common/images/menu-pulls.png | Bin 0 -> 315 bytes .../webapp/assets/common/images/menu-wiki.png | Bin 0 -> 367 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/webapp/assets/common/images/header-branches.png create mode 100644 src/main/webapp/assets/common/images/header-commits.png create mode 100644 src/main/webapp/assets/common/images/header-tags.png create mode 100644 src/main/webapp/assets/common/images/menu-code.png create mode 100644 src/main/webapp/assets/common/images/menu-issues.png create mode 100644 src/main/webapp/assets/common/images/menu-pulls.png create mode 100644 src/main/webapp/assets/common/images/menu-wiki.png diff --git a/src/main/webapp/assets/common/images/header-branches.png b/src/main/webapp/assets/common/images/header-branches.png new file mode 100644 index 0000000000000000000000000000000000000000..c661dd28aea20b4b40a716e68e32d6e317c987b6 GIT binary patch literal 311 zcmV-70m%M|P)(D>S#Wm$DyQv|pDYN%5Xr$(kuV~002ov JPDHLkV1lA5hx`Bl literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/common/images/header-commits.png b/src/main/webapp/assets/common/images/header-commits.png new file mode 100644 index 0000000000000000000000000000000000000000..d982329c541eb3a30df9ea1c6590e27a27706e03 GIT binary patch literal 406 zcmV;H0crk;P)NOm|JT-UWM zOVcz}RV$TBuh-k}_i~PiKT#A727^o{Qz#T#tyT~O*Xu^3 zLALMv@4(xZ%O%}x+m1uxcDqp{olaBo@xgYx9T?cYD3wYj0M%;sa=CoMtX3;1Fr+x0 zPCSmsqa4P$-EI>YH0X3XqTOyYVj_lW&=KY8luCQ0e&1`yvt&-NF`)| z>u@-1Hk-F(?-0%0cZJVZv;~2puhQJuQs;W%W+-|o~6d{`D`4aO6;Jw@J zeBaNq4E1zf_k|&-9`$TCo1!R&VUQ%LuIuOX+4ub{L(nmR^Z6`_;%c?BZ5!(Sevh29 z3}G1Na=G9Qg`tyCeK;Ik*PUgE<2WeecDvz1)vwnJSI_f4nJ^6B03OO90}4ayv;dkX zO;d~q7G(TDnX)WpS*8ru0*fR`z^JN<*$`@WJRTVRJm^)^w268Vz_Ba~GeMV=_#c-sweI+& R9`*nL002ovPDHLkV1nMNsKWpN literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/common/images/menu-code.png b/src/main/webapp/assets/common/images/menu-code.png new file mode 100644 index 0000000000000000000000000000000000000000..d47af04b8bd3b604472160b8408d61d5acccc427 GIT binary patch literal 262 zcmV+h0r~!kP)MGhAE1lG)ky+I5JcK*4{S+PTH2c~$$Lj~7jpYD$WOwu zEJaZa!+^_i9FOB*F4W1hn&&A zgLfkrwC_yQM37FB+PXAKZb=$V>`Frhue7;ZO4w8kvjIP9HSpWb4 M07*qoM6N<$f}eA3I{*Lx literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/common/images/menu-issues.png b/src/main/webapp/assets/common/images/menu-issues.png new file mode 100644 index 0000000000000000000000000000000000000000..956af1a4a18b956eebb9daff51db8f7ab63936e8 GIT binary patch literal 404 zcmV;F0c-w=P)1`m;yCVhyJcAlR>K=6?*Z^chQ(qb(1a^h9sUFmzV8o*LxF;5_a8u#BybTdQV)0! zKxKhD=&csGhqcr=QO!@MQ}_$`P($zg+u-QIU=T%-z&Py-h#)i*loX=<8%%*!bo4x$`z|gJhI_G+x y7e52x;cXa(oc#ijfh>55JJ3Z5G=VL=)t)cU7NXjin^Wlk0000_2c}~ zwrwY+BuUz~J%8yztgh<@L13C@-}n2zd!ENIOj(x8vivCY2^2*EH-f6F48zbgjiJP{ zY?fu;fTn3|+dhut^?LcfpQb5HusV)|R)QdK9EZ~zAQSUEFG51-e&xYW$acHk?RH@p7Da*JRoHAcqtQqdMbk8w%cbKunx;Lr z7>2Q0tz6fg&1U2A7}s#hEEbFXet$R|-YCeesw%Ye`TR=B^W5`1m|udf>ra#{%ZQL9 z$ukA@J3>`eCFN&@f^s|_I|AChqhLfL_`d%@u`H`2Ai*u!t-|SadZ(arN0?5h_mn7# zh!6z9Z7|!mJ3? literal 0 HcmV?d00001 From ea1e9037c43f0cf12819c1e8da65a0b4f9c91fdb Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 6 May 2014 01:01:43 +0900 Subject: [PATCH 05/50] Folding side-menu --- src/main/twirl/header.scala.html | 87 ++++++++++++++++------------ src/main/twirl/repo/files.scala.html | 9 +-- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/header.scala.html index 07f18f39b..354188b49 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/header.scala.html @@ -1,4 +1,7 @@ -@(active: String, repository: service.RepositoryService.RepositoryInfo, id: Option[String] = None)(body: Html)(implicit context: app.Context) +@(active: String, + repository: service.RepositoryService.RepositoryInfo, + id: Option[String] = None, + expand: Boolean = false)(body: Html)(implicit context: app.Context) @import context._ @import view.helpers._ @@ -55,6 +58,7 @@ ul.sidemenu li { height: 35px; border-left: 1px solid #eee; margin-left:0px; + border-right: 4px solid white; list-style-type: none; } @@ -62,62 +66,71 @@ ul.sidemenu li.separator { border-top: 1px solid #eee; height: 1px; } + +ul.sidemenu span.badge { + padding-right: 4px; +}
    -
    +
    -
    - HTTP clone URL -
    - @helper.html.copy("repository-url-copy", repository.httpUrl){ - @* - @if(settings.ssh && loginAccount.isDefined){ -
    - -
    - } else { - HTTP - } - *@ - - } - @if(settings.ssh && loginAccount.isDefined){ + @if(expand){
    - You can clone HTTP or SSH. + HTTP clone URL
    + @helper.html.copy("repository-url-copy", repository.httpUrl){ + @* + @if(settings.ssh && loginAccount.isDefined){ +
    + +
    + } else { + HTTP + } + *@ + + } + @if(settings.ssh && loginAccount.isDefined){ +
    + You can clone HTTP or SSH. +
    + } + @id.map { id => + + } } -
    - @* - Download ZIP - *@ - Download ZIP -
    -
    +
    @repository.repository.description.map { description =>

    @description

    } diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 803335ba6..d36724df5 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -8,16 +8,9 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository, Some(branch)){ + @html.header("code", repository, Some(branch), pathList.isEmpty){ @tab(branch, repository, "files")
    - @* -
    - @defining(repository.commitCount){ commitCount => - @if(commitCount > 10000){ 10000+ } else { @commitCount } @plural(commitCount, "commit")  - } -
    - *@ @repository.name / @pathList.zipWithIndex.map { case (section, i) => @section / From 0fe30e5629f6efd765671227fbead074d154d0b0 Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 6 May 2014 02:17:11 +0900 Subject: [PATCH 06/50] Rename header.scala.html to menu.scala.html --- etc/icons.svg | 83 +++- src/main/twirl/issues/create.scala.html | 2 +- src/main/twirl/issues/issue.scala.html | 2 +- src/main/twirl/issues/list.scala.html | 2 +- .../twirl/issues/milestones/edit.scala.html | 2 +- .../twirl/issues/milestones/list.scala.html | 2 +- .../{header.scala.html => menu.scala.html} | 362 +++++++++--------- src/main/twirl/pulls/compare.scala.html | 2 +- src/main/twirl/pulls/list.scala.html | 2 +- src/main/twirl/pulls/pullreq.scala.html | 2 +- src/main/twirl/repo/blob.scala.html | 2 +- src/main/twirl/repo/branches.scala.html | 2 +- src/main/twirl/repo/commit.scala.html | 2 +- src/main/twirl/repo/commits.scala.html | 2 +- src/main/twirl/repo/delete.scala.html | 2 +- src/main/twirl/repo/editor.scala.html | 2 +- src/main/twirl/repo/files.scala.html | 2 +- src/main/twirl/repo/forked.scala.html | 2 +- src/main/twirl/repo/guide.scala.html | 2 +- src/main/twirl/repo/tags.scala.html | 2 +- src/main/twirl/search/menu.scala.html | 2 +- .../twirl/settings/collaborators.scala.html | 2 +- src/main/twirl/settings/danger.scala.html | 2 +- src/main/twirl/settings/hooks.scala.html | 2 +- src/main/twirl/settings/options.scala.html | 2 +- src/main/twirl/wiki/compare.scala.html | 2 +- src/main/twirl/wiki/edit.scala.html | 2 +- src/main/twirl/wiki/history.scala.html | 2 +- src/main/twirl/wiki/page.scala.html | 2 +- src/main/twirl/wiki/pages.scala.html | 2 +- 30 files changed, 288 insertions(+), 213 deletions(-) rename src/main/twirl/{header.scala.html => menu.scala.html} (62%) diff --git a/etc/icons.svg b/etc/icons.svg index bf4e8338c..565641e02 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -35,8 +35,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.9899495" - inkscape:cx="827.57339" - inkscape:cy="496.04311" + inkscape:cx="658.37284" + inkscape:cy="201.93139" inkscape:document-units="px" inkscape:current-layer="layer1-9" showgrid="false" @@ -1185,7 +1185,7 @@ style="fill:#ffffff;stroke:#a0a0a0;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + + + + + + + + + + diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html index e9aacbc2e..e87ed9726 100644 --- a/src/main/twirl/issues/create.scala.html +++ b/src/main/twirl/issues/create.scala.html @@ -6,7 +6,7 @@ @import context._ @import view.helpers._ @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @tab("", repository)
    diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index 6f13e2fb4..d849ab07b 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -9,7 +9,7 @@ @import context._ @import view.helpers._ @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @tab("issues", repository)
    • Back to issue list
      • diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index b1e0c410f..c05aa920d 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -16,7 +16,7 @@ @import context._ @import view.helpers._ @html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @tab("issues", repository)
      diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html index 697270089..f99f79842 100644 --- a/src/main/twirl/issues/milestones/edit.scala.html +++ b/src/main/twirl/issues/milestones/edit.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.header("milestones", repository){ + @html.menu("milestones", repository){ @issues.html.tab("milestones", repository)
      diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html index 5c12b2652..1c9d9dbdd 100644 --- a/src/main/twirl/issues/milestones/list.scala.html +++ b/src/main/twirl/issues/milestones/list.scala.html @@ -5,7 +5,7 @@ @import context._ @import view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ - @html.header("issues", repository){ + @html.menu("issues", repository){ @issues.html.tab("milestones", repository)
      diff --git a/src/main/twirl/header.scala.html b/src/main/twirl/menu.scala.html similarity index 62% rename from src/main/twirl/header.scala.html rename to src/main/twirl/menu.scala.html index 354188b49..a1d0fbcea 100644 --- a/src/main/twirl/header.scala.html +++ b/src/main/twirl/menu.scala.html @@ -1,180 +1,182 @@ -@(active: String, - repository: service.RepositoryService.RepositoryInfo, - id: Option[String] = None, - expand: Boolean = false)(body: Html)(implicit context: app.Context) -@import context._ -@import view.helpers._ - -
      - @if(repository.commitCount > 0){ -
      -
      - Fork - @repository.forkedCount -
      -
      - } -
      - @helper.html.repositoryicon(repository, true) - @repository.owner / @repository.name - - @defining(repository.repository){ x => - @if(repository.repository.originRepositoryName.isDefined){ -
      - forked from @x.parentUserName/@x.parentRepositoryName -
      - } - } -
      -
      -
      - -
      -
      - - @if(expand){ -
      - HTTP clone URL -
      - @helper.html.copy("repository-url-copy", repository.httpUrl){ - @* - @if(settings.ssh && loginAccount.isDefined){ -
      - -
      - } else { - HTTP - } - *@ - - } - @if(settings.ssh && loginAccount.isDefined){ -
      - You can clone HTTP or SSH. -
      - } - @id.map { id => - - } - } -
      -
      - @repository.repository.description.map { description => -

      @description

      - } - - - @body -
      -
      - +@(active: String, + repository: service.RepositoryService.RepositoryInfo, + id: Option[String] = None, + expand: Boolean = false)(body: Html)(implicit context: app.Context) +@import context._ +@import view.helpers._ + +
      + @if(repository.commitCount > 0){ +
      +
      + Fork + @repository.forkedCount +
      +
      + } +
      + @helper.html.repositoryicon(repository, true) + @repository.owner / @repository.name + + @defining(repository.repository){ x => + @if(repository.repository.originRepositoryName.isDefined){ +
      + forked from @x.parentUserName/@x.parentRepositoryName +
      + } + } +
      +
      +
      + +
      +
      + + @if(expand){ +
      + HTTP clone URL +
      + @helper.html.copy("repository-url-copy", repository.httpUrl){ + @* + @if(settings.ssh && loginAccount.isDefined){ +
      + +
      + } else { + HTTP + } + *@ + + } + @if(settings.ssh && loginAccount.isDefined){ +
      + You can clone HTTP or SSH. +
      + } + @id.map { id => + + } + } +
      +
      + + @if(expand){ + @repository.repository.description.map { description => +

      @description

      + } + + } + @body +
      +
      +@* + +*@ \ No newline at end of file diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html index 37d026b1e..90fa6f2de 100644 --- a/src/main/twirl/pulls/compare.scala.html +++ b/src/main/twirl/pulls/compare.scala.html @@ -12,7 +12,7 @@ @import context._ @import view.helpers._ @html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("pulls", repository){ + @html.menu("pulls", repository){
      Edit diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index 6c01bbb1c..a2fb30d92 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -11,7 +11,7 @@ @import context._ @import view.helpers._ @html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("pulls", repository){ + @html.menu("pulls", repository){
        diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html index bbd76e75f..0a0774f57 100644 --- a/src/main/twirl/pulls/pullreq.scala.html +++ b/src/main/twirl/pulls/pullreq.scala.html @@ -12,7 +12,7 @@ @import context._ @import view.helpers._ @html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("pulls", repository){ + @html.menu("pulls", repository){ @defining(dayByDayCommits.flatten){ commits =>
        @if(issue.closed) { diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index bf1936849..8e76a9e0f 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -7,7 +7,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(branch, repository, "files")
        @repository.name / diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html index c84019111..d8a4f3f1d 100644 --- a/src/main/twirl/repo/branches.scala.html +++ b/src/main/twirl/repo/branches.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(repository.repository.defaultBranch, repository, "branches", true)

        Branches

        diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index a77e7e0bc..1302c7c15 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -9,7 +9,7 @@ @import view.helpers._ @import util.Implicits._ @html.main(commit.shortMessage, Some(repository)){ - @html.header("code", repository){ + @html.menu("code", repository){ @tab(commitId, repository, "commits")
        diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html index 4cde43335..782896c8c 100644 --- a/src/main/twirl/repo/commits.scala.html +++ b/src/main/twirl/repo/commits.scala.html @@ -7,7 +7,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
        @if(pathList.isEmpty){ diff --git a/src/main/twirl/repo/delete.scala.html b/src/main/twirl/repo/delete.scala.html index cebb8d3bc..a6678fea1 100644 --- a/src/main/twirl/repo/delete.scala.html +++ b/src/main/twirl/repo/delete.scala.html @@ -6,7 +6,7 @@ @import context._ @import view.helpers._ @html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(branch, repository, "files")
        diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index 697e2bb1c..dc46583eb 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -6,7 +6,7 @@ @import context._ @import view.helpers._ @html.main(if(fileName.isEmpty) "New File" else s"Editing ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(branch, repository, "files") diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index d36724df5..f7bdf3778 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -8,7 +8,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository, Some(branch), pathList.isEmpty){ + @html.menu("code", repository, Some(branch), pathList.isEmpty){ @tab(branch, repository, "files")
        @repository.name / diff --git a/src/main/twirl/repo/forked.scala.html b/src/main/twirl/repo/forked.scala.html index 25c7d0a08..0e5b4fe7e 100644 --- a/src/main/twirl/repo/forked.scala.html +++ b/src/main/twirl/repo/forked.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("network", repository){ + @html.menu("network", repository){ diff --git a/src/main/twirl/repo/guide.scala.html b/src/main/twirl/repo/guide.scala.html index 8e0b96664..28d42a2b3 100644 --- a/src/main/twirl/repo/guide.scala.html +++ b/src/main/twirl/repo/guide.scala.html @@ -3,7 +3,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @if(!hasWritePermission){

        This is an empty repository

        } else { diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html index 9da40d0f2..a7a1daba9 100644 --- a/src/main/twirl/repo/tags.scala.html +++ b/src/main/twirl/repo/tags.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { - @html.header("code", repository){ + @html.menu("code", repository){ @tab(repository.repository.defaultBranch, repository, "tags", true)

        Tags

        diff --git a/src/main/twirl/search/menu.scala.html b/src/main/twirl/search/menu.scala.html index 4cbd77670..adc915631 100644 --- a/src/main/twirl/search/menu.scala.html +++ b/src/main/twirl/search/menu.scala.html @@ -2,7 +2,7 @@ repository: service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: app.Context) @import context._ @import view.helpers._ -@html.header("", repository){ +@html.menu("", repository){
        diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html index 69235da71..28efeb613 100644 --- a/src/main/twirl/settings/collaborators.scala.html +++ b/src/main/twirl/settings/collaborators.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main("Settings", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("collaborators", repository){

        Manage Collaborators

          diff --git a/src/main/twirl/settings/danger.scala.html b/src/main/twirl/settings/danger.scala.html index f00eae075..ca74460fc 100644 --- a/src/main/twirl/settings/danger.scala.html +++ b/src/main/twirl/settings/danger.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main("Danger Zone", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("danger", repository){
          Danger Zone
          diff --git a/src/main/twirl/settings/hooks.scala.html b/src/main/twirl/settings/hooks.scala.html index f6017a739..03d98bab9 100644 --- a/src/main/twirl/settings/hooks.scala.html +++ b/src/main/twirl/settings/hooks.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main("Settings", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("hooks", repository){ @helper.html.information(info)

          WebHook URLs

          diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html index 2e7ff2c65..b6949dc75 100644 --- a/src/main/twirl/settings/options.scala.html +++ b/src/main/twirl/settings/options.scala.html @@ -2,7 +2,7 @@ @import context._ @import view.helpers._ @html.main("Settings", Some(repository)){ - @html.header("settings", repository){ + @html.menu("settings", repository){ @menu("options", repository){ @helper.html.information(info) diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html index bdc43f513..97116cc23 100644 --- a/src/main/twirl/wiki/compare.scala.html +++ b/src/main/twirl/wiki/compare.scala.html @@ -10,7 +10,7 @@ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){ @helper.html.information(info) - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab("history", repository)
          • diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html index 4d403d233..802c43b5e 100644 --- a/src/main/twirl/wiki/edit.scala.html +++ b/src/main/twirl/wiki/edit.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab("", repository)
            • diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html index cc70b3391..fecb9dec9 100644 --- a/src/main/twirl/wiki/history.scala.html +++ b/src/main/twirl/wiki/history.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab(if(pageName.isEmpty) "history" else "", repository)
              • diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html index 967e3d098..5dcca1e60 100644 --- a/src/main/twirl/wiki/page.scala.html +++ b/src/main/twirl/wiki/page.scala.html @@ -5,7 +5,7 @@ @import context._ @import view.helpers._ @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab((if(pageName == "Home") "home" else ""), repository)
                • diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html index 7f5d7dc93..cd576de8c 100644 --- a/src/main/twirl/wiki/pages.scala.html +++ b/src/main/twirl/wiki/pages.scala.html @@ -4,7 +4,7 @@ @import context._ @import view.helpers._ @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("wiki", repository){ + @html.menu("wiki", repository){ @tab("pages", repository)
                  • From 8d3433a0e785bc9e03949acd0eb0f7f6f669133b Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 6 May 2014 02:17:41 +0900 Subject: [PATCH 07/50] Add icon for repository resttings --- .../webapp/assets/common/images/menu-settings.png | Bin 0 -> 368 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/webapp/assets/common/images/menu-settings.png diff --git a/src/main/webapp/assets/common/images/menu-settings.png b/src/main/webapp/assets/common/images/menu-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..ab8f05cf2313204112410ef536b1f57be359286a GIT binary patch literal 368 zcmV-$0gwKPP)$>apI?J+&sj4c+ak{RX0(D(;9A{b9#J$~aS(Y^n0}K<#G2Lt1 zcC}iWra5;L9S#TPcs!yKR9kRk6V8{9+R#pBM3s0ByZs7BfO4pPx|?MDvAO({(k{S^qbY)a*mY% O0000 Date: Tue, 6 May 2014 02:28:33 +0900 Subject: [PATCH 08/50] Fix tab style --- src/main/twirl/issues/tab.scala.html | 2 +- src/main/twirl/wiki/tab.scala.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html index de340e635..c4d653dab 100644 --- a/src/main/twirl/issues/tab.scala.html +++ b/src/main/twirl/issues/tab.scala.html @@ -1,7 +1,7 @@ @(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._ -
                      +
                        Browse Issues Milestones @if(loginAccount.isDefined){ diff --git a/src/main/twirl/wiki/tab.scala.html b/src/main/twirl/wiki/tab.scala.html index 8c281cab5..012db9c94 100644 --- a/src/main/twirl/wiki/tab.scala.html +++ b/src/main/twirl/wiki/tab.scala.html @@ -3,7 +3,7 @@ @import context._ @import service.WikiService._ @import view.helpers._ -
                          +
                            Home Pages Wiki History From dc2d79b16c03aee0ba2527b20816376acedb10eb Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 6 May 2014 03:21:31 +0900 Subject: [PATCH 09/50] Remove unnecessary parts and styles. --- src/main/twirl/helper/copy.scala.html | 2 +- src/main/twirl/issues/tab.scala.html | 2 +- src/main/twirl/menu.scala.html | 31 +++++----- src/main/twirl/repo/blob.scala.html | 1 - src/main/twirl/repo/branches.scala.html | 1 - src/main/twirl/repo/commit.scala.html | 1 - src/main/twirl/repo/commits.scala.html | 1 - src/main/twirl/repo/delete.scala.html | 1 - src/main/twirl/repo/editor.scala.html | 1 - src/main/twirl/repo/files.scala.html | 1 - src/main/twirl/repo/tab.scala.html | 57 ------------------- src/main/twirl/repo/tags.scala.html | 1 - src/main/twirl/wiki/tab.scala.html | 2 +- .../webapp/assets/common/css/gitbucket.css | 36 ++---------- 14 files changed, 20 insertions(+), 118 deletions(-) delete mode 100644 src/main/twirl/repo/tab.scala.html diff --git a/src/main/twirl/helper/copy.scala.html b/src/main/twirl/helper/copy.scala.html index 1cba6e6d4..e950791ce 100644 --- a/src/main/twirl/helper/copy.scala.html +++ b/src/main/twirl/helper/copy.scala.html @@ -1,5 +1,5 @@ @(id: String, value: String)(html: Html) -
                            +
                            @html
                            diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html index c4d653dab..3db5af274 100644 --- a/src/main/twirl/issues/tab.scala.html +++ b/src/main/twirl/issues/tab.scala.html @@ -1,7 +1,7 @@ @(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._ -
                              +
                                Browse Issues Milestones @if(loginAccount.isDefined){ diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html index a1d0fbcea..00d66ea2c 100644 --- a/src/main/twirl/menu.scala.html +++ b/src/main/twirl/menu.scala.html @@ -105,24 +105,15 @@ ul.sidemenu span.badge { HTTP clone URL
                            @helper.html.copy("repository-url-copy", repository.httpUrl){ - @* - @if(settings.ssh && loginAccount.isDefined){ -
                            - -
                            - } else { - HTTP - } - *@ } @if(settings.ssh && loginAccount.isDefined){
                            - You can clone HTTP or SSH. + You can clone HTTP or SSH.
                            } @id.map { id => -
                            + } @@ -146,7 +137,7 @@ ul.sidemenu span.badge {

                            @description

                            }
                            -
        +
        - @if(recentRepositories.isEmpty){2 + @if(recentRepositories.isEmpty){ From 2471b8dfe0c022bf80bd6ba62515dcf00a33c59e Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 16 May 2014 14:31:00 +0900 Subject: [PATCH 35/50] bugfix --- src/main/twirl/repo/files.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 84b28e985..3e6d9993e 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -16,7 +16,7 @@ mini = true ){ @repository.branchList.map { x => -
      • @helper.html.checkicon(x == branch) @x
        • +
      • @helper.html.checkicon(x == branch) @x
        • } } @repository.name / From d7037a43c66feef6ac884b425bb690c9d8a1f388 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 16 May 2014 17:06:57 +0900 Subject: [PATCH 36/50] bugfix --- src/main/twirl/repo/commits.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html index 60d9b2f4d..8fc49bfaa 100644 --- a/src/main/twirl/repo/commits.scala.html +++ b/src/main/twirl/repo/commits.scala.html @@ -15,7 +15,7 @@ mini = true ){ @repository.branchList.map { x => -
      • @helper.html.checkicon(x == branch) @x
        • +
      • @helper.html.checkicon(x == branch) @x
        • } } @if(pathList.isEmpty){ From 9ecc10ab210310590cbd6a03a6c06f33130968cb Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 18 May 2014 15:35:19 +0900 Subject: [PATCH 37/50] (refs #372)Select lines by clicking line number in blob view --- src/main/twirl/repo/blob.scala.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index 65684d3b5..6d4a17e36 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -80,6 +80,31 @@ $(window).load(function(){ $(window).hashchange(function(){ updateHighlighting(); }).hashchange(); + + $('pre.prettyprint ol.linenums li').each(function(i, e){ + var pre = $('pre.prettyprint'); + pre.append($('
        ') + .data('line', (i + 1)) + .css({ + cursor : 'pointer', + position: 'absolute', + top : $(e).position().top + 'px', + left : pre.position().left + 'px', + width : ($(e).position().left - pre.position().left) + 'px', + height : '16px' + })); + }); + + $('div.source-line-num').click(function(e){ + var line = $(e.target).data('line'); + var hash = location.hash; + if(e.ctrlKey == true && hash.match(/#L\d+(-L\d+)?/)){ + var lines = hash.split('-'); + location.hash = lines[0] + '-L' + line; + } else { + location.hash = '#L' + line; + } + }); }); /** From f6eb2e2dc8ba6ef715e3f49b35b418e5ce715036 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 18 May 2014 16:04:38 +0900 Subject: [PATCH 38/50] (refs #230)Fix markdown preview styles --- src/main/twirl/repo/blob.scala.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index 6d4a17e36..a90f5bc0e 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -54,20 +54,22 @@ @if(content.viewType == "text"){ @defining(pathList.reverse.head) { file => @if(renderableSuffixes.find(suffix => file.toLowerCase.endsWith(suffix))) { - @renderMarkup(pathList, content.content.get, branch, repository, false, false) +
        + @renderMarkup(pathList, content.content.get, branch, repository, false, false) +
        } else { 
        @content.content.get
        } } } @if(content.viewType == "image"){ - + } @if(content.viewType == "large" || content.viewType == "binary"){ -
        - View Raw
        - (Sorry about that, but we can't show files that are this big right now) -
        +
        + View Raw
        + (Sorry about that, but we can't show files that are this big right now) +
        } From 4dc60e887facaeebbf74b3cfc4ef8bd127238ba5 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 18 May 2014 21:05:51 +0900 Subject: [PATCH 39/50] (refs #373)Preview markdown in the text file editor. --- src/main/twirl/repo/editor.scala.html | 30 ++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index 712e51cc5..4112c6d26 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -23,18 +23,25 @@
        @@ -170,13 +161,17 @@ ul.sidemenu span.badge { @body -@* - -*@ \ No newline at end of file +} diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index 8e76a9e0f..cbc5a43e4 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -8,7 +8,6 @@ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){ - @tab(branch, repository, "files")
        @repository.name / @pathList.zipWithIndex.map { case (section, i) => diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html index d8a4f3f1d..1b051706f 100644 --- a/src/main/twirl/repo/branches.scala.html +++ b/src/main/twirl/repo/branches.scala.html @@ -5,7 +5,6 @@ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){ - @tab(repository.repository.defaultBranch, repository, "branches", true)

        Branches

        diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index 1302c7c15..61a2ce49c 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -10,7 +10,6 @@ @import util.Implicits._ @html.main(commit.shortMessage, Some(repository)){ @html.menu("code", repository){ - @tab(commitId, repository, "commits")
        diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html index 782896c8c..1ace0e507 100644 --- a/src/main/twirl/repo/commits.scala.html +++ b/src/main/twirl/repo/commits.scala.html @@ -8,7 +8,6 @@ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){ - @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
        @if(pathList.isEmpty){ @repository.name / Commit History diff --git a/src/main/twirl/repo/delete.scala.html b/src/main/twirl/repo/delete.scala.html index a6678fea1..99fef8d49 100644 --- a/src/main/twirl/repo/delete.scala.html +++ b/src/main/twirl/repo/delete.scala.html @@ -7,7 +7,6 @@ @import view.helpers._ @html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){ - @tab(branch, repository, "files")
        @repository.name / diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index dc46583eb..712e51cc5 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -7,7 +7,6 @@ @import view.helpers._ @html.main(if(fileName.isEmpty) "New File" else s"Editing ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){ - @tab(branch, repository, "files")
        diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index f7bdf3778..fbb60b1da 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -9,7 +9,6 @@ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository, Some(branch), pathList.isEmpty){ - @tab(branch, repository, "files")
        @repository.name / @pathList.zipWithIndex.map { case (section, i) => diff --git a/src/main/twirl/repo/tab.scala.html b/src/main/twirl/repo/tab.scala.html deleted file mode 100644 index ddffe1d6c..000000000 --- a/src/main/twirl/repo/tab.scala.html +++ /dev/null @@ -1,57 +0,0 @@ -@(id: String, repository: service.RepositoryService.RepositoryInfo, active: String, - hideBranchPulldown: Boolean = false)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@* - -*@ -@if(settings.ssh && loginAccount.isDefined){ - -} \ No newline at end of file diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html index a7a1daba9..57a8a69ae 100644 --- a/src/main/twirl/repo/tags.scala.html +++ b/src/main/twirl/repo/tags.scala.html @@ -3,7 +3,6 @@ @import view.helpers._ @html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){ - @tab(repository.repository.defaultBranch, repository, "tags", true)

        Tags

        diff --git a/src/main/twirl/wiki/tab.scala.html b/src/main/twirl/wiki/tab.scala.html index 012db9c94..96d930ee2 100644 --- a/src/main/twirl/wiki/tab.scala.html +++ b/src/main/twirl/wiki/tab.scala.html @@ -3,7 +3,7 @@ @import context._ @import service.WikiService._ @import view.helpers._ -
          +
            Home Pages Wiki History diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index a17d73db2..0379ed214 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -56,38 +56,6 @@ span.header-version { font-size: small; } -/* ======================================================================== */ -/* Repository Header */ -/* ======================================================================== */ -table.global-nav { - width: 920px; - margin-bottom: 10px; -} - -table.global-nav th { - padding-top: 5px; - padding-bottom: 8px; - width: 16%; - border-bottom: 2px solid silver; - cursor: pointer; -} - -table.global-nav th.active { - border-bottom: 2px solid #D26911; -} - -table.global-nav th a:link, table.global-nav th a:hover, table.global-nav th a:visited { - color: #333; - text-decoration: none; -} - -div.input-prepend span.count { - background-color: white; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - /* ======================================================================== */ /* General Styles */ /* ======================================================================== */ @@ -303,6 +271,10 @@ span.highlight { background-color: #ffff88; } +.fill-width { + width: 100%; +} + /****************************************************************************/ /* Create Repository */ /****************************************************************************/ From 4e87f2140509bf2a87ab0be2587516e83d01215e Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 6 May 2014 12:41:45 +0900 Subject: [PATCH 10/50] Revert style for fork count --- src/main/webapp/assets/common/css/gitbucket.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 0379ed214..4b052749e 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -56,6 +56,13 @@ span.header-version { font-size: small; } +div.input-prepend span.count { + background-color: white; + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} + /* ======================================================================== */ /* General Styles */ /* ======================================================================== */ From f422936e34683263df04ad1db8936bae6fe2c51e Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 6 May 2014 21:32:40 +0900 Subject: [PATCH 11/50] Add
            to pages outside of repository. --- src/main/twirl/account/edit.scala.html | 98 ++++++++--------- src/main/twirl/account/group.scala.html | 2 +- src/main/twirl/account/main.scala.html | 94 ++++++++-------- src/main/twirl/account/register.scala.html | 2 + src/main/twirl/account/ssh.scala.html | 68 ++++++------ src/main/twirl/admin/menu.scala.html | 40 +++---- src/main/twirl/dashboard/issues.scala.html | 72 +++++++------ src/main/twirl/dashboard/pulls.scala.html | 60 ++++++----- src/main/twirl/index.scala.html | 119 +++++++++++---------- 9 files changed, 285 insertions(+), 270 deletions(-) diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html index c02bcbea1..d92c708ff 100644 --- a/src/main/twirl/account/edit.scala.html +++ b/src/main/twirl/account/edit.scala.html @@ -2,60 +2,62 @@ @import context._ @import view.helpers._ @html.main("Edit your profile"){ -
            -
            - @menu("profile", settings.ssh) -
            -
            - @helper.html.information(info) - -
            -
            Profile
            -
            -
            -
            - @if(account.password.nonEmpty){ +
            +
            +
            + @menu("profile", settings.ssh) +
            +
            + @helper.html.information(info) + +
            +
            Profile
            +
            +
            +
            + @if(account.password.nonEmpty){ +
            + + + +
            + }
            - - - + + +
            - } -
            - - - -
            -
            - - - -
            -
            - - - -
            +
            + + + +
            +
            + + + +
            +
            +
            +
            + + @helper.html.uploadavatar(Some(account)) +
            +
            -
            -
            - - @helper.html.uploadavatar(Some(account)) -
            +
            -
            -
            - Delete account -
            - - Cancel -
            -
            - + +
            }
              From 6042f0e1e08428be57f1c790572944480ce17c1b Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 8 May 2014 07:46:32 +0900 Subject: [PATCH 16/50] Add active icons for side-menu --- etc/icons.svg | 263 +++++++++++++++++- .../assets/common/images/menu-code-active.png | Bin 0 -> 290 bytes .../common/images/menu-issues-active.png | Bin 0 -> 485 bytes .../common/images/menu-pulls-active.png | Bin 0 -> 356 bytes .../common/images/menu-settings-active.png | Bin 0 -> 418 bytes .../assets/common/images/menu-wiki-active.png | Bin 0 -> 419 bytes 6 files changed, 260 insertions(+), 3 deletions(-) create mode 100644 src/main/webapp/assets/common/images/menu-code-active.png create mode 100644 src/main/webapp/assets/common/images/menu-issues-active.png create mode 100644 src/main/webapp/assets/common/images/menu-pulls-active.png create mode 100644 src/main/webapp/assets/common/images/menu-settings-active.png create mode 100644 src/main/webapp/assets/common/images/menu-wiki-active.png diff --git a/etc/icons.svg b/etc/icons.svg index 565641e02..522dfb750 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -34,9 +34,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.9899495" - inkscape:cx="658.37284" - inkscape:cy="201.93139" + inkscape:zoom="0.35" + inkscape:cx="1120.8978" + inkscape:cy="383.26354" inkscape:document-units="px" inkscape:current-layer="layer1-9" showgrid="false" @@ -1323,6 +1323,263 @@ d="m 1469.5507,1220.8203 20.5952,52.7426 20.6425,-52.7426 -2.0832,-5.35 -37.0713,0 -2.0832,5.35 z" style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:7.02416945;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/assets/common/images/menu-code-active.png b/src/main/webapp/assets/common/images/menu-code-active.png new file mode 100644 index 0000000000000000000000000000000000000000..371061c74796476edc8263b1368efabcd30eb160 GIT binary patch literal 290 zcmV+-0p0$IP)>nY?{V(-C-Emz%)&^ZF3ywIL@|hkO_hSq^4FzCj8X1cCJmSur341?*WjIQfoQxpY7Q3NMhmNCXxK$0Xp z&kKT(rYVAfP^PZyE4L&`MNzySeZw5w@3HO~+FKmQ#9fvpq=ynW&7IySiVo<2}D89ziTv_;c&PC2l6VFx>oxaLdtX bB<=YI4p~OB9%aEK00000NkvXXu0mjfvyI&d literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/common/images/menu-pulls-active.png b/src/main/webapp/assets/common/images/menu-pulls-active.png new file mode 100644 index 0000000000000000000000000000000000000000..734cb165e1d7be167da4974e27424e17b074d716 GIT binary patch literal 356 zcmV-q0h|7bP)yhs4pP>jNUMv8iP}A2*Sy{7 z?)RC_dw725{r8NX-+DYA&w*^)KA+FeUmA5*MNu?OTdh`66jfEFsw#pYzVByQR+i-_ z;CbF|w}aw%JT8|@mSvHFP!x4t_XiLJfhdYi(;Nw3N3Y&JNKPp8wm zuHOL2vMdb4X0usQ6tKKruLMDaVF)!~NJape~H|Ucjx!>>K0OSYa(6;U6a)Dw9P!yFU34{QO`~Cg`Ae9iIZXUxhLje9B zd@yUVSfpwCK9a8MvMlpF{}Jia>BMoIBuS=ecAYQI_hd96$hDjR0000|43mIa5&WRhXO7l4gzU;yLsc)48G>-F_|{ZT+_gN^g?c&t{da8)Q2 zR;$%70eo9eklL6Mf{LQhzNzLVz;F{T##nxTdWx5K(kZ5wb+-x>`2)>^1egD&!4uU`wMX+)H23ycIA%CnyPXGV_ M07*qoM6N<$f;R=l)c^nh literal 0 HcmV?d00001 diff --git a/src/main/webapp/assets/common/images/menu-wiki-active.png b/src/main/webapp/assets/common/images/menu-wiki-active.png new file mode 100644 index 0000000000000000000000000000000000000000..ff193b71d87460da14ac9f423216d09dfe3f76c2 GIT binary patch literal 419 zcmV;U0bKrxP)hEcEA1wnu^$P(>#dpI1f z*XtKd6h*~iQ541fe*cW|ecyH6Mx*g1NRsr3S*=z`SS%J#7)4PM!gjk2F>rb$91e#7 zv)ODCf-K8-7|-*NFdB^>Ftu7OA;1UTFh6^E#lW8vLZwo<$4sYFB#g&n2GeXd69QVw z`xSUV0$LG(vfl!v3xxuVB9qBb6qV2C(YYa#PNzwdgbfH+E<(54O{G#S%fbunsMG1d z2BCGDrd3t7EDH)+trpMoU_t@0+wEX{Hx~x_KAlcCK^QlTf%x~^`Ux-=K4S$8WH0~# N002ovPDHLkV1iuWvK0UT literal 0 HcmV?d00001 From debc798aecac3461151fb6c5eb46f05647e165bf Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 10 May 2014 14:44:19 +0900 Subject: [PATCH 17/50] Side-menu is completed! --- src/main/twirl/menu.scala.html | 145 ++++++------------ .../webapp/assets/common/css/gitbucket.css | 57 +++++++ 2 files changed, 106 insertions(+), 96 deletions(-) diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html index 2fbb3ce54..2d54e0153 100644 --- a/src/main/twirl/menu.scala.html +++ b/src/main/twirl/menu.scala.html @@ -5,6 +5,21 @@ @import context._ @import view.helpers._ +@sidemenu(path: String, name: String, label: String) = { +
            • +
              + + @if(active == name){ + + } else { + + + } + @if(expand){ @label} + +
              • +} +
              @if(repository.commitCount > 0){
              @@ -28,87 +43,16 @@
              - -
                • -
              • -
                - @if(expand){ Code} -
                • -
              • -
                - @if(expand){ Issues} - @if(expand && repository.issueCount > 0){ -
                @repository.issueCount
                - } -
                • -
              • -
                - @if(expand){ Pull Requests} - @if(expand && repository.pullCount > 0){ -
                @repository.pullCount
                - } -
                • -
              • -
                - @if(expand){ Wiki} -
                • + @sidemenu("" , "code" , "Code") + @sidemenu("/issues", "issues", "Issues") + @sidemenu("/pulls" , "pulls" , "Pull Requests") + @sidemenu("/wiki" , "wiki" , "Wiki") @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ -
              • -
                - @if(expand){ Settings} -
                • + @sidemenu("/settings", "settings", "Settings") }
              @@ -132,18 +76,6 @@ $(function(){ }
              - @if(expand){ @repository.repository.description.map { description =>

              @description

              @@ -173,17 +105,38 @@ $(function(){ @body
              -@if(settings.ssh && loginAccount.isDefined){ -} diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 4b052749e..cf691c006 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -282,6 +282,52 @@ span.highlight { width: 100%; } +/****************************************************************************/ +/* Side Menu */ +/****************************************************************************/ +ul.sidemenu { + margin-left: 0px; +} + +ul.sidemenu a:hover{ + text-decoration: none; +} + +ul.sidemenu li.active { + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; + border-right: 2px solid #bb4444; + border-left: 1px solid white; +} + +ul.sidemenu div.gradient { + width: 5px; + height: 35px; + background: linear-gradient(to right, #eee, #fff); + margin-right: 4px; + border-left: 1px solid #eee; +} + +ul.sidemenu div.margin { + width: 5px; + height: 35px; + margin-right: 4px; + border-left: 1px solid white; +} + +ul.sidemenu li { + line-height: 35px; + height: 35px; + border-left: 1px solid #eee; + margin-left:0px; + border-right: 2px solid white; + list-style-type: none; +} + +ul.sidemenu span.badge { + padding-right: 4px; +} + /****************************************************************************/ /* Create Repository */ /****************************************************************************/ @@ -393,6 +439,17 @@ div.activity-content { /****************************************************************************/ /* Repository Viewer */ /****************************************************************************/ +a.header-link { + color: #888; +} +a.header-link strong { + color: black; +} +a.header-link:hover { + color: #0088cc; + text-decoration: none; +} + table.table-file-list { margin-bottom: 0px; } From aaa582ff1a124b9471d2646571c72f7778fa62d2 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 10 May 2014 20:35:49 +0900 Subject: [PATCH 18/50] Fix header style in wiki pages --- src/main/twirl/wiki/compare.scala.html | 2 +- src/main/twirl/wiki/edit.scala.html | 2 +- src/main/twirl/wiki/history.scala.html | 2 +- src/main/twirl/wiki/page.scala.html | 2 +- src/main/twirl/wiki/pages.scala.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html index 97116cc23..c31ae8593 100644 --- a/src/main/twirl/wiki/compare.scala.html +++ b/src/main/twirl/wiki/compare.scala.html @@ -12,7 +12,7 @@ @helper.html.information(info) @html.menu("wiki", repository){ @tab("history", repository) -
                +

                • Compare Revisions

                  • diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html index 802c43b5e..d70c7f783 100644 --- a/src/main/twirl/wiki/edit.scala.html +++ b/src/main/twirl/wiki/edit.scala.html @@ -6,7 +6,7 @@ @html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ @tab("", repository) -
                    +

                    • Editing @if(pageName.isEmpty){New Page} else {@pageName}

                      • diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html index fecb9dec9..3d8479223 100644 --- a/src/main/twirl/wiki/history.scala.html +++ b/src/main/twirl/wiki/history.scala.html @@ -6,7 +6,7 @@ @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ @tab(if(pageName.isEmpty) "history" else "", repository) -
                        +

                        • @if(pageName.isEmpty){ diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html index 5dcca1e60..9505b9ecc 100644 --- a/src/main/twirl/wiki/page.scala.html +++ b/src/main/twirl/wiki/page.scala.html @@ -7,7 +7,7 @@ @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ @tab((if(pageName == "Home") "home" else ""), repository) -
                            +

                            • @pageName

                              • diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html index cd576de8c..27dff21e0 100644 --- a/src/main/twirl/wiki/pages.scala.html +++ b/src/main/twirl/wiki/pages.scala.html @@ -6,7 +6,7 @@ @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ @tab("pages", repository) -
                                +

                                • Pages

                                  • From c3d25b7a7100e1ffb69013d143066f6773865957 Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Sat, 10 May 2014 08:06:57 -0400 Subject: [PATCH 19/50] Update the features list in README.md The version 1.12 announces the addition of the SSH protocol for repository access, but the feature list still states "Public / Private Git repository (http access only)". --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 68c305ac5..df4d61a3f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Features -------- The current version of GitBucket provides a basic features below: -- Public / Private Git repository (http access only) +- Public / Private Git repository (http and ssh access) - Repository viewer and online file editing - Repository search (Code and Issues) - Wiki From e93769cc81be7f34a940a0d57a066fd93af2c1b7 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 10 May 2014 22:51:14 +0900 Subject: [PATCH 20/50] Fix header and side-menu styles --- etc/icons.svg | 138 ++++++++++++++++-- src/main/twirl/menu.scala.html | 47 ++++-- .../webapp/assets/common/css/gitbucket.css | 28 +++- 3 files changed, 190 insertions(+), 23 deletions(-) diff --git a/etc/icons.svg b/etc/icons.svg index 522dfb750..a1849e3ea 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -34,9 +34,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.35" - inkscape:cx="1120.8978" - inkscape:cy="383.26354" + inkscape:zoom="0.7" + inkscape:cx="482.58197" + inkscape:cy="-83.92636" inkscape:document-units="px" inkscape:current-layer="layer1-9" showgrid="false" @@ -1326,7 +1326,7 @@ + + + + + + + + + + + + + + + diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html index 2d54e0153..2db9d0fdd 100644 --- a/src/main/twirl/menu.scala.html +++ b/src/main/twirl/menu.scala.html @@ -5,7 +5,7 @@ @import context._ @import view.helpers._ -@sidemenu(path: String, name: String, label: String) = { +@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
                                • @@ -13,9 +13,12 @@ } else { - + } @if(expand){ @label} + @if(expand && count > 0){ +
                                  @count
                                  + }
                                  • } @@ -48,8 +51,8 @@
                                    • @sidemenu("" , "code" , "Code") - @sidemenu("/issues", "issues", "Issues") - @sidemenu("/pulls" , "pulls" , "Pull Requests") + @sidemenu("/issues", "issues", "Issues", repository.issueCount) + @sidemenu("/pulls" , "pulls" , "Pull Requests", repository.pullCount) @sidemenu("/wiki" , "wiki" , "Wiki") @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){ @sidemenu("/settings", "settings", "Settings") @@ -78,24 +81,30 @@
                                    @if(expand){ @repository.repository.description.map { description => -

                                    @description

                                    +

                                    @description

                                    } -
                                    +

        @@ -107,6 +116,26 @@ +} \ No newline at end of file diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html index 27dff21e0..df25b51da 100644 --- a/src/main/twirl/wiki/pages.scala.html +++ b/src/main/twirl/wiki/pages.scala.html @@ -18,7 +18,7 @@ -
          +
            @pages.map { page =>
          • @page
            • } diff --git a/src/main/twirl/wiki/tab.scala.html b/src/main/twirl/wiki/tab.scala.html index 96d930ee2..8032d4154 100644 --- a/src/main/twirl/wiki/tab.scala.html +++ b/src/main/twirl/wiki/tab.scala.html @@ -3,6 +3,7 @@ @import context._ @import service.WikiService._ @import view.helpers._ +@*
              Home Pages @@ -34,3 +35,4 @@ $(function(){ }); } +*@ \ No newline at end of file From ff2e55e82c23304661aa9da75fa9246a331411a1 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 02:01:46 +0900 Subject: [PATCH 24/50] Fix h1-h6 styles --- src/main/twirl/wiki/page.scala.html | 8 +-- .../webapp/assets/common/css/gitbucket.css | 57 ++++++++++++++++++- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html index f90dead12..e72dcf713 100644 --- a/src/main/twirl/wiki/page.scala.html +++ b/src/main/twirl/wiki/page.scala.html @@ -12,6 +12,9 @@

              • @pageName

                +
                + @page.committer edited this page at @datetime(page.time) +
              • @@ -50,13 +53,10 @@
                } -
                +
                @markdown(page.content, repository, true, false)
                -
                - Last edited by @page.committer at @datetime(page.time) -
                } } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 99888f47b..b7526e649 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -10,6 +10,37 @@ li p { margin: 0px; } +h1 { + font-size: 30px; + line-height: 32px; +} + +h2 { + font-size: 28px; + line-height: 30px; +} + +h3 { + font-size: 26px; + line-height: 28px; +} + +h4 { + font-size: 24px; +} + +h5 { + font-size: 22px; +} + +h6 { + font-size: 18px; +} + +h7 { + font-size: 14px; +} + /* ======================================================================== */ /* Global Header */ /* ======================================================================== */ @@ -554,7 +585,7 @@ pre.blob { } #readme .box-content { - padding: 30px; + padding: 20px; } li.highlight { @@ -977,6 +1008,26 @@ a.markdown-anchor-link { display: none; } -h1 a.markdown-anchor-link, h2 a.markdown-anchor-link, h3 a.markdown-anchor-link { - top: 10px; +h1 a.markdown-anchor-link { + top: 8px; +} + +h2 a.markdown-anchor-link { + top: 6px; +} + +h3 a.markdown-anchor-link { + top: 6px; +} + +h4 a.markdown-anchor-link { + top: 2px; +} + +h5 a.markdown-anchor-link { + top: 2px; +} + +h6 a.markdown-anchor-link { + top: 2px; } From 93fa8484c5b27e870ab53ee310ec110cde3ec480 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 02:23:51 +0900 Subject: [PATCH 25/50] Fix header button size --- src/main/twirl/helper/dropdown.scala.html | 2 +- src/main/twirl/issues/listparts.scala.html | 4 +- src/main/twirl/issues/tab.scala.html | 2 +- src/main/twirl/menu.scala.html | 2 +- src/main/twirl/pulls/listparts.scala.html | 4 +- src/main/twirl/wiki/compare.scala.html | 7 ++-- src/main/twirl/wiki/edit.scala.html | 7 ++-- src/main/twirl/wiki/history.scala.html | 7 ++-- src/main/twirl/wiki/page.scala.html | 7 ++-- src/main/twirl/wiki/pages.scala.html | 3 +- src/main/twirl/wiki/tab.scala.html | 38 ------------------- .../webapp/assets/common/css/gitbucket.css | 4 ++ 12 files changed, 24 insertions(+), 63 deletions(-) delete mode 100644 src/main/twirl/wiki/tab.scala.html diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html index 55bb6d6d7..70d1dce26 100644 --- a/src/main/twirl/helper/dropdown.scala.html +++ b/src/main/twirl/helper/dropdown.scala.html @@ -1,6 +1,6 @@ @(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "", right: Boolean = false)(body: Html)
                -
                - @openCount Open - @closedCount Closed + @openCount Open + @closedCount Closed
                @helper.html.dropdown( value = (condition.sort, condition.direction) match { diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html index 3db5af274..dcb1872e4 100644 --- a/src/main/twirl/issues/tab.scala.html +++ b/src/main/twirl/issues/tab.scala.html @@ -7,7 +7,7 @@ @if(loginAccount.isDefined){
              • - New Issue + New Issue
                • } diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html index 2db9d0fdd..8bf895464 100644 --- a/src/main/twirl/menu.scala.html +++ b/src/main/twirl/menu.scala.html @@ -27,7 +27,7 @@ @if(repository.commitCount > 0){
                - Fork + Fork @repository.forkedCount
                diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html index 313ef021e..f6e3fb84d 100644 --- a/src/main/twirl/pulls/listparts.scala.html +++ b/src/main/twirl/pulls/listparts.scala.html @@ -17,8 +17,8 @@ } }
                - @openCount Open - @closedCount Closed + @openCount Open + @closedCount Closed
                @helper.html.dropdown( value = (condition.sort, condition.direction) match { diff --git a/src/main/twirl/wiki/compare.scala.html b/src/main/twirl/wiki/compare.scala.html index c31ae8593..190a824c7 100644 --- a/src/main/twirl/wiki/compare.scala.html +++ b/src/main/twirl/wiki/compare.scala.html @@ -11,7 +11,6 @@ @html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){ @helper.html.information(info) @html.menu("wiki", repository){ - @tab("history", repository)

                • Compare Revisions

                  @@ -19,10 +18,10 @@
                • @if(pageName.isDefined){ - View Page - Back to Page History + View Page + Back to Page History } else { - Back to Wiki History + Back to Wiki History }
                  • diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html index 353103bf6..b7ca333a1 100644 --- a/src/main/twirl/wiki/edit.scala.html +++ b/src/main/twirl/wiki/edit.scala.html @@ -5,7 +5,6 @@ @import view.helpers._ @html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ - @tab("", repository)

                  • Editing @if(pageName.isEmpty){New Page} else {@pageName}

                    @@ -13,9 +12,9 @@
                  • @if(page.isDefined){ - View Page - Delete Page - Page History + View Page + Delete Page + Page History }
                    • diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html index 3d8479223..f5b1b0d66 100644 --- a/src/main/twirl/wiki/history.scala.html +++ b/src/main/twirl/wiki/history.scala.html @@ -5,7 +5,6 @@ @import view.helpers._ @html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ - @tab(if(pageName.isEmpty) "history" else "", repository)

                    • @@ -20,12 +19,12 @@
                      @if(pageName.isEmpty){ @if(loginAccount.isDefined){ - New Page + New Page } } else { - View Page + View Page @if(loginAccount.isDefined){ - Edit Page + Edit Page } }
                      diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html index e72dcf713..7ca20db25 100644 --- a/src/main/twirl/wiki/page.scala.html +++ b/src/main/twirl/wiki/page.scala.html @@ -8,7 +8,6 @@ @import view.helpers._ @html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ - @tab((if(pageName == "Home") "home" else ""), repository) diff --git a/src/main/twirl/wiki/pages.scala.html b/src/main/twirl/wiki/pages.scala.html index df25b51da..ca1760d6c 100644 --- a/src/main/twirl/wiki/pages.scala.html +++ b/src/main/twirl/wiki/pages.scala.html @@ -5,7 +5,6 @@ @import view.helpers._ @html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("wiki", repository){ - @tab("pages", repository)

                      • Pages

                        @@ -13,7 +12,7 @@
                      • @if(hasWritePermission){ - New Page + New Page }
                        • diff --git a/src/main/twirl/wiki/tab.scala.html b/src/main/twirl/wiki/tab.scala.html deleted file mode 100644 index 8032d4154..000000000 --- a/src/main/twirl/wiki/tab.scala.html +++ /dev/null @@ -1,38 +0,0 @@ -@(active: String, - repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) -@import context._ -@import service.WikiService._ -@import view.helpers._ -@* -
                          - Home - Pages - Wiki History -
                        • - @helper.html.copy("repository-url-copy", httpUrl(repository)){ - @if(settings.ssh && loginAccount.isDefined){ -
                          - -
                          - } else { - HTTP - } - - } -
                          • -
                        -@if(settings.ssh && loginAccount.isDefined){ - -} -*@ \ No newline at end of file diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index b7526e649..f001fe3e9 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -92,6 +92,10 @@ div.input-prepend span.count { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; + height: 16px; + font-size: 12px; + padding-top: 2px; + padding-bottom: 6px; } /* ======================================================================== */ From 6ecabe458833dc0f356e52c829fdc83237bdb225 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 02:42:03 +0900 Subject: [PATCH 26/50] Fix header style --- src/main/webapp/assets/common/css/gitbucket.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index f001fe3e9..c4a66bf47 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -103,18 +103,15 @@ div.input-prepend span.count { /* ======================================================================== */ div.head { margin-bottom: 10px; - font-weight: bold; + font-size: 18px; } div.head div.forked { font-size: 60%; + margin-left: 36px; color: #999999; } -div.head div.forked a { - font-weight: normal; -} - div.container { width: 920px; } From 4f4bc0321b6434a0f56538c16d972306b7604d3b Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 02:55:43 +0900 Subject: [PATCH 27/50] Fix file list style in repository viewer --- src/main/twirl/repo/files.scala.html | 119 +++++++++--------- .../webapp/assets/common/css/gitbucket.css | 1 + 2 files changed, 59 insertions(+), 61 deletions(-) diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index d304a23b6..290c27545 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -27,71 +27,68 @@ } -
                        -

        - @repository.commitCount commits + + + @repository.commitCount commits - @repository.branchList.length branches + + + @repository.branchList.length branches - @repository.tags.length releases + + + @repository.tags.length releases
        - - - - - + + + + + } +
        - @link(latestCommit.summary, repository) - @if(latestCommit.description.isDefined){ - ... - - } -
        -
        - @avatar(latestCommit, 20) - @user(latestCommit.committer, latestCommit.mailAddress, "username strong") - @datetime(latestCommit.time) -
        - latest commit @latestCommit.id.substring(0, 10) -
        + + + + + + - - @if(pathList.size > 0){ - - - - - - - } - @files.map { file => - - + + @if(pathList.size > 0){ + + + + + + + } + @files.map { file => + + - - - - + } else { + } -
        + @link(latestCommit.summary, repository) + @if(latestCommit.description.isDefined){ + ... + + } +
        +
        + @avatar(latestCommit, 20) + @user(latestCommit.committer, latestCommit.mailAddress, "username strong") + @datetime(latestCommit.time) +
        + latest commit @latestCommit.id.substring(0, 10)
        -
        ..
        - @if(file.isDirectory){ - @if(file.linkUrl.isDefined){ - - } else { - - } + +
        ..
        + @if(file.isDirectory){ + @if(file.linkUrl.isDefined){ + } else { - + } - - @if(file.isDirectory){ - @if(file.linkUrl.isDefined){ - @file.name - } else { - @file.name - } - } else { - @file.name - } - - @link(file.message, repository) - [@user(file.committer, file.mailAddress)] - @datetime(file.time)
        -
        - +         		+ @if(file.isDirectory){ + @if(file.linkUrl.isDefined){ + @file.name + } else { + @file.name + } + } else { + @file.name + } + + @link(file.message, repository) + [@user(file.committer, file.mailAddress)] + @datetime(file.time)
        @readme.map { case(filePath, content) =>
        @filePath.reverse.head
        diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index c4a66bf47..164dab132 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -504,6 +504,7 @@ a.header-link:hover { table.table-file-list { margin-bottom: 0px; + border: 1px solid #ddd; } table.table-file-list th, table.table-file-list td { From 4252c364a4d4b123685b3652871b182ef6831ac1 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 02:57:49 +0900 Subject: [PATCH 28/50] Fix commit id style in file list --- src/main/twirl/repo/files.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index 290c27545..e1800ae18 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -43,7 +43,7 @@ @avatar(latestCommit, 20) @user(latestCommit.committer, latestCommit.mailAddress, "username strong") @datetime(latestCommit.time) -
        +
        latest commit @latestCommit.id.substring(0, 10)
        From 6b86406e94bb819c04e613d8d8a21baf8fe4d87c Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 02:58:29 +0900 Subject: [PATCH 29/50] Add hover icons for header links --- .../common/images/header-branches-hover.png | Bin 0 -> 288 bytes .../assets/common/images/header-commits-hover.png | Bin 0 -> 382 bytes .../assets/common/images/header-tags-hover.png | Bin 0 -> 342 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/webapp/assets/common/images/header-branches-hover.png create mode 100644 src/main/webapp/assets/common/images/header-commits-hover.png create mode 100644 src/main/webapp/assets/common/images/header-tags-hover.png diff --git a/src/main/webapp/assets/common/images/header-branches-hover.png b/src/main/webapp/assets/common/images/header-branches-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..7e2668a02ed83b735b17470b479310f40949ced3 GIT binary patch literal 288 zcmV+*0pI?KP)j z+X{kE5bXay>QtiEgIzFv2rOSBq8>8AONM8fO^Gh%X&GUKox{xR4)CbM0jrgOO@9se z-ENpnP}c%B*Q<$8RhUlOe>O#7BCz5ZzAxBrKPR#bdHzLUSyrV~RhIg7ItUO&Sg!?U zLYiVWYkPX5as#0(WsZ?B2G^BH%#y+owvG85mrJiC26a5jT9m?Yh$Q)KI*K%9aIV2< zgx#(y)+a$J&AIVd>~1!1fp!yYTT_hIrp4{|SS-XMb(?RAc`=G6wdE4$^B)AqY4_rJ mvM=*3olfGC&wt<2N8JG~y5Hps(M*;A0000j z*^Yuh5S;)2DDeP|B0i{y38GQsh5FzT53btkKyX6V%~m=g%yjisSGR(O*9(gU90!&K z(?q|IAi(3Hr$FVOEW>h%dL8XHd>`Ab#C(okPYy|ALP3ZkTrTiDxmd417bT8Id2Ku{ zu2h;zs$pQa!#7YBIaFIn>UM=N93qata!x0y`+P#Z-}1wDb@1?huZp7wvl$dy+-$1# zd_OUah-!7v6>3rB(G4B0o0w))t3|dQm%$S3zR`f9>vThV z6KXQSX!I{hbcu4*;UEuH{P~r@A+imb1EYisVXP2T#b-Sw9b5Fmo z1_OmZhl7=tASmv4R!W{vsVXi@&N2(KjUnto_jvGZrpIG_Iyv3t!fgzp6Xc#w^?q;j zoY9Zg@`E7^03b>9^~%=DaH!A~7REF)4!{6uYLPpR^>S&Tp3hNJQ0kkZPDdd(R;YtX zYV~R*+if#L>$O1}Md28)X7}~a1icYn&lH73k>vTSV_)ZdX4tda8LBrtbGu0#znHRg zDYDElFdg2IPqx{FOjXHfB*&vu!}rNV!ybCKEMSu4LtUQ_1?Te4q-m&b06c>W_N{IP oY6j;BX`pTe5Q~L@CzvvbKY>rvK+1fYW&i*H07*qoM6N<$g1oPoumAu6 literal 0 HcmV?d00001 From 728b00e4c3320e4cf232021b359f3760efd6305e Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 13:08:32 +0900 Subject: [PATCH 30/50] Fix readme styles --- src/main/twirl/repo/files.scala.html | 8 ++++---- src/main/webapp/assets/common/css/gitbucket.css | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html index e1800ae18..84b28e985 100644 --- a/src/main/twirl/repo/files.scala.html +++ b/src/main/twirl/repo/files.scala.html @@ -90,10 +90,10 @@ }
        @readme.map { case(filePath, content) => -
        -
        @filePath.reverse.head
        -
        @renderMarkup(filePath, content, branch, repository, false, false)
        -
        +
        +
        @filePath.reverse.head
        +
        @renderMarkup(filePath, content, branch, repository, false, false)
        +
        } } } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 164dab132..211701b79 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -586,6 +586,10 @@ pre.blob { padding-left: 20px; } +#readme { + margin-top: 20px; +} + #readme .box-content { padding: 20px; } From 70772f0d74df18939aa22d96d357c93b5a5400a7 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 11 May 2014 13:13:16 +0900 Subject: [PATCH 31/50] (refs #364)Keep links which start with '#' --- src/main/scala/view/Markdown.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/view/Markdown.scala b/src/main/scala/view/Markdown.scala index 242b6e5dd..a66f9f709 100644 --- a/src/main/scala/view/Markdown.scala +++ b/src/main/scala/view/Markdown.scala @@ -102,7 +102,7 @@ class GitBucketHtmlSerializer( } private def fixUrl(url: String): String = { - if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://")){ + if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("#")){ url } else { repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url From 9bb66a4297b2d5ef6ca2ac5101559349649be3e6 Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 12 May 2014 23:39:32 +0900 Subject: [PATCH 32/50] Fix broken layout in pull request detail page --- src/main/twirl/pulls/pullreq.scala.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html index 0a0774f57..e7b0975ab 100644 --- a/src/main/twirl/pulls/pullreq.scala.html +++ b/src/main/twirl/pulls/pullreq.scala.html @@ -32,12 +32,12 @@ into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch }
        -
        No repositories
        -
        + @if(renderableSuffixes.find(suffix => fileName.map(_.toLowerCase.endsWith(suffix)).getOrElse(false))) { +
        + + +
        + }
        +
        @@ -103,5 +110,26 @@ $(function(){ $('#commit').click(function(){ $('#content').val(editor.getValue()); }); + + $('#btn-code').click(function(){ + $('#editor').show(); + $('#preview').hide(); + }); + + $('#btn-preview').click(function(){ + $('#editor').hide(); + $('#preview').show() + + // update preview + $('#preview').html(' Previewing...'); + $.post('@url(repository)/_preview', { + content : editor.getValue(), + enableWikiLink : false, + enableRefsLink : false + }, function(data){ + $('#preview').html(data); + prettyPrint(); + }); + }); }); From bb66e2201fd791e4fcf23693dbd0af786f119b02 Mon Sep 17 00:00:00 2001 From: Tomofumi Tanaka Date: Sun, 18 May 2014 21:37:49 +0900 Subject: [PATCH 40/50] Fix width styles * issue updation title and content * issue new comment * pull request new comment --- src/main/twirl/issues/commentform.scala.html | 2 +- src/main/twirl/issues/editcomment.scala.html | 2 +- src/main/twirl/issues/editissue.scala.html | 4 ++-- src/main/twirl/pulls/discussion.scala.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/twirl/issues/commentform.scala.html b/src/main/twirl/issues/commentform.scala.html index edf656eaf..26d2f63a2 100644 --- a/src/main/twirl/issues/commentform.scala.html +++ b/src/main/twirl/issues/commentform.scala.html @@ -8,7 +8,7 @@
        @avatar(loginAccount.get.userName, 48)
        - @helper.html.preview(repository, "", false, true, "width: 680px; height: 100px; max-height: 150px;", elastic = true) + @helper.html.preview(repository, "", false, true, "width: 635px; height: 100px; max-height: 150px;", elastic = true)
        diff --git a/src/main/twirl/issues/editcomment.scala.html b/src/main/twirl/issues/editcomment.scala.html index e631872a9..0aa6cdd62 100644 --- a/src/main/twirl/issues/editcomment.scala.html +++ b/src/main/twirl/issues/editcomment.scala.html @@ -2,7 +2,7 @@ @import context._ @helper.html.attached(owner, repository){ - + }
        diff --git a/src/main/twirl/issues/editissue.scala.html b/src/main/twirl/issues/editissue.scala.html index b97d1f5b6..760282d74 100644 --- a/src/main/twirl/issues/editissue.scala.html +++ b/src/main/twirl/issues/editissue.scala.html @@ -1,9 +1,9 @@ @(title: String, content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: app.Context) @import context._ - + @helper.html.attached(owner, repository){ - + }
        diff --git a/src/main/twirl/pulls/discussion.scala.html b/src/main/twirl/pulls/discussion.scala.html index 2927caa83..593b89455 100644 --- a/src/main/twirl/pulls/discussion.scala.html +++ b/src/main/twirl/pulls/discussion.scala.html @@ -27,7 +27,7 @@ Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
        - +
        From 2a4b0f5ddb51a9175987f653f7322e99af15d3da Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 18 May 2014 22:58:16 +0900 Subject: [PATCH 41/50] (refs #372)Use shift key instead if ctrl key to select region --- src/main/twirl/repo/blob.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index a90f5bc0e..81518aa9c 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -100,7 +100,7 @@ $(window).load(function(){ $('div.source-line-num').click(function(e){ var line = $(e.target).data('line'); var hash = location.hash; - if(e.ctrlKey == true && hash.match(/#L\d+(-L\d+)?/)){ + if(e.shiftKey == true && hash.match(/#L\d+(-L\d+)?/)){ var lines = hash.split('-'); location.hash = lines[0] + '-L' + line; } else { From f440421ed1994720392fd0039f1daeffc3b59057 Mon Sep 17 00:00:00 2001 From: Tomofumi Tanaka Date: Sun, 18 May 2014 22:59:03 +0900 Subject: [PATCH 42/50] Repository url protocol label should be change Like repository url. --- src/main/twirl/menu.scala.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/twirl/menu.scala.html b/src/main/twirl/menu.scala.html index 8bf895464..49860cf7b 100644 --- a/src/main/twirl/menu.scala.html +++ b/src/main/twirl/menu.scala.html @@ -61,7 +61,7 @@
      @if(expand){
      - HTTP clone URL + HTTP clone URL
      @helper.html.copy("repository-url-copy", repository.httpUrl){ @@ -158,11 +158,13 @@ $(function(){ @if(settings.ssh && loginAccount.isDefined){ $('#repository-url-http').click(function(){ + $('#repository-url-proto').text('HTTP'); $('#repository-url').val('@repository.httpUrl'); $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val()); }); $('#repository-url-ssh').click(function(){ + $('#repository-url-proto').text('SSH'); $('#repository-url').val('@repository.sshUrl(settings.sshPort.getOrElse(service.SystemSettingsService.DefaultSshPort), loginAccount.get.userName)'); $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val()); }); From 6d54361a6d8d4f1c2fd4f82a6d41053d1d98c866 Mon Sep 17 00:00:00 2001 From: Tomofumi Tanaka Date: Sun, 18 May 2014 23:28:28 +0900 Subject: [PATCH 43/50] Fix style broken in Firefox --- src/main/twirl/wiki/history.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html index f5b1b0d66..198f0b1d0 100644 --- a/src/main/twirl/wiki/history.scala.html +++ b/src/main/twirl/wiki/history.scala.html @@ -30,7 +30,7 @@
    - +
    @commits.map { commit => From 03b5f7feb8fabf29824b13c202d4d24856d07cd1 Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 18 May 2014 23:36:13 +0900 Subject: [PATCH 44/50] Fix title in file editing. --- src/main/twirl/repo/editor.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index 4112c6d26..4b6e0b560 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -5,7 +5,7 @@ content: util.JGitUtil.ContentInfo)(implicit context: app.Context) @import context._ @import view.helpers._ -@html.main(if(fileName.isEmpty) "New File" else s"Editing ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) { +@html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) { @html.menu("code", repository){
    From 146be677ba6896fc5bd6c4cc92fbba28ba68ea3d Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 19 May 2014 00:03:24 +0900 Subject: [PATCH 45/50] Hide "Edit" button if target is not head of the branch. --- src/main/twirl/repo/blob.scala.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html index 81518aa9c..51b4e651b 100644 --- a/src/main/twirl/repo/blob.scala.html +++ b/src/main/twirl/repo/blob.scala.html @@ -38,7 +38,7 @@ @link(latestCommit.summary, repository)
    - @if(hasWritePermission && content.viewType == "text"){ + @if(hasWritePermission && content.viewType == "text" && repository.branchList.contains(branch)){ Edit } Raw @@ -66,8 +66,9 @@ } @if(content.viewType == "large" || content.viewType == "binary"){ -
    +
    View Raw
    +
    (Sorry about that, but we can't show files that are this big right now)
    } From a863951d9728c1d624b5ee5dc8b1bdfd62d94b57 Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 19 May 2014 00:29:29 +0900 Subject: [PATCH 46/50] Show diff for files other than markdown by "Preview" button --- src/main/twirl/repo/editor.scala.html | 46 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/src/main/twirl/repo/editor.scala.html b/src/main/twirl/repo/editor.scala.html index 4b6e0b560..d89656928 100644 --- a/src/main/twirl/repo/editor.scala.html +++ b/src/main/twirl/repo/editor.scala.html @@ -30,18 +30,16 @@
    - @if(renderableSuffixes.find(suffix => fileName.map(_.toLowerCase.endsWith(suffix)).getOrElse(false))) { -
    - - -
    - } +
    + + +
    - +
    @@ -71,6 +69,9 @@ } } + + + From 29812f4a8224c07eb2534e732b219fa073a6503a Mon Sep 17 00:00:00 2001 From: Tomofumi Tanaka Date: Tue, 20 May 2014 21:26:51 +0900 Subject: [PATCH 47/50] (refs #375)Show merge commit diffs correctly --- src/main/scala/util/JGitUtil.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala index 9f48c39c7..282469e41 100644 --- a/src/main/scala/util/JGitUtil.scala +++ b/src/main/scala/util/JGitUtil.scala @@ -372,7 +372,12 @@ object JGitUtil { if(commits.length >= 2){ // not initial commit - val oldCommit = commits(1) + val oldCommit = if(revCommit.getParentCount >= 2) { + // merge commit + revCommit.getParents.head + } else { + commits(1) + } (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName)) } else { From a846c77c7ef90d6b98419ed36f2152917391e451 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 25 May 2014 18:14:53 +0900 Subject: [PATCH 48/50] (refs #346)Add group members as collaborator when transfer repository to the group. --- .../scala/service/RepositoryService.scala | 98 ++++++++++--------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala index 774017e09..49fd10208 100644 --- a/src/main/scala/service/RepositoryService.scala +++ b/src/main/scala/service/RepositoryService.scala @@ -40,60 +40,66 @@ trait RepositoryService { self: AccountService => } def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String): Unit = { - (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository => - Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName) + getAccountByUserName(newUserName).foreach { account => + (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository => + Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName) - val webHooks = Query(WebHooks ).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val milestones = Query(Milestones ).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val issueId = Query(IssueId ).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val issues = Query(Issues ).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val pullRequests = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val labels = Query(Labels ).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val issueLabels = Query(IssueLabels ).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list - val activities = Query(Activities ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val webHooks = Query(WebHooks ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val milestones = Query(Milestones ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val issueId = Query(IssueId ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val issues = Query(Issues ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val pullRequests = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val labels = Query(Labels ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val issueLabels = Query(IssueLabels ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val activities = Query(Activities ).filter(_.byRepository(oldUserName, oldRepositoryName)).list + val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list - Repositories.filter { t => - (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind) - }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName) + Repositories.filter { t => + (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind) + }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName) - Repositories.filter { t => - (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind) - }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName) + Repositories.filter { t => + (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind) + }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName) - PullRequests.filter { t => - t.requestRepositoryName is oldRepositoryName.bind - }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName) + PullRequests.filter { t => + t.requestRepositoryName is oldRepositoryName.bind + }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName) - deleteRepository(oldUserName, oldRepositoryName) + deleteRepository(oldUserName, oldRepositoryName) - WebHooks .insertAll(webHooks .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - Milestones .insertAll(milestones .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - IssueId .insertAll(issueId .map(_.copy(_1 = newUserName, _2 = newRepositoryName)) :_*) - Issues .insertAll(issues .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - PullRequests .insertAll(pullRequests .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - Labels .insertAll(labels .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - IssueLabels .insertAll(issueLabels .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - Collaborators .insertAll(collaborators .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) - Activities .insertAll(activities .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + WebHooks .insertAll(webHooks .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + Milestones .insertAll(milestones .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + IssueId .insertAll(issueId .map(_.copy(_1 = newUserName, _2 = newRepositoryName)) :_*) + Issues .insertAll(issues .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + PullRequests .insertAll(pullRequests .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + Labels .insertAll(labels .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + IssueLabels .insertAll(issueLabels .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + Activities .insertAll(activities .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + if(account.isGroupAccount){ + Collaborators.insertAll(getGroupMembers(newUserName).map(m => Collaborator(newUserName, newRepositoryName, m.userName)) :_*) + } else { + Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*) + } - // Update activity messages - val updateActivities = Activities.filter { t => - (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") || - (t.message like s"%:${oldUserName}/${oldRepositoryName}#%") - }.map { t => t.activityId ~ t.message }.list + // Update activity messages + val updateActivities = Activities.filter { t => + (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") || + (t.message like s"%:${oldUserName}/${oldRepositoryName}#%") + }.map { t => t.activityId ~ t.message }.list - updateActivities.foreach { case (activityId, message) => - Activities.filter(_.activityId is activityId.bind).map(_.message).update( - message - .replace(s"[repo:${oldUserName}/${oldRepositoryName}]" ,s"[repo:${newUserName}/${newRepositoryName}]") - .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#") - .replace(s"[tag:${oldUserName}/${oldRepositoryName}#" ,s"[tag:${newUserName}/${newRepositoryName}#") - .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#") - .replace(s"[issue:${oldUserName}/${oldRepositoryName}#" ,s"[issue:${newUserName}/${newRepositoryName}#") - ) + updateActivities.foreach { case (activityId, message) => + Activities.filter(_.activityId is activityId.bind).map(_.message).update( + message + .replace(s"[repo:${oldUserName}/${oldRepositoryName}]" ,s"[repo:${newUserName}/${newRepositoryName}]") + .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#") + .replace(s"[tag:${oldUserName}/${oldRepositoryName}#" ,s"[tag:${newUserName}/${newRepositoryName}#") + .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#") + .replace(s"[issue:${oldUserName}/${oldRepositoryName}#" ,s"[issue:${newUserName}/${newRepositoryName}#") + ) + } } } } From 1e8224536ba12122c075c62776e4bd953674d94c Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Thu, 29 May 2014 01:55:10 +0900 Subject: [PATCH 49/50] (refs #383)Disable "New Issue" button in the new issue creation page. --- src/main/twirl/issues/create.scala.html | 2 +- src/main/twirl/issues/issue.scala.html | 2 +- src/main/twirl/issues/list.scala.html | 2 +- src/main/twirl/issues/milestones/edit.scala.html | 2 +- src/main/twirl/issues/milestones/list.scala.html | 2 +- src/main/twirl/issues/tab.scala.html | 8 ++++++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html index 009c58de0..e32561171 100644 --- a/src/main/twirl/issues/create.scala.html +++ b/src/main/twirl/issues/create.scala.html @@ -7,7 +7,7 @@ @import view.helpers._ @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - @tab("", repository) + @tab("", true, repository)
    diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index 9cbd6dac4..a92c5413f 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -10,7 +10,7 @@ @import view.helpers._ @html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - @tab("issues", repository) + @tab("issues", false, repository)
    • Back to issue list
    • Issue #@issue.issueId
      • diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index c05aa920d..0e41fbae0 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -17,7 +17,7 @@ @import view.helpers._ @html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - @tab("issues", repository) + @tab("issues", false, repository)
        diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html index f99f79842..bfb3eadea 100644 --- a/src/main/twirl/issues/milestones/edit.scala.html +++ b/src/main/twirl/issues/milestones/edit.scala.html @@ -3,7 +3,7 @@ @import view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ @html.menu("milestones", repository){ - @issues.html.tab("milestones", repository) + @issues.html.tab("milestones", false, repository)
        diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html index 1c9d9dbdd..09417014e 100644 --- a/src/main/twirl/issues/milestones/list.scala.html +++ b/src/main/twirl/issues/milestones/list.scala.html @@ -6,7 +6,7 @@ @import view.helpers._ @html.main(s"Milestones - ${repository.owner}/${repository.name}"){ @html.menu("issues", repository){ - @issues.html.tab("milestones", repository) + @issues.html.tab("milestones", false, repository)
          diff --git a/src/main/twirl/issues/tab.scala.html b/src/main/twirl/issues/tab.scala.html index dcb1872e4..b5cfe32f5 100644 --- a/src/main/twirl/issues/tab.scala.html +++ b/src/main/twirl/issues/tab.scala.html @@ -1,4 +1,4 @@ -@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._
            @@ -7,7 +7,11 @@ @if(loginAccount.isDefined){
          • - New Issue + @if(create){ + New Issue + } else { + New Issue + }
            • } From db5395ddbc4aef485415408720dd09cfc215b527 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 31 May 2014 10:38:31 +0900 Subject: [PATCH 50/50] Update version number to 2.0. --- src/main/scala/servlet/AutoUpdateListener.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/servlet/AutoUpdateListener.scala b/src/main/scala/servlet/AutoUpdateListener.scala index 05dc0eeaf..801ff68cb 100644 --- a/src/main/scala/servlet/AutoUpdateListener.scala +++ b/src/main/scala/servlet/AutoUpdateListener.scala @@ -51,7 +51,7 @@ object AutoUpdate { * The history of versions. A head of this sequence is the current BitBucket version. */ val versions = Seq( - new Version(1, 14){ + new Version(2, 0){ override def update(conn: Connection): Unit = { import eu.medsea.mimeutil.{MimeUtil2, MimeType}