From c0f5cb164126098eab32b65f089842612175958f Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 6 Mar 2014 11:26:58 +0900 Subject: [PATCH] Move group.scala.html to account package --- src/main/scala/app/AccountController.scala | 4 ++-- src/main/twirl/{ => account}/group.scala.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/main/twirl/{ => account}/group.scala.html (98%) diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala index 7ee24aa30..4cd9785c1 100644 --- a/src/main/scala/app/AccountController.scala +++ b/src/main/scala/app/AccountController.scala @@ -182,7 +182,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { } get("/groups/new")(usersOnly { - html.group(None, List((context.loginAccount.get.userName, true))) + account.html.group(None, List((context.loginAccount.get.userName, true))) }) post("/groups/new", newGroupForm)(usersOnly { form => @@ -198,7 +198,7 @@ trait AccountControllerBase extends AccountManagementControllerBase { get("/:groupName/_editgroup")(managersOnly { defining(params("groupName")){ groupName => - html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) + account.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName)) } }) diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/account/group.scala.html similarity index 98% rename from src/main/twirl/group.scala.html rename to src/main/twirl/account/group.scala.html index c6c542798..b4b46dd12 100644 --- a/src/main/twirl/group.scala.html +++ b/src/main/twirl/account/group.scala.html @@ -1,7 +1,7 @@ @(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context) @import context._ @import view.helpers._ -@main(if(account.isEmpty) "Create group" else "Edit group"){ +@html.main(if(account.isEmpty) "Create group" else "Edit group"){