Commit @1ef156f731bcaa180884d264c048c54e5343e769

fc508ac

1ef156f

app/views/issue/issueError.scala.html

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

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


 @(message:String, returnURL:Call, project:Project)
 
-@main("Warnning!", project, utils.MenuType.ISSUE){
+@main(Messages("message.warning"), project, utils.MenuType.ISSUE){
 <div class="page">
 
-	<div class="alert alert-error">
-	@Messages(message)
-	</div>
-    <a class="btn" href="@returnURL">돌아가기</a>
+	@prjmenu(project, utils.MenuType.PROJECT_HOME, "")
+
+	<div class="error-wrap">
+			<i class="ico ico-err1"></i>
+			<p>@Messages(message)</p>
+			
+			<a href="@returnURL" class="btn">@Messages("button.back")</a>
+		</div>  
+    <div>
 </div>
 
 }

fc508ac

1ef156f

app/views/milestone/create.scala.html

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

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


 @import utils.TemplateHelper._
 @import models.enumeration._
 @project.projectMngMain(title, projectInst) {
-    @views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
+    @prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
 
     <div class="form-wrap milestone frm-wrap">
         <form class="nm" action="@routes.MilestoneApp.newMilestone(projectInst.owner, projectInst.name)" method="post">

fc508ac

1ef156f

app/views/milestone/edit.scala.html

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

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


 
 @project.projectMngMain(title, projectInst) {
 
-@views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
+@prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
 
 <div class="form-wrap milestone frm-wrap">
 	<form class="nm" action="@routes.MilestoneApp.editMilestone(projectInst.owner, projectInst.name, milestoneId)" method="post">

fc508ac

1ef156f

app/views/milestone/list.scala.html

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

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


 }
 
 @project.projectMngMain(title, projectInst) {
-    @views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
+    @prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
     
     <div class="tab-wrap">
         <div class="pull-right btns">

fc508ac

1ef156f

app/views/milestone/manage.scala.html

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

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


 @import models.enumeration._
 
 @stateMessage(state: State) = @{ Messages("milestone.state." + state.name.toLowerCase) }
-
 @sortMark(_sort: String) = @{
     /* TODO It will be chnaged. */
     if(mCondition.sort.equals(_sort)) {

 }
 
 @project.projectMngMain(message, projectInst) {
-	@views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
+	@prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
 	
 	@if(milestones == null || milestones.isEmpty()){
-
-		<div class="error-wrap">
-			<i class="ico ico-err1"></i>
-			<p>@Messages("milestone.is.empty")</p>
-		</div>  
-
+	
+	<div class="error-wrap">
+		<i class="ico ico-err1"></i>
+		<p>@Messages("milestone.is.empty")</p>
+	</div>
+	
     } else {
     
     <div class="tab-wrap">

fc508ac

1ef156f

app/views/prjmenu.scala.html

--- app/views/prjmenu.scala.html

+++ app/views/prjmenu.scala.html


 </div>
 
 <div class="project-menu @menuCSS">
-
 	<div class="project-menu-wrap main">
 		<ul class="unstyled">
 			<li class="@isActiveMenu(MenuType.PROJECT_HOME)"><a href="@routes.ProjectApp.project(project.owner, project.name)">@Messages("title.projectHome")</a></li>

 	</div>
 	}
 </div>
+
+<script type="text/javascript">
+$(document).ready(function(){
+	try {
+		var welLink;
+		
+		$(".project-menu-wrap a").each(function(n, el){
+			welLink = $(el);
+			if(welLink.attr("href") == document.location.pathname){
+				$(".project-menu-wrap li.highlight").removeClass("highlight");
+				welLink.parent().addClass("highlight");
+			}
+		});
+	}catch(e){}
+});
+</script>

fc508ac

1ef156f

app/views/project/unauthorized.scala.html

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

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


 @(project: Project) 
 
-@main("Permission Denied", project, utils.MenuType.NONE) {
+@main(Messages("auth.unauthorized.title"), project, utils.MenuType.NONE) {
 <div class="page">
-	<div class="project-menu">
-		<div class="project-menu-wrap main">
-			<ul class="unstyled">
-				<li><a href="@routes.ProjectApp.project(project.owner, project.name)">@Messages("title.projectHome")</a></li>
-				<li class="sp-line">|</li>
-				<li><a href="@routes.BoardApp.posts(project.owner, project.name)">@Messages("menu.board")</a></li>
-				<li class="sp-line">|</li>
-				<li><a href="@routes.CodeApp.codeBrowser(project.owner, project.name)">@Messages("menu.code")</a></li>
-				<li class="sp-line">|</li>
-				<li><a href="@routes.IssueApp.issues(project.owner, project.name,"all")">@Messages("menu.issue")</a></li>
-				<li class="sp-line">|</li>
-				<li><a href="@routes.ProjectApp.settingForm(project.owner, project.name)">@Messages("menu.admin")</a></li>
-			</ul>
-		</div>
-	</div>
-	
+
+	@prjmenu(project, utils.MenuType.PROJECT_HOME, "")
+
 	<div class="error-wrap">
 			<i class="ico ico-err2"></i>
 			<p>@Messages("auth.unauthorized.waringMessage")</p>

     <div>
 </div>
 
-<script type="text/javascript">
-$(document).ready(function(){
-	try {
-		var welLink;
-		
-		$(".project-menu-wrap a").each(function(n, el){
-			welLink = $(el);
-			if(welLink.attr("href") == document.location.pathname){
-				welLink.parent().addClass("highlight");
-			}
-		});
-	}catch(e){}
-});
-</script>
+
 }

fc508ac

1ef156f

conf/messages.en

--- conf/messages.en

+++ conf/messages.en


 button.newProject = Create your project
 button.detail = Detail
 button.apply = Apply
+button.back = Back
 
 checkbox.commented = Comment
 checkbox.fileAttached = File Attached

fc508ac

1ef156f

conf/messages.ko

--- conf/messages.ko

+++ conf/messages.ko


 button.newProject = 새 프로젝트 만들기
 button.detail = 자세히
 button.apply = 적용
+button.back = 돌아가기
 
 checkbox.commented = 댓글
 checkbox.fileAttached = 첨부파일

...	...	@@ -6,7 +6,7 @@
6	6
7	7	@project.projectMngMain(title, projectInst) {
8	8
9		-@views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
	9	+@prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
10	10
11	11	<div class="form-wrap milestone frm-wrap">
12	12	<form class="nm" action="@routes.MilestoneApp.editMilestone(projectInst.owner, projectInst.name, milestoneId)" method="post">

...	...	@@ -38,7 +38,7 @@
38	38	}
39	39
40	40	@project.projectMngMain(title, projectInst) {
41		- @views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
	41	+ @prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
42	42
43	43	<div class="tab-wrap">
44	44	<div class="pull-right btns">

...	...	@@ -4,7 +4,6 @@
4	4	@import models.enumeration._
5	5
6	6	@stateMessage(state: State) = @{ Messages("milestone.state." + state.name.toLowerCase) }
7		-
8	7	@sortMark(_sort: String) = @{
9	8	/* TODO It will be chnaged. */
10	9	if(mCondition.sort.equals(_sort)) {
...	...	@@ -28,15 +27,15 @@
28	27	}
29	28
30	29	@project.projectMngMain(message, projectInst) {
31		- @views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
	30	+ @prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
32	31
33	32	@if(milestones == null \|\| milestones.isEmpty()){
34		-
35		- <div class="error-wrap">
36		- <i class="ico ico-err1"></i>
37		- <p>@Messages("milestone.is.empty")</p>
38		- </div>
39		-
	33	+
	34	+ <div class="error-wrap">
	35	+ <i class="ico ico-err1"></i>
	36	+ <p>@Messages("milestone.is.empty")</p>
	37	+ </div>
	38	+
40	39	} else {
41	40
42	41	<div class="tab-wrap">

...	...	@@ -43,7 +43,6 @@
43	43	</div>
44	44
45	45	<div class="project-menu @menuCSS">
46		-
47	46	<div class="project-menu-wrap main">
48	47	<ul class="unstyled">
49	48	<li class="@isActiveMenu(MenuType.PROJECT_HOME)"><a href="@routes.ProjectApp.project(project.owner, project.name)">@Messages("title.projectHome")</a></li>
...	...	@@ -73,3 +72,19 @@
73	72	</div>
74	73	}
75	74	</div>
	75	+
	76	+<script type="text/javascript">
	77	+$(document).ready(function(){
	78	+ try {
	79	+ var welLink;
	80	+
	81	+ $(".project-menu-wrap a").each(function(n, el){
	82	+ welLink = $(el);
	83	+ if(welLink.attr("href") == document.location.pathname){
	84	+ $(".project-menu-wrap li.highlight").removeClass("highlight");
	85	+ welLink.parent().addClass("highlight");
	86	+ }
	87	+ });
	88	+ }catch(e){}
	89	+});
	90	+</script> (No newline at end of file)

...	...	@@ -83,6 +83,7 @@
83	83	button.newProject = Create your project
84	84	button.detail = Detail
85	85	button.apply = Apply
	86	+button.back = Back
86	87
87	88	checkbox.commented = Comment
88	89	checkbox.fileAttached = File Attached

...	...	@@ -1,12 +1,17 @@
1	1	@(message:String, returnURL:Call, project:Project)
2	2
3		-@main("Warnning!", project, utils.MenuType.ISSUE){
	3	+@main(Messages("message.warning"), project, utils.MenuType.ISSUE){
4	4	<div class="page">
5	5
6		- <div class="alert alert-error">
7		- @Messages(message)
8		- </div>
9		- <a class="btn" href="@returnURL">돌아가기</a>
	6	+ @prjmenu(project, utils.MenuType.PROJECT_HOME, "")
	7	+
	8	+ <div class="error-wrap">
	9	+ <i class="ico ico-err1"></i>
	10	+ <p>@Messages(message)</p>
	11	+
	12	+ <a href="@returnURL" class="btn">@Messages("button.back")</a>
	13	+ </div>
	14	+ <div>
10	15	</div>
11	16
12	17	} (No newline at end of file)

...	...	@@ -3,7 +3,7 @@
3	3	@import utils.TemplateHelper._
4	4	@import models.enumeration._
5	5	@project.projectMngMain(title, projectInst) {
6		- @views.html.prjmenu(projectInst, utils.MenuType.PROJECT_SETTING, "")
	6	+ @prjmenu(projectInst, utils.MenuType.PROJECT_HOME, "")
7	7
8	8	<div class="form-wrap milestone frm-wrap">
9	9	<form class="nm" action="@routes.MilestoneApp.newMilestone(projectInst.owner, projectInst.name)" method="post">

...	...	@@ -1,23 +1,10 @@
1	1	@(project: Project)
2	2
3		-@main("Permission Denied", project, utils.MenuType.NONE) {
	3	+@main(Messages("auth.unauthorized.title"), project, utils.MenuType.NONE) {
4	4	<div class="page">
5		- <div class="project-menu">
6		- <div class="project-menu-wrap main">
7		- <ul class="unstyled">
8		- <li><a href="@routes.ProjectApp.project(project.owner, project.name)">@Messages("title.projectHome")</a></li>
9		- <li class="sp-line">\|</li>
10		- <li><a href="@routes.BoardApp.posts(project.owner, project.name)">@Messages("menu.board")</a></li>
11		- <li class="sp-line">\|</li>
12		- <li><a href="@routes.CodeApp.codeBrowser(project.owner, project.name)">@Messages("menu.code")</a></li>
13		- <li class="sp-line">\|</li>
14		- <li><a href="@routes.IssueApp.issues(project.owner, project.name,"all")">@Messages("menu.issue")</a></li>
15		- <li class="sp-line">\|</li>
16		- <li><a href="@routes.ProjectApp.settingForm(project.owner, project.name)">@Messages("menu.admin")</a></li>
17		- </ul>
18		- </div>
19		- </div>
20		-
	5	+
	6	+ @prjmenu(project, utils.MenuType.PROJECT_HOME, "")
	7	+
21	8	<div class="error-wrap">
22	9	<i class="ico ico-err2"></i>
23	10	<p>@Messages("auth.unauthorized.waringMessage")</p>
...	...	@@ -25,18 +12,5 @@
25	12	<div>
26	13	</div>
27	14
28		-<script type="text/javascript">
29		-$(document).ready(function(){
30		- try {
31		- var welLink;
32		-
33		- $(".project-menu-wrap a").each(function(n, el){
34		- welLink = $(el);
35		- if(welLink.attr("href") == document.location.pathname){
36		- welLink.parent().addClass("highlight");
37		- }
38		- });
39		- }catch(e){}
40		-});
41		-</script>
	15	+
42	16	}

...	...	@@ -84,6 +84,7 @@
84	84	button.newProject = 새 프로젝트 만들기
85	85	button.detail = 자세히
86	86	button.apply = 적용
	87	+button.back = 돌아가기
87	88
88	89	checkbox.commented = 댓글
89	90	checkbox.fileAttached = 첨부파일

Delete comment