Commit @222cb49ac02a6ba2e84c7d6d3e6cf74beec0193f

e201428

222cb49

app/controllers/BoardApp.java

--- app/controllers/BoardApp.java

+++ app/controllers/BoardApp.java


         Page<Posting> posts = el.findPagingList(ITEMS_PER_PAGE).getPage(searchCondition.pageNum);
         List<Posting> notices = Posting.findNotices(project);
 
-        return ok(list.render("title.boardList", project, posts, searchCondition, notices));
+        return ok(list.render("menu.board", project, posts, searchCondition, notices));
     }
 
     @AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)

e201428

222cb49

app/controllers/IssueApp.java

--- app/controllers/IssueApp.java

+++ app/controllers/IssueApp.java


 
     private static Result issuesAsHTML(Project project, Page<Issue> issues, models.support.SearchCondition searchCondition){
         if(project == null){
-            return ok(my_list.render("title.issueList", issues, searchCondition, project));
+            return ok(my_list.render("menu.issue", issues, searchCondition, project));
         } else {
             UserApp.currentUser().visits(project);
-            return ok(list.render("title.issueList", issues, searchCondition, project));
+            return ok(list.render("menu.issue", issues, searchCondition, project));
         }
 
     }

e201428

222cb49

app/controllers/MilestoneApp.java

--- app/controllers/MilestoneApp.java

+++ app/controllers/MilestoneApp.java


                 mCondition.orderBy,
                 Direction.getValue(mCondition.orderDir));
 
