From 25f642a97b91a3d9a27f66a2c08e86e4a31a050e Mon Sep 17 00:00:00 2001 From: takezoe Date: Sun, 2 Jun 2013 00:38:05 +0900 Subject: [PATCH] Add the manage collaborators page. --- src/main/scala/app/SettingsController.scala | 7 + .../twirl/settings/collaborators.scala.html | 11 ++ src/main/twirl/settings/menu.scala.html | 13 ++ src/main/twirl/settings/options.scala.html | 128 ++++++++---------- 4 files changed, 91 insertions(+), 68 deletions(-) create mode 100644 src/main/twirl/settings/collaborators.scala.html create mode 100644 src/main/twirl/settings/menu.scala.html diff --git a/src/main/scala/app/SettingsController.scala b/src/main/scala/app/SettingsController.scala index 7d34ee3ec..3856a0fc6 100644 --- a/src/main/scala/app/SettingsController.scala +++ b/src/main/scala/app/SettingsController.scala @@ -16,5 +16,12 @@ class SettingsController extends ControllerBase { settings.html.options(JGitUtil.getRepositoryInfo(owner, repository, servletContext)) } + + get("/:owner/:repository/settings/collaborators") { + val owner = params("owner") + val repository = params("repository") + + settings.html.collaborators(JGitUtil.getRepositoryInfo(owner, repository, servletContext)) + } } \ No newline at end of file diff --git a/src/main/twirl/settings/collaborators.scala.html b/src/main/twirl/settings/collaborators.scala.html new file mode 100644 index 000000000..24430870b --- /dev/null +++ b/src/main/twirl/settings/collaborators.scala.html @@ -0,0 +1,11 @@ +@(repository: app.RepositoryInfo)(implicit context: app.Context) +@import context._ +@html.main("Settings"){ + @html.header("settings", repository) + @menu("collaborators"){ +

Manage Collaborators

+ + + + } +} diff --git a/src/main/twirl/settings/menu.scala.html b/src/main/twirl/settings/menu.scala.html new file mode 100644 index 000000000..785dc6350 --- /dev/null +++ b/src/main/twirl/settings/menu.scala.html @@ -0,0 +1,13 @@ +@(active: String)(body: Html)(implicit context: app.Context) +@import context._ +
+
+ +
+
+ @body +
+
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html index 2c1dc026d..bca9b7e80 100644 --- a/src/main/twirl/settings/options.scala.html +++ b/src/main/twirl/settings/options.scala.html @@ -2,74 +2,66 @@ @import context._ @html.main("Settings"){ @html.header("settings", repository) -
-
- -
-
-
-
-
Settings
-
-
- - -
-
-
- - - -
-
+ @menu("options"){ + +
+
Settings
+
+
+ + +
+
+
+ + + +
-
-
Features
-
-
-
- -
-
- Adds lightweight Wiki system to this repository. - This is the simplest way to provide documentation or examples. - Only collaborators can edit Wiki pages. -
-
-
-
-
- -
-
- Adds lightweight issue tracking integrated with this repository. - All users who have signed in and can access this repository can register an issue. -
-
-
+
+
+
Features
+
+
+
+ +
+
+ Adds lightweight Wiki system to this repository. + This is the simplest way to provide documentation or examples. + Only collaborators can edit Wiki pages. +
+
+
+
+
+ +
+
+ Adds lightweight issue tracking integrated with this repository. + All users who have signed in and can access this repository can register an issue. +
+
-
- - -
- -
-
+
+
+ + +
+ + } }