Jihan Kim 2013-04-16
fix prjmenu
@1ef156f731bcaa180884d264c048c54e5343e769
app/views/issue/issueError.scala.html
--- app/views/issue/issueError.scala.html
+++ app/views/issue/issueError.scala.html
@@ -1,12 +1,17 @@
 @(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>
 
 }
(No newline at end of file)
app/views/milestone/create.scala.html
--- app/views/milestone/create.scala.html
+++ app/views/milestone/create.scala.html
@@ -3,7 +3,7 @@
 @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">
app/views/milestone/edit.scala.html
--- app/views/milestone/edit.scala.html
+++ app/views/milestone/edit.scala.html
@@ -6,7 +6,7 @@
 
 @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">
app/views/milestone/list.scala.html
--- app/views/milestone/list.scala.html
+++ app/views/milestone/list.scala.html
@@ -38,7 +38,7 @@
 }
 
 @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">
app/views/milestone/manage.scala.html
--- app/views/milestone/manage.scala.html
+++ app/views/milestone/manage.scala.html
@@ -4,7 +4,6 @@
 @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)) {
@@ -28,15 +27,15 @@
 }
 
 @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">
app/views/prjmenu.scala.html
--- app/views/prjmenu.scala.html
+++ app/views/prjmenu.scala.html
@@ -43,7 +43,6 @@
 </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>
@@ -73,3 +72,19 @@
 	</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>
(No newline at end of file)
app/views/project/unauthorized.scala.html
--- app/views/project/unauthorized.scala.html
+++ app/views/project/unauthorized.scala.html
@@ -1,23 +1,10 @@
 @(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>
@@ -25,18 +12,5 @@
     <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>
+
 }
conf/messages.en
--- conf/messages.en
+++ conf/messages.en
@@ -83,6 +83,7 @@
 button.newProject = Create your project
 button.detail = Detail
 button.apply = Apply
+button.back = Back
 
 checkbox.commented = Comment
 checkbox.fileAttached = File Attached
conf/messages.ko
--- conf/messages.ko
+++ conf/messages.ko
@@ -84,6 +84,7 @@
 button.newProject = 새 프로젝트 만들기
 button.detail = 자세히
 button.apply = 적용
+button.back = 돌아가기
 
 checkbox.commented = 댓글
 checkbox.fileAttached = 첨부파일
Add a comment
List