diff --git a/etc/icons.svg b/etc/icons.svg index c2efe0e..a1849e3 100644 --- a/etc/icons.svg +++ b/etc/icons.svg @@ -2,6 +2,7 @@ + id="defs4"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index 07208a5..d7399ed 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -36,7 +36,8 @@ get("/:owner/:repository/wiki")(referrersOnly { repository => getWikiPage(repository.owner, repository.name, "Home").map { page => - wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount)) + wiki.html.page("Home", page, getWikiPageList(repository.owner, repository.name), + repository, hasWritePermission(repository.owner, repository.name, context.loginAccount)) } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit") }) @@ -44,7 +45,8 @@ val pageName = StringUtil.urlDecode(params("page")) getWikiPage(repository.owner, repository.name, pageName).map { page => - wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount)) + wiki.html.page(pageName, page, getWikiPageList(repository.owner, repository.name), + repository, hasWritePermission(repository.owner, repository.name, context.loginAccount)) } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit") }) diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html index c02bcbe..d92c708 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 -
-
- + +
} diff --git a/src/main/twirl/helper/copy.scala.html b/src/main/twirl/helper/copy.scala.html index a4f8896..e950791 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, prepend: Boolean = false)(html: Html) -
+@(id: String, value: String)(html: Html) +
@html
diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html index 55bb6d6..70d1dce 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)
-
-} \ No newline at end of file +} diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html index b82884c..009c58d 100644 --- a/src/main/twirl/issues/create.scala.html +++ b/src/main/twirl/issues/create.scala.html @@ -6,85 +6,86 @@ @import context._ @import view.helpers._ @html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("issues", repository) - @tab("", repository) -
-
-
-
@avatar(loginAccount.get.userName, 48)
-
-
- - -
- No one is assigned - @if(hasWritePermission){ - - @helper.html.dropdown() { -
  • Clear assignee
    • - @collaborators.map { collaborator => -
  • @avatar(collaborator, 20) @collaborator
    • - } - } - } -
    - No milestone + @html.menu("issues", repository){ + @tab("", repository) + +
    +
    +
    @avatar(loginAccount.get.userName, 48)
    +
    +
    + + +
    + No one is assigned @if(hasWritePermission){ - + @helper.html.dropdown() { -
  • No milestone
    • - @milestones.filter(_.closedDate.isEmpty).map { milestone => -
  • - - @milestone.title -
    - @milestone.dueDate.map { dueDate => - @if(isPast(dueDate)){ - Due in @date(dueDate) - } else { - Due in @date(dueDate) - } - }.getOrElse { - No due date - } -
    -     -
    • +
  • Clear assignee
    • + @collaborators.map { collaborator => +
  • @avatar(collaborator, 20) @collaborator
    • } } } +
    + No milestone + @if(hasWritePermission){ + + @helper.html.dropdown() { +
  • No milestone
    • + @milestones.filter(_.closedDate.isEmpty).map { milestone => +
  • + + @milestone.title +
    + @milestone.dueDate.map { dueDate => + @if(isPast(dueDate)){ + Due in @date(dueDate) + } else { + Due in @date(dueDate) + } + }.getOrElse { + No due date + } +
    +     +
    • + } + } + } +
    +
    +
    + @helper.html.preview(repository, "", false, true, "width: 565px; height: 200px; max-height: 250px;", elastic = true) +
    +
    +
    + +
    +
    +
    + @if(hasWritePermission){ + Add Labels +
    +
    + +
    -
    - @helper.html.preview(repository, "", false, true, "width: 600px; height: 200px; max-height: 250px;", elastic = true) -
    -
    -
    - + }
    -
    - @if(hasWritePermission){ - Add Labels -
    -
    - - -
    -
    - } -
    -
    - + + } } diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html index 92fc8f8..b99e5b2 100644 --- a/src/main/twirl/pulls/compare.scala.html +++ b/src/main/twirl/pulls/compare.scala.html @@ -12,77 +12,78 @@ @import context._ @import view.helpers._ @html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ - @html.header("pulls", repository) -
    -
    - Edit - @originRepository.owner:@originId ... @forkedRepository.owner:@forkedId + @html.menu("pulls", repository){ +
    +
    + Edit + @originRepository.owner:@originId ... @forkedRepository.owner:@forkedId +
    +
    - -
    - @if(commits.nonEmpty && hasWritePermission){ - -