-        return ok(list.render("title.milestoneList", milestones, project, mCondition));
+        return ok(list.render("milestone", milestones, project, mCondition));
     }
 
     /**

e201428

222cb49

app/views/board/list.scala.html

--- app/views/board/list.scala.html

+++ app/views/board/list.scala.html


 	}
 }
 
-@projectLayout(title, project, utils.MenuType.BOARD) {
+@projectLayout(project.name + " - " + Messages(title), project, utils.MenuType.BOARD) {
 @projectMenu(project, utils.MenuType.BOARD, "main-menu-only")
 <link rel="stylesheet" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)" type="text/css" />
 <div class="page-wrap-outer">

e201428

222cb49

app/views/code/nohead.scala.html

--- app/views/code/nohead.scala.html

+++ app/views/code/nohead.scala.html


 
 @import utils.AccessControl._
 
-@projectLayout(Messages("title.commitHistory"), project, utils.MenuType.CODE) {
+@projectLayout(project.name + " - " + Messages("menu.code"), project, utils.MenuType.CODE) {
 @projectMenu(project, utils.MenuType.CODE, "main-menu-only")
 <div class="page-wrap-outer">
     <div class="project-page-wrap">

e201428

222cb49

app/views/git/list.scala.html

--- app/views/git/list.scala.html

+++ app/views/git/list.scala.html


 @(project: Project, page: com.avaje.ebean.Page[PullRequest],
     condition: controllers.PullRequestApp.SearchCondition, requestType: String)
 
-@projectLayout(Messages("menu.pullRequest"), project, utils.MenuType.PULL_REQUEST) {
+@projectLayout(project.name + " - " + Messages("menu.pullRequest"), project, utils.MenuType.PULL_REQUEST) {
 @projectMenu(project, utils.MenuType.PULL_REQUEST, "main-menu-only")
 <div class="page-wrap-outer">
     <div class="project-page-wrap">

e201428

222cb49

app/views/index/notifications.scala.html

--- app/views/index/notifications.scala.html

+++ app/views/index/notifications.scala.html


 @import utils.JodaDateUtil
 @import utils.MenuType._
 
-@siteLayout(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
+@siteLayout(Messages("notification"), utils.MenuType.SITE_HOME) {
     @if(currentUser == User.anonymous){
     @partial_intro()
     } else {

e201428

222cb49

app/views/issue/list.scala.html

--- app/views/issue/list.scala.html

+++ app/views/issue/list.scala.html


 @import models.support.SearchCondition
 @(title: String, currentPage: Page[Issue], param: SearchCondition, project:Project)
 
-@projectLayout(Messages(title), project, utils.MenuType.ISSUE){
+@projectLayout(project.name + " - " + Messages(title), project, utils.MenuType.ISSUE){
 @projectMenu(project, utils.MenuType.ISSUE, "main-menu-only")
 <link rel="stylesheet" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)" type="text/css" />
 <div class="page-wrap-outer">

e201428

222cb49

app/views/issue/my_list.scala.html

--- app/views/issue/my_list.scala.html

+++ app/views/issue/my_list.scala.html


 models.support.SearchCondition, project:Project)
 
 @import utils.MenuType._
-@siteLayout(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
+@siteLayout(Messages("issue.myIssue"), utils.MenuType.SITE_HOME) {
     <div>
         <button class="btn-transparent" id="toggleIntro"></button>
     </div>

e201428

222cb49

app/views/issue/view.scala.html

--- app/views/issue/view.scala.html

+++ app/views/issue/view.scala.html


 @import models.enumeration.State
 @import controllers.api.IssueApi
 
-@getTitle(issue:Issue) = @{ "#" + issue.getNumber + " " + issue.title }
+@getTitle(issue:Issue) = @{ issue.title }
 
 @isFirstState(state:State) = {@if(issue.state.state == Issue.availableStates.get(0).state()){dirty}}
 

e201428

222cb49

app/views/milestone/list.scala.html

--- app/views/milestone/list.scala.html

+++ app/views/milestone/list.scala.html


 @**
-* Yobi, Project Hosting SW
+* Yona, 21st Century Project Hosting SW
 *
-* Copyright 2012 NAVER Corp.
-* http://yobi.io
-*
-* @author Tae
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+* https://yona.io
 **@
 @(title: String, milestones: List[models.Milestone], project: Project, param: MilestoneApp.MilestoneCondition)
 @import scala.collection.immutable._

 	)
 }
 
-@projectLayout(title, project, utils.MenuType.MILESTONE) {
+@projectLayout(project.name + " - " + title, project, utils.MenuType.MILESTONE) {
 @projectMenu(project, utils.MenuType.MILESTONE, "")
 <div class="page-wrap-outer">
     <div class="project-page-wrap">

e201428

222cb49

app/views/project/home.scala.html

--- app/views/project/home.scala.html

+++ app/views/project/home.scala.html


     if (tab == tabId) {"active"}
 }
 
-@projectLayout(project.name + " |:| " + project.overview, project, utils.MenuType.PROJECT_HOME) {
+@projectLayout(project.name + " - " + Messages("menu.home") + " |:| " + project.overview, project, utils.MenuType.PROJECT_HOME) {
 @projectMenu(project, utils.MenuType.PROJECT_HOME, "")
 <div class="page-wrap-outer">
     <div class="project-page-wrap">

e201428

222cb49

app/views/projectLayout.scala.html

--- app/views/projectLayout.scala.html

+++ app/views/projectLayout.scala.html


 @**
-* Yobi, Project Hosting SW
+* Yona, 21st Century Project Hosting SW
 *
-* Copyright 2013 NAVER Corp.
-* http://yobi.io
-*
-* @author JiHan Kim
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+* https://yona.io
 **@
+@import org.apache.commons.lang3.StringUtils
 @(title:String, project:Project, menuType:utils.MenuType)(content: Html)
 
 @import utils._
 
-@layout(Messages(title) + " - " + project.owner + "/" + project.name)("prj") {
+@titleText = @{
+    if(StringUtils.isBlank(title)) {
+        project.name + " - " + project.owner
+    } else {
+        Messages(title) + " - " + project.owner + "/" + project.name
+    }
+}
+
+@layout(titleText)("prj") {
     @common.navbar(menuType, project, null)
     
     @views.html.project.header(project)

e201428

222cb49

app/views/reviewthread/list.scala.html

--- app/views/reviewthread/list.scala.html

+++ app/views/reviewthread/list.scala.html


 @paramForParticipant = { @CommentThread.countReviewsBy(project.id, param.clone.setAuthorId(null).setParticipantId(UserApp.currentUser().id)) }
 @paramForAuthor = { @CommentThread.countReviewsBy(project.id, param.clone.setParticipantId(null).setAuthorId(UserApp.currentUser().id)) }
 
-@projectLayout(Messages("menu.review"), project, utils.MenuType.PROJECT_REVIEW) {
+@projectLayout(project.name + " - " + Messages("menu.review"), project, utils.MenuType.PROJECT_REVIEW) {
     @projectMenu(project, utils.MenuType.PROJECT_REVIEW, "")
 
 <div class="project-page-wrap">

e201428

222cb49

app/views/user/userFiles.scala.html

--- app/views/user/userFiles.scala.html

+++ app/views/user/userFiles.scala.html


     }
 }
 
-@siteLayout(utils.Config.getSiteName, SITE_HOME) {
+@siteLayout(Messages("user.files"), SITE_HOME) {
     <link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/filetype.css")">
     <div>
         <button class="btn-transparent" id="toggleIntro"></button>

...	...	@@ -152,7 +152,7 @@
152	152	Page<Posting> posts = el.findPagingList(ITEMS_PER_PAGE).getPage(searchCondition.pageNum);
153	153	List<Posting> notices = Posting.findNotices(project);
154	154
155		- return ok(list.render("title.boardList", project, posts, searchCondition, notices));
	155	+ return ok(list.render("menu.board", project, posts, searchCondition, notices));
156	156	}
157	157
158	158	@AnonymousCheck(requiresLogin = true, displaysFlashMessage = true)

...	...	@@ -161,10 +161,10 @@
161	161
162	162	private static Result issuesAsHTML(Project project, Page<Issue> issues, models.support.SearchCondition searchCondition){
163	163	if(project == null){
164		- return ok(my_list.render("title.issueList", issues, searchCondition, project));
	164	+ return ok(my_list.render("menu.issue", issues, searchCondition, project));
165	165	} else {
166	166	UserApp.currentUser().visits(project);
167		- return ok(list.render("title.issueList", issues, searchCondition, project));
	167	+ return ok(list.render("menu.issue", issues, searchCondition, project));
168	168	}
169	169
170	170	}

...	...	@@ -73,7 +73,7 @@
73	73	mCondition.orderBy,
74	74	Direction.getValue(mCondition.orderDir));
75	75
76		- return ok(list.render("title.milestoneList", milestones, project, mCondition));
	76	+ return ok(list.render("milestone", milestones, project, mCondition));
77	77	}
78	78
79	79	/**

...	...	@@ -22,7 +22,7 @@
22	22	}
23	23	}
24	24
25		-@projectLayout(title, project, utils.MenuType.BOARD) {
	25	+@projectLayout(project.name + " - " + Messages(title), project, utils.MenuType.BOARD) {
26	26	@projectMenu(project, utils.MenuType.BOARD, "main-menu-only")
27	27	<link rel="stylesheet" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)" type="text/css" />
28	28	<div class="page-wrap-outer">

...	...	@@ -36,7 +36,7 @@
36	36
37	37	@import utils.AccessControl._
38	38
39		-@projectLayout(Messages("title.commitHistory"), project, utils.MenuType.CODE) {
	39	+@projectLayout(project.name + " - " + Messages("menu.code"), project, utils.MenuType.CODE) {
40	40	@projectMenu(project, utils.MenuType.CODE, "main-menu-only")
41	41	<div class="page-wrap-outer">
42	42	<div class="project-page-wrap">

...	...	@@ -7,7 +7,7 @@
7	7	@(project: Project, page: com.avaje.ebean.Page[PullRequest],
8	8	condition: controllers.PullRequestApp.SearchCondition, requestType: String)
9	9
10		-@projectLayout(Messages("menu.pullRequest"), project, utils.MenuType.PULL_REQUEST) {
	10	+@projectLayout(project.name + " - " + Messages("menu.pullRequest"), project, utils.MenuType.PULL_REQUEST) {
11	11	@projectMenu(project, utils.MenuType.PULL_REQUEST, "main-menu-only")
12	12	<div class="page-wrap-outer">
13	13	<div class="project-page-wrap">

...	...	@@ -10,7 +10,7 @@
10	10	@import utils.JodaDateUtil
11	11	@import utils.MenuType._
12	12
13		-@siteLayout(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
	13	+@siteLayout(Messages("notification"), utils.MenuType.SITE_HOME) {
14	14	@if(currentUser == User.anonymous){
15	15	@partial_intro()
16	16	} else {

...	...	@@ -8,7 +8,7 @@
8	8	@import models.support.SearchCondition
9	9	@(title: String, currentPage: Page[Issue], param: SearchCondition, project:Project)
10	10
11		-@projectLayout(Messages(title), project, utils.MenuType.ISSUE){
	11	+@projectLayout(project.name + " - " + Messages(title), project, utils.MenuType.ISSUE){
12	12	@projectMenu(project, utils.MenuType.ISSUE, "main-menu-only")
13	13	<link rel="stylesheet" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)" type="text/css" />
14	14	<div class="page-wrap-outer">

...	...	@@ -8,7 +8,7 @@
8	8	models.support.SearchCondition, project:Project)
9	9
10	10	@import utils.MenuType._
11		-@siteLayout(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
	11	+@siteLayout(Messages("issue.myIssue"), utils.MenuType.SITE_HOME) {
12	12	<div>
13	13	<button class="btn-transparent" id="toggleIntro"></button>
14	14	</div>

...	...	@@ -17,7 +17,7 @@
17	17	@import models.enumeration.State
18	18	@import controllers.api.IssueApi
19	19
20		-@getTitle(issue:Issue) = @{ "#" + issue.getNumber + " " + issue.title }
	20	+@getTitle(issue:Issue) = @{ issue.title }
21	21
22	22	@isFirstState(state:State) = {@if(issue.state.state == Issue.availableStates.get(0).state()){dirty}}
23	23

...	...	@@ -1,22 +1,8 @@
1	1	@**
2		-* Yobi, Project Hosting SW
	2	+* Yona, 21st Century Project Hosting SW
3	3	*
4		-* Copyright 2012 NAVER Corp.
5		-* http://yobi.io
6		-*
7		-* @author Tae
8		-*
9		-* Licensed under the Apache License, Version 2.0 (the "License");
10		-* you may not use this file except in compliance with the License.
11		-* You may obtain a copy of the License at
12		-*
13		-* http://www.apache.org/licenses/LICENSE-2.0
14		-*
15		-* Unless required by applicable law or agreed to in writing, software
16		-* distributed under the License is distributed on an "AS IS" BASIS,
17		-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18		-* See the License for the specific language governing permissions and
19		-* limitations under the License.
	4	+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+* https://yona.io
20	6	**@
21	7	@(title: String, milestones: List[models.Milestone], project: Project, param: MilestoneApp.MilestoneCondition)
22	8	@import scala.collection.immutable._
...	...	@@ -41,7 +27,7 @@
41	27	)
42	28	}
43	29
44		-@projectLayout(title, project, utils.MenuType.MILESTONE) {
	30	+@projectLayout(project.name + " - " + title, project, utils.MenuType.MILESTONE) {
45	31	@projectMenu(project, utils.MenuType.MILESTONE, "")
46	32	<div class="page-wrap-outer">
47	33	<div class="project-page-wrap">

...	...	@@ -18,7 +18,7 @@
18	18	if (tab == tabId) {"active"}
19	19	}
20	20
21		-@projectLayout(project.name + " \|:\| " + project.overview, project, utils.MenuType.PROJECT_HOME) {
	21	+@projectLayout(project.name + " - " + Messages("menu.home") + " \|:\| " + project.overview, project, utils.MenuType.PROJECT_HOME) {
22	22	@projectMenu(project, utils.MenuType.PROJECT_HOME, "")
23	23	<div class="page-wrap-outer">
24	24	<div class="project-page-wrap">

...	...	@@ -1,28 +1,23 @@
1	1	@**
2		-* Yobi, Project Hosting SW
	2	+* Yona, 21st Century Project Hosting SW
3	3	*
4		-* Copyright 2013 NAVER Corp.
5		-* http://yobi.io
6		-*
7		-* @author JiHan Kim
8		-*
9		-* Licensed under the Apache License, Version 2.0 (the "License");
10		-* you may not use this file except in compliance with the License.
11		-* You may obtain a copy of the License at
12		-*
13		-* http://www.apache.org/licenses/LICENSE-2.0
14		-*
15		-* Unless required by applicable law or agreed to in writing, software
16		-* distributed under the License is distributed on an "AS IS" BASIS,
17		-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18		-* See the License for the specific language governing permissions and
19		-* limitations under the License.
	4	+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+* https://yona.io
20	6	**@
	7	+@import org.apache.commons.lang3.StringUtils
21	8	@(title:String, project:Project, menuType:utils.MenuType)(content: Html)
22	9
23	10	@import utils._
24	11
25		-@layout(Messages(title) + " - " + project.owner + "/" + project.name)("prj") {
	12	+@titleText = @{
	13	+ if(StringUtils.isBlank(title)) {
	14	+ project.name + " - " + project.owner
	15	+ } else {
	16	+ Messages(title) + " - " + project.owner + "/" + project.name
	17	+ }
	18	+}
	19	+
	20	+@layout(titleText)("prj") {
26	21	@common.navbar(menuType, project, null)
27	22
28	23	@views.html.project.header(project)

...	...	@@ -28,7 +28,7 @@
28	28	@paramForParticipant = { @CommentThread.countReviewsBy(project.id, param.clone.setAuthorId(null).setParticipantId(UserApp.currentUser().id)) }
29	29	@paramForAuthor = { @CommentThread.countReviewsBy(project.id, param.clone.setParticipantId(null).setAuthorId(UserApp.currentUser().id)) }
30	30
31		-@projectLayout(Messages("menu.review"), project, utils.MenuType.PROJECT_REVIEW) {
	31	+@projectLayout(project.name + " - " + Messages("menu.review"), project, utils.MenuType.PROJECT_REVIEW) {
32	32	@projectMenu(project, utils.MenuType.PROJECT_REVIEW, "")
33	33
34	34	<div class="project-page-wrap">

...	...	@@ -28,7 +28,7 @@
28	28	}
29	29	}
30	30
31		-@siteLayout(utils.Config.getSiteName, SITE_HOME) {
	31	+@siteLayout(Messages("user.files"), SITE_HOME) {
32	32	<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/filetype.css")">
33	33	<div>
34	34	<button class="btn-transparent" id="toggleIntro"></button>

Delete comment