Jihan Kim 2013-05-08
apply HIVE CSS including trivial fix. delete milestone manage page that combined with milestone list page
@989213bb94426f90a829e61129d35f3dd7a9533d
app/assets/stylesheets/less/_page.less
--- app/assets/stylesheets/less/_page.less
+++ app/assets/stylesheets/less/_page.less
@@ -202,6 +202,7 @@
                        
                        .d-label {
                            text-shadow:0 1px 1px rgba(0, 0, 0, 0.75);
+                           .avatar-wrap { border:1px solid #333; }
                        }
                        .d-caret {
                            border-left:1px solid #787878;
@@ -850,7 +851,7 @@
         width: 384px;
         .center-block;
         margin-bottom: 73px;
-        .n-btn {
+        /*.n-btn {
             &.log-in {
                 width: 187px;
                 vertical-align: top;
@@ -861,7 +862,7 @@
             &.join {
                 width: 117px;
             }
-        }
+        }*/
     }
 }
 
@@ -894,13 +895,13 @@
         width: 227px;
         .center-block;
         margin-bottom: 50px;
-        .n-btn {
+        /*.n-btn {
             &.sign-up {
                 width: 227px;
                 height: auto;
                 border: 0 none;
             }
-        }
+        }*/
     }
 }
 
@@ -1568,26 +1569,31 @@
             .border-radius(2px);
         }
     }
+    /*
     .ns-btn {
         .border-radius(2px);
         padding:2px 20px;
         margin-left:3px;
     }
+    */
 }
 
 .members.project {
     margin: 0;
     list-style: none;
+    
     .member {
-        padding: 20px;
-        .border-radius(10px);
-        background-color: @white;
         float: left;
         width: 375px;
+        padding: 20px;
         margin-bottom: 6px;
+        background-color: @white;
+        .border-radius(10px);
+        
         &:nth-child(2n+1) {
             margin-right: 10px;
         }
+        
         .m-body {
             margin-left: 64px;
             .td {
@@ -1600,20 +1606,17 @@
                     max-width: 120px;
                     border-right: 1px solid @gray-d4;
                 }
+                
+                p {
+                    word-wrap: break-word;
+                    margin-bottom: 2px;
+                }
                 .d-label {
-                    width: 128px; /*147px;*/
+                    width: 108px; /*147px;*/
                 }
                 .btns {
                     text-transform: capitalize;
                     margin-top: 6px;
-                    .n-btn { 
-                        /*width:54px; font-size:12px; letter-spacing: -1px;*/
-                        width:68px; padding:3px; padding-top:5px; font-size:12px; 
-                    }
-                }
-                p {
-                    word-wrap: break-word;
-                    margin-bottom: 2px;
                 }
                 .uname { font-size: 20px; }
                 .name  { font-size: 11px; }
@@ -1633,18 +1636,10 @@
         .filter {
             margin-right:10px;
             &.active { font-weight:bold; }
-            /*
-            &:first-child {
-                margin-right: 5px;
-            }
-            */
-            &:last-of-type {
-                margin:0;
-            }
+            &:last-of-type { margin:0; }
         }
-        
         i { margin-right: 5px; }
-    }    
+    }
 
     //-- milestone
     &.milestone {
@@ -1771,7 +1766,7 @@
                     width: 584px;
                 }
                 .textarea {
-                    height: 305px;
+                    height: 306px;
                     resize: vertical;
                 }
                 .actions {
@@ -1783,16 +1778,15 @@
                     }
                 }
             }
+            
             &.right {
-                height:376px;
+                height:385px;
                 margin-left: 610px;
                 padding: 15px 10px;
-                background-color: #ECECEC;
+                background-color: #ececec;
                 .border-radius(5px);
-                .due-date {
-                    width: 236px;
-                    margin-bottom: 0;
-                }
+                
+                .due-date    { width: 236px; margin-bottom:0; }
                 .pika-single { width:232px; }
                 .date-picker { margin-top:5px; }
                 
@@ -2013,10 +2007,6 @@
     margin: 20px 0;
     text-align: right;
 }
-.btn-save-xls {
-    float:left;
-    color:#707070 !important;
-}
 
 .board-view {
     .num {
@@ -2098,7 +2088,9 @@
 }
 
 .board-comment-wrap {
-    background-color: #F5F5F5;
+    display:block; clear:both;
+    background-color: #f5f5f5;
+    
     .border-radius(10px);
     .comment-header {
         padding: 0 20px;
@@ -2106,6 +2098,7 @@
         font-size: 14px;
         line-height: 40px;
     }
+    
     .comments {
         margin: 0;
         padding: 0;
@@ -2214,8 +2207,8 @@
         line-height: 30px;
         padding-right: 30px;
         text-align: left;
+        max-width:630px;
         .inline-block;
-        /*.pull-left;*/
     }
 }
 
@@ -3026,7 +3019,7 @@
         border-bottom: 1px solid #EEE;
     }
 }
-
+/*
 .plugin-wrap {
     padding: 10px;
     .plugin-table-wrap {
@@ -3113,7 +3106,7 @@
         }
     }
 }
-
+*/
 .statistics {
     padding: 10px;
     font-size: 0;
@@ -3182,12 +3175,7 @@
     margin: 15px 0 20px;
 }
 
-
 .actions {
-    .n-btn {
-        margin-right:5px;
-    }
-    &:last-child {
-        margin-right:0;
-    }
-}
(No newline at end of file)
+    &:last-child { margin-right:0; }
+}
+
app/controllers/MilestoneApp.java
--- app/controllers/MilestoneApp.java
+++ app/controllers/MilestoneApp.java
@@ -64,18 +64,19 @@
             Milestone newMilestone = milestoneForm.get();
             newMilestone.project = project;
             Milestone.create(newMilestone);
-            return redirect(routes.MilestoneApp.manageMilestones(userName, projectName));
+            return redirect(routes.MilestoneApp.milestones(userName, projectName));
         }
     }
 
     private static void validate(Project project, Form<Milestone> milestoneForm) {
-        // 중복된 title로 만들 수 없다.
+        // 중복된 제목으로 만들 수 없다
         if (!Milestone.isUniqueProjectIdAndTitle(project.id, milestoneForm.field("title").value())) {
             milestoneForm.reject("title", "milestone.title.duplicated");
             flash(Constants.WARNING, "milestone.title.duplicated");
         }
     }
 
+    /*
     public static Result manageMilestones(String userName, String projectName) {
         Project project = ProjectApp.getProject(userName, projectName);
         if(project == null ) {
@@ -88,6 +89,7 @@
                 Direction.getValue(mCondition.direction));
         return ok(manage.render("title.milestoneManage", milestones, project, mCondition));
     }
+    */
 
     public static Result editMilestoneForm(String userName, String projectName, Long milestoneId) {
         Project project = ProjectApp.getProject(userName, projectName);
@@ -115,7 +117,7 @@
         } else {
             Milestone existingMilestone = Milestone.findById(milestoneId);
             existingMilestone.updateWith(milestoneForm.get());
-            return redirect(routes.MilestoneApp.manageMilestones(userName, projectName));
+            return redirect(routes.MilestoneApp.milestones(userName, projectName));
         }
     }
 
@@ -129,7 +131,7 @@
             return internalServerError();
         }
         Milestone.findById(id).delete();
-        return redirect(routes.MilestoneApp.manageMilestones(userName, projectName));
+        return redirect(routes.MilestoneApp.milestones(userName, projectName));
 
     }
 }
app/views/alertUI.scala.html
--- app/views/alertUI.scala.html
+++ app/views/alertUI.scala.html
@@ -8,7 +8,7 @@
 	<div class="message">
 		<p class="center-text msg"></p>
 		<p class="center-txt">
-			<button type="submit" class="btn-transparent n-btn orange med" data-dismiss="modal">@Messages("button.confirm")</button>
+			<button type="submit" class="nbtn orange medium" data-dismiss="modal">@Messages("button.confirm")</button>
 		</p>
 	</div>
 </div>
(No newline at end of file)
app/views/index.scala.html
--- app/views/index.scala.html
+++ app/views/index.scala.html
@@ -80,22 +80,22 @@
                         <div class="project-list-sort">
                             <span class="ordertype-date">
                                 @if( orderString == "createdDate desc" ){
-                                    <a href="@routes.Application.index()?order=createdDate"><strong>@Messages("orderby.recent")</strong> <i class="icon-chevron-down"></i></a>
+                                    <a href="@routes.Application.index()?order=createdDate"><strong>@Messages("order.recent")</strong> <i class="icon-chevron-down"></i></a>
                                 } else {
                                     @if( orderString == "createdDate" ){
-                                        <a href="@routes.Application.index()?order=createdDate desc"><strong>@Messages("orderby.recent")</strong> <i class="icon-chevron-up"></i></a>
+                                        <a href="@routes.Application.index()?order=createdDate desc"><strong>@Messages("order.recent")</strong> <i class="icon-chevron-up"></i></a>
                                     } else {
-                                        <a href="@routes.Application.index()?order=createdDate">@Messages("orderby.recent")</a>
+                                        <a href="@routes.Application.index()?order=createdDate">@Messages("order.recent")</a>
                                     }
                                 }
                             </span><span class="delimeter"> | </span><span class="ordertype-name">
                                 @if( orderString == "name desc" ){
-                                    <a href="@routes.Application.index()?order=name"><strong>@Messages("orderby.name")</strong> <i class="icon-chevron-down"></i></a>
+                                    <a href="@routes.Application.index()?order=name"><strong>@Messages("order.name")</strong> <i class="icon-chevron-down"></i></a>
                                 } else {
                                     @if( orderString == "name" ){
-                                        <a href="@routes.Application.index()?order=name desc"><strong>@Messages("orderby.name")</strong> <i class="icon-chevron-up"></i></a>
+                                        <a href="@routes.Application.index()?order=name desc"><strong>@Messages("order.name")</strong> <i class="icon-chevron-up"></i></a>
                                     } else {
-                                        <a href="@routes.Application.index()?order=name">@Messages("orderby.name")</a>
+                                        <a href="@routes.Application.index()?order=name">@Messages("order.name")</a>
                                     }
                                 }
                             </span>
app/views/issue/editIssue.scala.html
--- app/views/issue/editIssue.scala.html
+++ app/views/issue/editIssue.scala.html
@@ -11,75 +11,63 @@
 @main(Messages(title), project, utils.MenuType.ISSUE) {
 
 <div class="page">
-  @prjmenu(project, utils.MenuType.ISSUE, "main-menu-only")
+	@prjmenu(project, utils.MenuType.ISSUE, "main-menu-only")
   
-  <div class="content-wrap frm-wrap">
-  
+	<div class="content-wrap frm-wrap">  
+    
     @form(action = routes.IssueApp.editIssue(project.owner, project.name, issue.id), 'id -> "issue-form", 'enctype -> "multipart/form-data") {
-    <input type="hidden" value="@issue.authorId" name="authorId">
+    <input type="hidden" name="authorId" value="@issue.authorId">
     
     <dl>
     	<dt>
-    	  <!-- 
-	      <div id="warning" class="n-alert hide">
-	        <div class="n-inner">
-	          <span class="msg">제목과 본문에 빈칸이 있습니다.</span>
-	          <a href="#" class="ico btn-delete"></a>
-	        </div>
-	      </div>
-	      -->
-	      <label for="title"><!-- <strong class="secondary-txt">#@issue.id</strong>-->@Messages("post.new.title")</label>
+			<label for="title"><!-- <strong class="secondary-txt">#@issue.id</strong>-->@Messages("post.new.title")</label>
     	</dt>
     	<dd>
     		<input type="text" id="title" name="title" value="@issue.title" class="text title" maxlength="250" tabindex="1">
     	</dd>
+    	<dd>
+    		<textarea id="body" name="body" markdown="true" class="text content" tabindex="2">@issue.body</textarea>
+    	</dd>
     </dl>
 
-	<textarea id="body" name="body" markdown="true" class="text content" tabindex="2">@issue.body</textarea>
-
+	@** fileUploader **@
+    @if(UserApp.currentUser() != UserApp.anonymous) {
 	<div class="content-footer">
-		@** fileUploader **@
-	    @if(UserApp.currentUser() != UserApp.anonymous) {
-	    
 		<div class="attach-wrap">
 			<div class="avatar-wrap">
-				<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" class="img-rounded" width="32" height="32" alt="avatar">
+				<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" width="32" height="32">
 			</div>
 			<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.ISSUE_POST" resourceId="@issue.id">
 				<div>
 					<span class="progress-num">0%</span> <span class="sp-line">&nbsp;</span>
-					<strong>total</strong> <span class="total-num">0MB</span>
+					<strong>total</strong> <span class="total-num">0Mb</span>
 				</div>
 				<div class="progress-wrap">
 					<div class="progress n4">
 						<div class="bar orange" style="width: 0%;"></div>
 					</div>
 				</div>
-				<!-- <a href="#!/cancel"><i class="ico btn-cancel"></i></a> -->
 			</div>
-		
+
 			<div class="btn-wrap">
-				<div class="fake-file-wrap">
-					<input type="file" class="file" name="filePath" size="1">
-					<div class="ns-btn">
-						<i class="ico ico-plus-blue"></i>@Messages("button.upload")
-					</div>
+				<div class="nbtn medium white fake-file-wrap">
+					<i class="ico ico-plus-blue"></i>@Messages("button.upload")<!-- 
+				--> <input type="file" class="file" name="filePath">
 				</div>
 			</div>
 		</div>
 		<script type="text/template" id="tplAttachedFile"><!--
-		--><li class="attached-file" data-name="${fileName}" data-href="${fileHref}" data-mime="${mimeType}" data-size="${fileSize}">
-		<strong>${fileName}(${fileSizeReadable})</strong><!--
-		--><a class="attached-delete"><i class="ico btn-delete"></i></a><!--
-		--></li>
-		</script>
-	
+				--><li class="attached-file" data-name="${fileName}" data-href="${fileHref}" data-mime="${mimeType}" data-size="${fileSize}">
+				<strong>${fileName}(${fileSizeReadable})</strong><!--
+				--><a class="attached-delete"><i class="ico btn-delete"></i></a></li>
+			</script>
+
 		<div class="attached-files-wrap">
 			<ul class="attached-files"></ul>
 		</div>
+	</div>
 	}
 	@** end of fileUploader **@
-    </div>
 
 	<br>
 	
@@ -89,9 +77,11 @@
 		<li class="option">
              <div class="option-label">@Messages("issue.state")</div>
              <div class="option-desc">
-				<div id="assignee" class="btn-group" data-name="state">
-					<button data-toggle="dropdown" class="btn dropdown-toggle d-label bgwhite">@Messages("issue.state")</button>
-					<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
+             	<div id="state" class="btn-group" data-name="state">
+					<button class="btn dropdown-toggle large" data-toggle="dropdown">
+						<span class="d-label">@Messages("issue.state")</span>
+						<span class="d-caret"><span class="caret"></span></span>
+					</button>
 					<ul class="dropdown-menu">
 						<li data-value="@State.OPEN.name" @if(issue.state == State.OPEN){data-selected="true" class="active"}><a href="javascript:void(0)">@Messages("issue.state.open")</a></li>
 						<li data-value="@State.CLOSED.name" @if(issue.state == State.CLOSED){data-selected="true" class="active"}><a href="javascript:void(0)">@Messages("issue.state.closed")</a></li>
@@ -105,9 +95,11 @@
 		<li class="option">
              <div class="option-label">@Messages("issue.new.detailInfo.assignee")</div>
              <div class="option-desc">
-				<div id="assignee" class="btn-group" data-name="assignee.user.id">
-					<button data-toggle="dropdown" class="btn dropdown-toggle d-label bgwhite">@Messages("issue.new.selectDefault.assignee")</button>
-					<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
+             	<div id="assignee" class="btn-group" data-name="assignee.user.id">
+					<button class="btn dropdown-toggle large" data-toggle="dropdown">
+						<span class="d-label">@Messages("issue.new.selectDefault.assignee")</span>
+						<span class="d-caret"><span class="caret"></span></span>
+					</button>
 					<ul class="dropdown-menu">
 						@ProjectUser.options(project.id).map{ v =>
 						<li data-value="@v._1" @if(issue.assignee != null && issue.assignee.user.id.toString() == v._1){data-selected="true" class="active"}><a href="javascript:void(0)">@v._2</a></li>
@@ -123,8 +115,10 @@
              <div class="option-label">@Messages("issue.new.detailInfo.milestone")</div>
              <div class="option-desc">
 				<div id="milestoneId" class="btn-group" data-name="milestoneId">
-					<button data-toggle="dropdown" class="btn dropdown-toggle d-label bgwhite">@Messages("issue.new.selectDefault.milestone")</button>
-					<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
+					<button class="btn dropdown-toggle large" data-toggle="dropdown">
+						<span class="d-label">@Messages("issue.new.selectDefault.milestone")</span>
+						<span class="d-caret"><span class="caret"></span></span>
+					</button>
 					<ul class="dropdown-menu">
 						@Milestone.options(project.id).map{ v =>
 						<li data-value="@v._1" @if(issue.milestone != null && issue.milestone.id.toString() == v._1){data-selected="true" class="active"}><a href="javascript:void(0)">@v._2</a></li>
@@ -136,48 +130,19 @@
 		}
 	</ul>
 	
-	@**
-	<fieldset class="labels">
-      @if(isAllowed(UserApp.currentUser(), issue.stateAsResource(), Operation.UPDATE)){
-            @select(
-                issueForm("state"),
-                options(State.OPEN.name -> "Open", State.CLOSED.name -> "Closed"),
-                '_label-> Messages("issue.state"),
-                '_showConstraints -> false)
-            }
-      @if(isAllowed(UserApp.currentUser(), issue.assigneeAsResource(), Operation.UPDATE)){
-            @select(
-                issueForm("assignee.user.id"),
-                options(ProjectUser.options(project.id)),
-                '_label-> Messages("issue.new.detailInfo.assignee"),
-                '_default -> Messages("issue.new.selectDefault.assignee"),
-                '_showConstraints -> false)
-            }
-      @if(isAllowed(UserApp.currentUser(), issue.milestoneAsResource(), Operation.UPDATE)){
-            @select(
-                issueForm("milestoneId"),
-                options(Milestone.options(project.id)),
-                '_label-> Messages("issue.new.detailInfo.milestone"),
-                '_default -> Messages("issue.new.selectDefault.milestone"),
-                '_showConstraints -> false)
-            }
-    </fieldset>
-    **@	
-
 	<!-- issue.label js module appends a label selector here. -->
 	<p class="option-label">@Messages("label.select")</p>
 	<fieldset class="labels issue-form-labels form-horizontal bubble-wrap gray"></fieldset>
 
 	<div class="actions">
-		<button type="submit" class="btn-transparent n-btn orange med">@Messages("button.save")</button>
-		<a href="javascript:history.back();" class="n-btn gray med cancel">@Messages("button.cancel")</a>
-		<!-- 
-			<a href="@routes.IssueApp.issues(project.owner, project.name, "all")" class="n-btn gray med">@Messages("button.cancel")</a>
-		-->
+	 	<button type="submit" class="nbtn orange medium">@Messages("button.save")</button><!--
+	 --><a href="javascript:history.back();" class="nbtn medium last">@Messages("button.cancel")</a> 
 	</div>
+	@** <!-- @routes.IssueApp.issues(project.owner, project.name, "all") --> **@
 
-  } @** end of form **@
-  </div>
+	} @** end of form **@
+	</div>
+</div>
 
 @markdown()
 
@@ -202,5 +167,5 @@
 		});
 	});
 </script>
-</div>
+
 }
app/views/issue/issue.scala.html
--- app/views/issue/issue.scala.html
+++ app/views/issue/issue.scala.html
@@ -18,198 +18,182 @@
 
 @main(getTitle(issue, project).toString(), project, utils.MenuType.ISSUE){
 <div class="page board-view">
-  @prjmenu(project, utils.MenuType.ISSUE, "main-menu-only")
+	@prjmenu(project, utils.MenuType.ISSUE, "main-menu-only")
   
-  @** Post Info **@
-  <div class="board-header issue">
-    <div class="board-id div"><strong class="secondary-txt">#@issue.getNumber</strong></div>
-    <h1 class="title div">@issue.title</h1>
-    <div class="date div">@agoString(issue.ago)</div>
-	<div class="div">
-		<span class="badge badge-issue-@issue.state.state.toLowerCase">@Messages("issue.state." + issue.state.state)</span>
+	@** Post Info **@
+	<div class="board-header issue">
+		<div class="board-id div"><strong class="secondary-txt">#@issue.getNumber</strong></div>
+		<h1 class="title div">@issue.title</h1>
+		<div class="date div">@agoString(issue.ago)</div>
+		<div class="div">
+			<span class="badge badge-issue-@issue.state.state.toLowerCase">@Messages("issue.state." + issue.state.state)</span>
+		</div>
 	</div>
-  </div>
   
-  @** Content body **@
-  <div class="board-body">
-    <div class="author-info">
-      <a href="@routes.UserApp.userInfo(issue.authorLoginId)" class="avatar-wrap pull-left img-rounded">
-      	<img class="user-picture" src="@User.findByLoginId(issue.authorLoginId).avatarUrl" width="32" height="32" alt="@issue.authorName">
-      </a>
-      <div class="media-body">
-		
-      	@** author **@
-        <p>
-          @Messages("issue.author") 
-          <a href="@routes.IssueApp.newIssueForm(project.owner, project.name)" @if(issue.assigneeName != null){ class="gray-txt" }>
-          	<strong>@Option(issue.authorLoginId).orElse(Option(Messages("issue.noAuthor"))).get</strong>
-          </a> <!--<span class="name">(Loren Brichter)</span>-->
-          &nbsp;&middot;&nbsp;
-          @Messages("issue.assignee")
-          @if(issue.assigneeName == null){ 
-          <a href="@if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)#options} else {#}" class="gray-txt">
-			<strong>@Messages("issue.noAssignee")</strong>
-          </a>
-          } else {
-          
-          	<a href="@routes.IssueApp.issues(project.owner, project.name, "open")&assigneeId=@issue.assignee.user.id">
-          		<strong>@issue.assigneeName</strong>
-          	</a>
-          }
-        </p>
+	@** Content body **@
+	<div class="board-body">
+		<div class="author-info">
+			<a href="@routes.UserApp.userInfo(issue.authorLoginId)" class="avatar-wrap pull-left">
+				<img src="@User.findByLoginId(issue.authorLoginId).avatarUrl" width="32" height="32" alt="@issue.authorName">
+			</a>
+			<div class="media-body">
+				<p>
+					@**<!-- author  -->**@
+					@Messages("issue.author") 
+					<a href="@routes.IssueApp.newIssueForm(project.owner, project.name)" @if(issue.assigneeName != null){ class="gray-txt" }>
+						<strong>@Option(issue.authorLoginId).orElse(Option(Messages("issue.noAuthor"))).get</strong>
+					</a>
+					&nbsp;&middot;&nbsp;
+					
+					@**<!-- assignee  -->**@
+					@Messages("issue.assignee")
+					@if(issue.assigneeName == null){ 
+					<a href="@if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)#options} else {#}" class="gray-txt">
+						<strong>@Messages("issue.noAssignee")</strong>
+					</a>
+					} else {
+					<a href="@routes.IssueApp.issues(project.owner, project.name, "open")&assigneeId=@issue.assignee.user.id">
+						<strong>@issue.assigneeName</strong>
+					</a>
+					}
+				</p>
         
-		@** status **@
-        <p>
-			@Messages("comment") <strong class="num">@issue.comments.size</strong>
-			
-			@Messages("milestone")
-			@if(issue.milestone != null) {
-				<strong class="num">@issue.milestone.title</strong>
-			} else {
-				<a href="@if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)#options} else {#}" class="gray-txt"><strong>@Messages("none")</strong></a>
-			}
-        </p>
-        
-      </div>
-    </div>
-    <div class="content" markdown="true">@issue.body</div>
-    <div class="attachments" resourceType="@ResourceType.ISSUE_POST" resourceId="@issue.id">
-    @**<!-- 
-      <ul class="attaches wm">
-        <li class="attach"><i class="ico ico-clip"></i>K23.png (11KB)</li>
-        <li class="attach"><i class="ico ico-clip"></i>K23.png (11KB)</li>
-        <li class="attach"><i class="ico ico-clip"></i>K23.png (11KB)</li>
-      </ul>-->**@
+				@** status **@
+				<p>
+					@**<!-- comment  
+					@Messages("comment") <strong class="num">@issue.comments.size</strong>
+					-->**@
+					
+					@**<!-- milestone  -->**@
+					@Messages("milestone")
+					@if(issue.milestone != null) {
+						<strong class="num">@issue.milestone.title</strong>
+					} else {
+						<a href="@if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)#options} else {#}" class="gray-txt"><strong>@Messages("none")</strong></a>
+					}
+				</p>
+			</div>
+    	</div>
+    	<div class="content" markdown="true">@issue.body</div>
+    	<div class="attachments" resourceType="@ResourceType.ISSUE_POST" resourceId="@issue.id"></div>
 	</div>
-
-  </div>
-  <div class="board-footer board-actrow">
-  
-	@** labels **@
-	<p class="labels-wrap">
+	
+	<div class="board-footer board-actrow">
+		@** labels **@
+		<p class="labels-wrap pull-left">
 		@for(label <- issue.labels.toList.sortBy(r => (r.category, r.name))) { 
 			<button class="issue-label" data-labelId="@label.id" style="background-color:@label.color">@label.name</button> 
 		}
-	</p>
+		</p>
   
-  @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
-	<a href="@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)" class="n-btn orange med">@Messages("button.edit")</a>
-  }
-  @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.DELETE)) {
-   	<a href="#deleteConfirm" data-toggle="modal" class="n-btn light-gray med">@Messages("button.delete")</a>
-  }
-    <a href="@routes.IssueApp.issues(project.owner, project.name,"open")" class="n-btn gray med">@Messages("button.list")</a>
-  </div>
+		@if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
+		<a href="@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)" class="nbtn medium orange">@Messages("button.edit")</a>
+		}
+		
+		@if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.DELETE)) {
+		<a href="#deleteConfirm" data-toggle="modal" class="nbtn medium black">@Messages("button.delete")</a>
+		}
+		
+		<a href="@routes.IssueApp.issues(project.owner, project.name,"open")" class="nbtn medium last">@Messages("button.list")</a>
+	</div>
 
-@** Comment **@
-<div class="board-comment-wrap">
-    <div class="comment-header"><strong>@Messages("comment")</strong> <strong class="num">@issue.comments.size</strong></div>
+	@** Comment **@
+	<div class="board-comment-wrap">
+		<div class="comment-header"><strong>@Messages("comment")</strong> <strong class="num">@issue.comments.size</strong></div>
     
-    @if(issue.comments.size > 0) {
-    <ul class="comments">
-      @for(comment <- issue.comments){
-      <li class="comment">
-        <a href="@routes.UserApp.userInfo(comment.authorLoginId)" class="pull-left img-rounded avatar-wrap">
-        	<img class="user-picture" src="@User.findByLoginId(comment.authorLoginId).avatarUrl" width="32" height="32" alt="@comment.authorLoginId">
-        </a>
-        <div class="media-body">
-          @if(isAllowed(UserApp.currentUser(), comment.asResource(), Operation.DELETE)){
-          <a class="pull-right close" href="@routes.IssueApp.deleteComment(project.owner, project.name, issue.id, comment.id)">&times;</a>
-          }
-            <p class="commenter">
-                <a href="@routes.UserApp.userInfo(comment.authorLoginId)"><strong>@comment.authorLoginId</strong></a>
-                <span class="date"> @utils.TemplateHelper.agoString(comment.ago())</span>
-            </p>
-            <div class="comment-body" markdown="true">@comment.contents</div>
-            <div class="attachments" resourceType="@ResourceType.ISSUE_COMMENT" resourceId="@comment.id"></div>
-            <!--
-            <ul class="attaches">
-                <li class="attach"><i class="ico ico-clip"></i><a href="/file-down">첨부파일(iabcde-test.exe) <i class="ico ico-blue-dot"></i> Donwload</a></li>
-            </ul>-->
-        </div>
-      </li>
-      }
-    </ul>
-    }
-    
-@if(isCreatable(User.findByLoginId(session.get("loginId")), project, models.enumeration.ResourceType.BOARD_POST)){
-    <div class="write-comment-box">
+	@if(issue.comments.size > 0) {
+		<ul class="comments">
+		@for(comment <- issue.comments){
+			<li class="comment">
+				<a href="@routes.UserApp.userInfo(comment.authorLoginId)" class="avatar-wrap pull-left">
+		        	<img src="@User.findByLoginId(comment.authorLoginId).avatarUrl" width="32" height="32" alt="@comment.authorLoginId">
+	        	</a>
+				<div class="media-body">
+					@if(isAllowed(UserApp.currentUser(), comment.asResource(), Operation.DELETE)){
+					<a class="pull-right close" href="@routes.IssueApp.deleteComment(project.owner, project.name, issue.id, comment.id)">&times;</a>
+					}
+					
+					<p class="commenter">
+						<a href="@routes.UserApp.userInfo(comment.authorLoginId)"><strong>@comment.authorLoginId</strong></a>
+						<span class="date"> @utils.TemplateHelper.agoString(comment.ago())</span>
+					</p>
+					<div class="comment-body" markdown="true">@comment.contents</div>
+					<div class="attachments" resourceType="@ResourceType.ISSUE_COMMENT" resourceId="@comment.id"></div>
+				</div>
+			</li>
+		}
+		</ul>
+	}
+
+	@if(isCreatable(User.findByLoginId(session.get("loginId")), project, models.enumeration.ResourceType.BOARD_POST)){
 		@form(routes.IssueApp.newComment(project.owner, project.name, issue.id), 'id -> "comment-form", 'enctype -> "multipart/form-data"){
-		<div class="write-comment-wrap">
-			<textarea id="comment-editor" name="contents" class="text comment" markdown="true"></textarea>
-			<button class="comment-btn">@Messages("button.comment.new")</button>
-		</div>
-        
-		<div class="attach-wrap">
-			<div class="pull-left img-rounded avatar-wrap">
-			@if(UserApp.currentUser() != UserApp.anonymous) {
-				<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" class="img-rounded" width="32" height="32" alt="avatar">
-			} else {
-				<img src="@routes.Assets.at("images/default-avatar-34.png")" class="img-rounded" width="32" height="32" alt="avatar">
-			}
+		<div class="write-comment-box">
+			<div class="write-comment-wrap">
+				<textarea id="comment-editor" name="contents" class="text comment" markdown="true"></textarea>
+				<button class="comment-btn">@Messages("button.comment.new")</button>
 			</div>
-			
-			@** fileUploader **@
-            @if(UserApp.currentUser() != UserApp.anonymous) {
-
-			<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.ISSUE_COMMENT">
-				<div>
-					<span class="progress-num">0%</span> <span class="sp-line">&nbsp;</span>
-					<strong>total</strong> <span class="total-num">0Mb</span>
+	        
+	        @** fileUploader **@
+		    @if(UserApp.currentUser() != UserApp.anonymous) {
+			<div class="attach-wrap">
+				<div class="avatar-wrap">
+					<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" width="32" height="32">
 				</div>
-				<div class="progress-wrap">
-					<div class="progress n4">
-						<div class="bar orange" style="width: 0%;"></div>
+				<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.ISSUE_COMMENT">
+					<div>
+						<span class="progress-num">0%</span> <span class="sp-line">&nbsp;</span>
+						<strong>total</strong> <span class="total-num">0Mb</span>
+					</div>
+					<div class="progress-wrap">
+						<div class="progress n4">
+							<div class="bar orange" style="width: 0%;"></div>
+						</div>
 					</div>
 				</div>
-				<!-- <a href="#!/cancel"><i class="ico btn-cancel"></i></a> -->
-			</div>
-			
-			<div class="btn-wrap">
-				<div class="fake-file-wrap">
-					<input type="file" class="file" name="filePath" size="1">
-					<div class="ns-btn">
-						<i class="ico ico-plus-blue"></i>@Messages("button.upload")
+				<div class="btn-wrap">
+					<div class="nbtn medium white fake-file-wrap">
+						<i class="ico ico-plus-blue"></i>@Messages("button.upload")<!-- 
+					--> <input type="file" class="file" name="filePath">
 					</div>
 				</div>
+			</div>
+			<div class="attached-files-wrap">
+				<ul class="attached-files"></ul>
 			</div>
 			}
 			@** end of fileUploader **@
-        
 		</div>
-		} @** end of comment form **@
-		<div class="attached-files-wrap">
-           <ul class="attached-files"></ul>
+		}
+		@** end of form **@
+	} else {
+		<div class="write-comment-box">
+			<div class="write-comment-wrap">
+				<textarea class="text comment disabled" disabled="disabled">@Messages("auth.unauthorized.comment")</textarea>
+				<button class="comment-btn disabled">@Messages("button.comment.new")</button>
+			</div>
 		</div>
-  </div>
-  <script type="text/template" id="tplAttachedFile"><!--
-	--><li class="attached-file" data-name="${fileName}" data-href="${fileHref}" data-mime="${mimeType}" data-size="${fileSize}">
-		<strong>${fileName}(${fileSizeReadable})</strong><!--
-		--><a class="attached-delete"><i class="ico btn-delete"></i></a>
-	</li>
-  </script>
-@** end of write-comment-box **@
-} else {
-	<div class="write-comment-box">
-		<div class="write-comment-wrap">
-			<textarea class="text comment disabled" disabled="disabled">@Messages("auth.unauthorized.comment")</textarea>
-			<button class="comment-btn disabled">@Messages("button.comment.new")</button>
-		</div>
+	}
 	</div>
-}
+	@** // Comment **@
 </div>
 
-@**
+<script type="text/template" id="tplAttachedFile"><!--
+	--><li class="attached-file" data-name="${fileName}" data-href="${fileHref}" data-mime="${mimeType}" data-size="${fileSize}">
+	<strong>${fileName}(${fileSizeReadable})</strong><!--
+	--><a class="attached-delete"><i class="ico btn-delete"></i></a></li>
+</script>
+
+@**<!-- 
 <div class="board-footer">
   @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
-	<a href="@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)" class="n-btn orange med">@Messages("button.edit")</a>
+	<a href="@routes.IssueApp.editIssueForm(project.owner, project.name, issue.id)" class="nbtn orange medium">@Messages("button.edit")</a>
   }
   @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.DELETE)) {
-	<a href="#deleteConfirm" data-toggle="modal" class="n-btn light-gray med">@Messages("button.delete")</a>
+	<a href="#deleteConfirm" data-toggle="modal" class="nbtn medium black">@Messages("button.delete")</a>
   }
-	<a href="@routes.IssueApp.issues(project.owner, project.name,"open")" class="n-btn gray med">@Messages("button.list")</a>
+	<a href="@routes.IssueApp.issues(project.owner, project.name,"open")" class="nbtn medium">@Messages("button.list")</a>
 </div>
-**@
+ -->**@
 
 @** Confirm to delete post **@
 <div id="deleteConfirm" class="modal hide fade">
@@ -226,7 +210,7 @@
 	</div>
 </div>
 
-@views.html.markdown()
+@markdown()
 
 <script type="text/javascript">
 	$(document).ready(function(){
app/views/issue/issueList.scala.html
--- app/views/issue/issueList.scala.html
+++ app/views/issue/issueList.scala.html
@@ -147,10 +147,8 @@
 }
 
 	<div class="write-btn-wrap">
-		<a href="@routes.IssueApp.issues(project.owner, project.name, param.state, "xls")" class="n-btn med white btn-save-xls">
-            <i class="ico ico-download"></i>@Messages("issue.downloadAsExcel")
-        </a>
-		<a href="@routes.IssueApp.newIssueForm(project.owner, project.name)" class="n-btn med orange">@Messages("issue.menu.new")</a>
+		<a href="@routes.IssueApp.issues(project.owner, project.name, param.state, "xls")" class="nbtn medium white pull-left"><i class="ico ico-download"></i>@Messages("issue.downloadAsExcel")</a>
+		<a href="@routes.IssueApp.newIssueForm(project.owner, project.name)" class="nbtn medium orange">@Messages("issue.menu.new")</a>
 	</div>
 
 	<div id="pagination">
app/views/issue/newIssue.scala.html
--- app/views/issue/newIssue.scala.html
+++ app/views/issue/newIssue.scala.html
@@ -10,85 +10,75 @@
 
 @main(Messages(title), project, utils.MenuType.ISSUE) {
 <div class="page">
-  @prjmenu(project, utils.MenuType.ISSUE, "main-menu-only")
+	@prjmenu(project, utils.MenuType.ISSUE, "main-menu-only")
   
-  <div class="content-wrap frm-wrap">
+	<div class="content-wrap frm-wrap">
     
-    @form(action = routes.IssueApp.newIssue(project.owner, project.name), 'id -> "issue-form", 'enctype -> "multipart/form-data") {
-    
+	@form(action = routes.IssueApp.newIssue(project.owner, project.name), 'id -> "issue-form", 'enctype -> "multipart/form-data") {
     <dl>
-    	<dt>
-	      <div id="warning" class="n-alert hide">
-	        <div class="n-inner">
-	          <span class="msg">제목과 본문에 빈칸이 있습니다.</span>
-	          <a href="#" class="ico btn-delete"></a>
-	        </div>
-	      </div>
-	      <label for="title">@Messages("post.new.title")</label>
+		<dt>
+			<label for="title">@Messages("post.new.title")</label>
     	</dt>
     	<dd>
     		<input type="text" id="title" name="title" value="" class="text title" maxlength="250" tabindex="1">
-    		@**helper.inputText(issueForm("title"), 'class->"text title", 'maxlength -> "250", 'tabindex -> 1, '_showConstraints -> false)**@
     	</dd>
+    	<dd>
+			<textarea id="body" name="body" markdown="true" class="text content" tabindex="2"></textarea>
+		</dd>
     </dl>
-    @** 'onkeypress -> "return event.keyCode !== 13" **@
 
-	<textarea id="body" name="body" markdown="true" class="text content" tabindex="2"></textarea>
-	@** helper.textarea(issueForm("body"), 'markdown -> true, 'class->"text content", 'tabindex -> 2, '_showConstraints -> false) **@
-
+	@** fileUploader **@
+    @if(UserApp.currentUser() != UserApp.anonymous) {
 	<div class="content-footer">
-		@** fileUploader **@
-	    @if(UserApp.currentUser() != UserApp.anonymous) {
-	    
 		<div class="attach-wrap">
 			<div class="avatar-wrap">
-				<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" class="img-rounded" width="32" height="32" alt="avatar">
+				<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" width="32" height="32">
 			</div>
-			
 			<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.ISSUE_POST">
 				<div>
 					<span class="progress-num">0%</span> <span class="sp-line">&nbsp;</span>
-					<strong>total</strong> <span class="total-num">0MB</span>
+					<strong>total</strong> <span class="total-num">0Mb</span>
 				</div>
 				<div class="progress-wrap">
 					<div class="progress n4">
 						<div class="bar orange" style="width: 0%;"></div>
 					</div>
 				</div>
-				<!-- <a href="#!/cancel"><i class="ico btn-cancel"></i></a> -->
 			</div>
-		
+
 			<div class="btn-wrap">
-				<div class="ns-btn fake-file-wrap">
-					<i class="ico ico-plus-blue"></i>@Messages("button.upload") <input type="file" class="file" name="filePath">
+				<div class="nbtn medium white fake-file-wrap">
+					<i class="ico ico-plus-blue"></i>@Messages("button.upload")<!-- 
+				--> <input type="file" class="file" name="filePath">
 				</div>
 			</div>
 		</div>
 		<script type="text/template" id="tplAttachedFile"><!--
-			--><li class="attached-file" data-name="${fileName}" data-href="${fileHref}" data-mime="${mimeType}" data-size="${fileSize}">
-			<strong>${fileName}(${fileSizeReadable})</strong><!--
-			--><a class="attached-delete"><i class="ico btn-delete"></i></a><!--
-			--></li>
-		</script>
-	
+				--><li class="attached-file" data-name="${fileName}" data-href="${fileHref}" data-mime="${mimeType}" data-size="${fileSize}">
+				<strong>${fileName}(${fileSizeReadable})</strong><!--
+				--><a class="attached-delete"><i class="ico btn-delete"></i></a></li>
+			</script>
+
 		<div class="attached-files-wrap">
 			<ul class="attached-files"></ul>
 		</div>
+	</div>
 	}
 	@** end of fileUploader **@
-    </div>
 
 	<br>
-	
+
 	<!-- issue options -->
-	<ul class="options unstyled issue-options">
+	<ul id="options" class="options unstyled issue-options">
 		@if(isCreatable(UserApp.currentUser(), project, ResourceType.ISSUE_ASSIGNEE)) {
 		<li class="option">
              <div class="option-label">@Messages("issue.new.detailInfo.assignee")</div>
              <div class="option-desc">
-				<div id="assignee" class="btn-group" data-name="assignee.user.id">
-					<button data-toggle="dropdown" class="btn dropdown-toggle d-label bgwhite">@Messages("issue.new.selectDefault.assignee")</button>
-					<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
+             	<div id="assignee" class="btn-group" data-name="assignee.user.id">
+					<button class="btn dropdown-toggle large" data-toggle="dropdown">
+						<span class="d-label">@Messages("issue.new.selectDefault.assignee")</span>
+						<span class="d-caret"><span class="caret"></span></span>
+					</button>
 					<ul class="dropdown-menu">
 						@ProjectUser.options(project.id).map{ v =>
 						<li data-value="@v._1"><a href="javascript:void(0)">@v._2</a></li>
@@ -104,8 +94,10 @@
              <div class="option-label">@Messages("issue.new.detailInfo.milestone")</div>
              <div class="option-desc">
 				<div id="milestoneId" class="btn-group" data-name="milestoneId">
-					<button data-toggle="dropdown" class="btn dropdown-toggle d-label bgwhite">@Messages("issue.new.selectDefault.milestone")</button>
-					<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
+					<button class="btn dropdown-toggle large" data-toggle="dropdown">
+						<span class="d-label">@Messages("issue.new.selectDefault.milestone")</span>
+						<span class="d-caret"><span class="caret"></span></span>
+					</button>
 					<ul class="dropdown-menu">
 						@Milestone.options(project.id).map{ v =>
 						<li data-value="@v._1"><a href="javascript:void(0)">@v._2</a></li>
@@ -115,48 +107,23 @@
              </div>
 		</li>
 		}
-	</ul>  
+	</ul>
 	
-	@**
-	<fieldset class="labels">
-		@if(isCreatable(UserApp.currentUser(), project, ResourceType.ISSUE_ASSIGNEE)) {
-			@select(
-				issueForm("assignee.user.id"),
-				options(ProjectUser.options(project.id)),
-				'_label-> Messages("issue.new.detailInfo.assignee"),
-				'_default -> Messages("issue.new.selectDefault.assignee"),
-				'_showConstraints -> false)
-		}
-
-		@if(isCreatable(UserApp.currentUser(), project, ResourceType.ISSUE_MILESTONE)) {
-			@select(
-				issueForm("milestoneId"),
-				options(Milestone.options(project.id)),
-				'_label-> Messages("issue.new.detailInfo.milestone"),
-				'_default -> Messages("issue.new.selectDefault.milestone"),
-				'_showConstraints -> false)
-		}
-	</fieldset>
-	**@
-
 	<!-- issue.label js module appends a label selector here. -->
 	<p class="option-label">@Messages("label.select")</p>
 	<fieldset class="labels issue-form-labels form-horizontal bubble-wrap gray"></fieldset>
 	
 	<div class="actions">
-      <button type="submit" class="btn-transparent n-btn orange med">@Messages("button.save")</button><!-- 
-   --><a href="javascript:history.back();" class="n-btn gray med cancel">@Messages("button.cancel")</a>
-   <!-- 
-      <a href="@routes.IssueApp.issues(project.owner, project.name, "all")" class="n-btn gray med">@Messages("button.cancel")</a>
-   -->
-  </div>
+	 	<button type="submit" class="nbtn orange medium">@Messages("button.save")</button><!--
+	 --><a href="javascript:history.back();" class="nbtn medium last">@Messages("button.cancel")</a> 
+	</div>
+	@** <!-- @routes.IssueApp.issues(project.owner, project.name, "all") --> **@
 
-  } @** end of form **@
-  </div>
+	} @** end of form **@
+	</div>
+</div>
 
 @markdown()
-
-</div>
 
 <script type="text/javascript">
 	$(document).ready(function(){
app/views/login.scala.html
--- app/views/login.scala.html
+++ app/views/login.scala.html
@@ -1,41 +1,47 @@
-@(message:String, userForm:Form[User])
+@(message:String, userForm:Form[User]) @home(message, utils.MenuType.NONE) {
 
-@home(message, utils.MenuType.NONE) {
+<div class="page full">
+	<div class="center-wrap tag-line-wrap login">
+		<h1 class="title">
+			<span class="high-light">Log In for</span> HIVE
+		</h1>
+		<p class="tag-line">Software development platform for Open Source project.</p>
+	</div>
+	<div class="login-form-wrap frm-wrap">
+		<form action="@routes.UserApp.login()" method="POST">
+			<dl>
+				<dt>
+					<label for="loginId">@Messages("user.loginId")</label>
+				</dt>
+				<dd>
+					<input id="loginId" name="loginId" type="text" class="text email" autocomplete="off">
+				</dd>
 
-	<div class="page full">
-        <div class="center-wrap tag-line-wrap login">
-            <h1 class="title"><span class="high-light">Log In for</span> HIVE</h1>
-            <p class="tag-line">Software development platform for Open Source project.</p>
-        </div>
-        <div class="login-form-wrap frm-wrap">
-            <form action="@routes.UserApp.login()" method="POST">
-            	<dl>
-            		<dt>
-            			<label for="loginId">@Messages("user.loginId")</label>
-            		</dt>
-            		<dd>
-						<input type="text" class="text email" id="loginId" autocomplete="off" name="loginId">
-					</dd>
-					
-					<dt>
-						<label for="password">@Messages("user.password")</label>
-					</dt>
-					<dd>
-						<input type="password" class="text password" id="password" autocomplete="off" name="password">
-					</dd>
-            	</dl>
+				<dt>
+					<label for="password">@Messages("user.password")</label>
+				</dt>
+				<dd>
+					<input id="password" name="password" type="password" class="text password" autocomplete="off">
+				</dd>
+			</dl>
 
-                <div class="act-row right-txt">
-                    <input type="checkbox" class="checkbox" autocomplete="off" id="remember-me" name="rememberMe"><label for="remember-me" class="bg-checkbox">@Messages("title.rememberMe")</label>
-                    <a href="@routes.PasswordResetApp.lostPassword()" class="forgot-password"><span class="label ">@Messages("title.forgotpassword")</span></a>
-                </div>
-                
-                <div class="btns-row">
-                    <button type="submit" class="n-btn orange log-in"><i class="ico ico-user-white"></i>@Messages("button.login")</button><!--
-                 --><a href="@routes.UserApp.signupForm()" class="n-btn blue join"><i class="ico ico-join"></i>@Messages("title.signup")</a>
-                </div>
-            </form>
-        </div>
-    </div>
-    
+			<div class="act-row right-txt">
+				<input id="remember-me" type="checkbox" name="rememberMe" class="checkbox" autocomplete="off"><!-- 
+			 --><label for="remember-me" class="bg-checkbox">@Messages("title.rememberMe")</label>
+			  
+			 	<a href="@routes.PasswordResetApp.lostPassword()" class="forgot-password"> 
+					<span class="label">@Messages("title.forgotpassword")</span>
+			 	</a>
+			</div>
+
+			<div class="btns-row">
+				<button type="submit" class="nbtn orange medium">
+					<i class="ico ico-user-white"></i>@Messages("button.login")
+				</button><!--
+			 --><a href="@routes.UserApp.signupForm()" class="nbtn medium"><i class="ico ico-join"></i>@Messages("title.signup")</a>
+			</div>
+		</form>
+	</div>
+</div>
+
 }
app/views/milestone/create.scala.html
--- app/views/milestone/create.scala.html
+++ app/views/milestone/create.scala.html
@@ -25,8 +25,8 @@
             	</dl>
 
                 <div class="actions">
-                    <button type="submit" class="n-btn orange med btn-transparent save">@Messages("button.save")</button>
-                    <a href="@routes.MilestoneApp.manageMilestones(projectInst.owner, projectInst.name)" class="n-btn gray med">@Messages("button.cancel")</a>
+                    <button type="submit" class="nbtn orange medium">@Messages("button.save")</button>
+                    <a href="@routes.MilestoneApp.milestones(projectInst.owner, projectInst.name)" class="nbtn medium">@Messages("button.cancel")</a>
                 </div>
             </div>
             
app/views/milestone/edit.scala.html
--- app/views/milestone/edit.scala.html
+++ app/views/milestone/edit.scala.html
@@ -5,7 +5,6 @@
 @implicitField = @{ helper.FieldConstructor(simpleForm) }
 
 @project.projectMngMain(title, projectInst) {
-
 @prjmenu(projectInst, utils.MenuType.MILESTONE, "")
 
 <div class="form-wrap milestone frm-wrap">
@@ -13,13 +12,7 @@
 	<div class="inner left">
 		<dl>
 			<dt>
-				<div class="n-alert hide" id="title_error">
-					<div class="n-inner">
-						<span class="msg">제목을 입력해주세요.</span>
-						<a href="#!/close" class="ico btn-delete"></a>
-					</div>
-				</div>
-				<label for="title">마일스톤 제목</label>
+				<label for="title">@Messages("milestone.form.title")</label>
 			</dt>
 			<dd>
 				@helper.input(form("title")){(id, name, value, args) =>
@@ -28,13 +21,7 @@
 			</dd>
 	
 			<dt>
-				<div class="n-alert hide" id="contents_error">
-					<div class="n-inner">
-						<span class="msg">내용</span>
-						<a href="#!/close" class="ico btn-delete"></a>
-					</div>
-				</div>
-				<label for="contents">내용을 입력해주세요</label>
+				<label for="contents">@Messages("milestone.form.content")</label>
 			</dt>
 			<dd>
 				@helper.input(form("contents")){(id, name, value, args) =>
@@ -44,25 +31,19 @@
 		</dl>
 
 		<div class="actions">
-			<button type="submit" class="n-btn orange med btn-transparent save">SAVE</button>
-			<a href="@routes.MilestoneApp.manageMilestones(projectInst.owner, projectInst.name)" class="n-btn gray med">CANCEL</a>
+			<button type="submit" class="nbtn orange medium">@Messages("button.save")</button>
+			<a href="@routes.MilestoneApp.milestones(projectInst.owner, projectInst.name)" class="nbtn medium">@Messages("button.cancel")</a>
 		</div>
 	</div>
 
 	<div class="inner right bubble-wrap dark-gray">
-		<p>마일스톤 상태</p>
+		<p>@Messages("milestone.form.state")</p>
 		<div>
 			<input type="radio" name="state" value="@State.OPEN" id="milestone-open" class="radio-btn" @if(form("state").value.equals(State.OPEN.name)) { checked="checked" }><label for="milestone-open" class="bold">Open</label>&nbsp;
 			<input type="radio" name="state" value="@State.CLOSED" id="milestone-close" class="radio-btn" @if(form("state").value.equals(State.CLOSED.name)) { checked="checked" }><label for="milestone-close" class="bold">Closed</label>
 		</div>
 		<hr/>
-		<p>완료일을 선택하세요</p>
-		<div class="n-alert hidden">
-			<div class="n-inner">
-				<span class="msg">완료일을 입력해주세요.</span>
-				<a href="#!/close" class="ico btn-delete"></a>
-			</div>
-		</div>
+		<p>@Messages("milestone.form.dueDate")</p>
 		<label for="dueDate">
 			@helper.input(form("dueDate")){(id, name, value, args) =>
 			<input type="text" name="@name" id="@id" class="validate due-date" value="@value">
app/views/milestone/list.scala.html
--- app/views/milestone/list.scala.html
+++ app/views/milestone/list.scala.html
@@ -125,8 +125,8 @@
                 </div>
                 
                 <div class="actrow">
-                	<a href="@routes.MilestoneApp.editMilestoneForm(projectInst.owner, projectInst.name, milestone.id)" class="nbtn medium white">@Messages("button.edit")</a>
-                	<a href="@routes.MilestoneApp.editMilestoneForm(projectInst.owner, projectInst.name, milestone.id)" class="nbtn medium black">@Messages("button.delete")</a>
+                	<a href="@routes.MilestoneApp.editMilestoneForm(projectInst.owner, projectInst.name, milestone.id)" class="nbtn medium black"><i class="ico ico-delete-small"></i>@Messages("button.delete")</a><!-- 
+                 --><a href="@routes.MilestoneApp.editMilestoneForm(projectInst.owner, projectInst.name, milestone.id)" class="nbtn medium white"><i class="ico ico-edit-small"></i>@Messages("button.edit")</a>
                 </div>
             </div>
             <div class="completion-rate @if(milestone.getCompletionRate == 100){done}"><!-- 
 
app/views/milestone/manage.scala.html (deleted)
--- app/views/milestone/manage.scala.html
@@ -1,78 +0,0 @@
-@(message: String, milestones: List[models.Milestone], projectInst: Project, mCondition: MilestoneApp.MilestoneCondition)
-@import scala.collection.immutable._
-@import utils.TemplateHelper._
-@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)) {
-        if(mCondition.direction.equals("desc")){
-            "▼"
-        } else {
-            "▲"
-        }
-    }
-}
-@makeSortLink(_sort:String) = @{
-    var _direction = "asc";
-        if(mCondition.sort.equals(_sort)) {
-            if(_direction.equals(mCondition.direction)) {
-            _direction = "desc"
-        }
-    }
-    buildQueryString(routes.MilestoneApp.manageMilestones(projectInst.owner, projectInst.name),
-      Map("sort"-> _sort, "direction"-> _direction)
-    )
-}
-
-@project.projectMngMain(message, projectInst) {
-	@prjmenu(projectInst, utils.MenuType.MILESTONE, "")
-	
-	@if(milestones == null || milestones.isEmpty()){
-	
-	<div class="error-wrap">
-		<i class="ico ico-err1"></i>
-		<p>@Messages("milestone.is.empty")</p>
-	</div>
-	
-    } else {
-    
-    <div class="tab-wrap">
-        <div class="pull-right btns">
-            <a href="@routes.MilestoneApp.manageMilestones(projectInst.owner, projectInst.name)" class="n-btn small gray">@Messages("milestone.menu.manage")</a>
-            <a href="@routes.MilestoneApp.newMilestoneForm(projectInst.owner, projectInst.name)" class="n-btn small orange">@Messages("milestone.menu.new")</a>
-        </div>
-        
-        <ul class="nav nav-tabs hive-tabs">
-        	<li class="active"><a>@Messages("milestone.state.all")</a>
-        </ul>
-    </div>
-    
-	<table class="table table-hover table-striped">
-		<thead style="font-weight:bold;">
-			<tr>
-				<td><a href="@makeSortLink("title")">@Messages("label.title") @sortMark("title")</a></td>
-				<td>@Messages("label.contents")</td>
-				<td><a href="@makeSortLink("dueDate")">@Messages("label.dueDate") @sortMark("dueDate")</a></td>
-				<td><a href="@makeSortLink("state")">@Messages("label.state") @sortMark("state")</a></td>
-				<td>&nbsp;</td>
-			</tr>
-		</thead>
-		<tbody>
-			@for(milestone <- milestones){
-			<tr>
-				<td>
-					<a href="@routes.MilestoneApp.editMilestoneForm(projectInst.owner, projectInst.name, milestone.id)">@milestone.title</a>
-				</td>
-				<td>@milestone.contents</td>
-				<td>@milestone.getDueDateString</td>
-				<td>@stateMessage(milestone.state)</td>
-				<td><a href="@routes.MilestoneApp.deleteMilestone(projectInst.owner, projectInst.name, milestone.id)">@Messages("button.delete")</a></td>
-			</tr>
-			}
-		</tbody>
-	</table>
-	
-	}
-}
app/views/project/newProject.scala.html
--- app/views/project/newProject.scala.html
+++ app/views/project/newProject.scala.html
@@ -84,8 +84,8 @@
                     **@
                 </ul>
                 <div class="actions">
-                    <button class="btn-transparent n-btn orange med">@Messages("project.create")</button>
-                    <a href="/" class="n-btn gray med cancel">@Messages("button.cancel")</a>
+                    <button class="nbtn orange medium">@Messages("project.create")</button>
+                    <a href="/" class="nbtn medium black">@Messages("button.cancel")</a>
                 </div>
             </form>
         </div>
app/views/project/projectDelete.scala.html
--- app/views/project/projectDelete.scala.html
+++ app/views/project/projectDelete.scala.html
@@ -17,12 +17,12 @@
         </div>
     </div>
     <div class="box-wrap bottom">
-        <a id="deletion" data-toggle="modal" href="#alertDeletion" class="n-btn orange med"><!-- 
+        <a id="deletion" data-toggle="modal" href="#alertDeletion" class="nbtn medium orange"><!-- 
          --><i class="ico ico-delete-small"></i>@Messages("project.delete.this")</a>
     </div>
 
 
-	<div class="modal hide" id="alertDeletion">
+	<div id="alertDeletion" class="modal hide">
 	    <div class="modal-header">
 	        <button type="button" class="close" data-dismiss="modal">×</button>
 	        <h3>@Messages("project.delete.requestion")</h3>
app/views/site/lostPassword.scala.html
--- app/views/site/lostPassword.scala.html
+++ app/views/site/lostPassword.scala.html
@@ -2,45 +2,45 @@
 
 @home(message, utils.MenuType.NONE) {
 
-<form method="POST" action="@routes.PasswordResetApp.requestResetPasswordEmail()" id="mailForm" class="span7 form-horizontal">
-  <div class="page-header control-group controls">
-    <h3>@Messages(message)</h3>
-  </div>
+<form id="mailForm" method="post" action="@routes.PasswordResetApp.requestResetPasswordEmail()" class="span7 form-horizontal">
+	<div class="page-header control-group controls">
+		<h3>@Messages(message)</h3>
+	</div>
 
 @if(isSent) {
-    <div class="control-group controls">
-        @Messages("mail.sended")
-    </div>
+	<div class="control-group controls">
+		@Messages("mail.sended")
+	</div>
 }
 @if(errorMessage) {
-    <div class="control-group controls">
-        @Messages("mail.fail")<br/>
-        @Html(Messages(errorMessage))
-    </div>
+	<div class="control-group controls">
+		@Messages("mail.fail")<br/>
+		@Html(Messages(errorMessage))
+	</div>
 }
-  <div class="control-group">
-    <label name="from" class="control-label">@Messages("user.loginId")</label>
-    <div class="controls">
-        <div class="input-prepend">
-            <span class="add-on"><i class="icon-user"></i></span>
-            <input type="text" name="loginId" required="" placeholder="@Messages("user.yourLoginId")">
-        </div>
-    </div>
-  </div>
-  <div class="control-group">
-    <label name="to" class="control-label">@Messages("user.email")</label>
-    <div class="controls">
-        <div class="input-prepend">
-            <span class="add-on"><i class="icon-envelope"></i></span>
-            <input type="text" name="emailAddress" required="" placeholder="@Messages("user.yourEmail")">
-        </div>
-    </div>
-  </div>
-  <div class="controls">
-    <button type="submit" class="btn-transparent n-btn orange med">
-      <strong>@Messages("button.confirm")</strong>
-    </button>
-  </div>
+	<div class="control-group">
+		<label name="from" class="control-label">@Messages("user.loginId")</label>
+		<div class="controls">
+			<div class="input-prepend">
+				<span class="add-on"><i class="icon-user"></i></span>
+				<input type="text" name="loginId" required="required" placeholder="@Messages("user.yourLoginId")">
+			</div>
+		</div>
+	</div>
+
+	<div class="control-group">
+		<label name="to" class="control-label">@Messages("user.email")</label>
+		<div class="controls">
+			<div class="input-prepend">
+				<span class="add-on"><i class="icon-envelope"></i></span>
+				<input type="text" name="emailAddress" required="" placeholder="@Messages("user.yourEmail")">
+			</div>
+		</div>
+	</div>
+	
+	<div class="controls">
+		<button type="submit" class="nbtn medium orange"><strong>@Messages("button.confirm")</strong></button>
+	</div>
 </form>
 
 }
app/views/user/resetPassword.scala.html
--- app/views/user/resetPassword.scala.html
+++ app/views/user/resetPassword.scala.html
@@ -4,29 +4,29 @@
 @home(message, utils.MenuType.NONE) {
 	<div class="page full">
         <div class="center-wrap tag-line-wrap signup">
-            <h1 class="title"><span class="high-light">Password Reset </span></h1>
+            <h1 class="title"><span class="high-light">Reset Password</span></h1>
         </div>
         <div class="signup-form-wrap frm-wrap">
-            <form action="@routes.PasswordResetApp.resetPassword()" method="POST" name="passwordReset">
+            <form action="@routes.PasswordResetApp.resetPassword()" method="post" name="passwordReset">
             	<dl>
 					<dt>
 						<label for="password">@Messages("user.password")</label>
 					</dt>
 					<dd>
-						<input type="password" class="text password" id="password" placeholder="" autocomplete="off" name="password">
+						<input id="password" type="password" name="password" class="text password" placeholder="" autocomplete="off">
 					</dd>
 					
 					<dt>
 						<label for="retypedPassword">@Messages("validation.retypePassword")</label>
 					</dt>
 					<dd>
-						<input type="password" class="text password" id="retypedPassword" placeholder="" autocomplete="off" name="retypedPassword">
+						<input id="retypedPassword" type="password" name="retypedPassword" class="text password" placeholder="" autocomplete="off" >
 					</dd>
             	</dl>
 
                 <input type="hidden" name="hashString" value="@hashString">
                 <div class="btns-row">
-                    <button type="submit" class="n-btn orange sign-up">@Messages("button.confirm")</button>
+                    <button type="submit" class="nbtn medium orange">@Messages("button.confirm")</button>
                 </div>
             </form>
         </div>
app/views/user/signup.scala.html
--- app/views/user/signup.scala.html
+++ app/views/user/signup.scala.html
@@ -2,66 +2,68 @@
 @import utils.TemplateHelper._
 
 @home(message, utils.MenuType.NONE) {
-	@** Messages("title.signup") **@
-	<div class="page full">
-        <div class="center-wrap tag-line-wrap signup">
-            <h1 class="title"><span class="high-light">Sign Up for</span> @Messages("hive.name")</h1>
-            <p class="tag-line">Software development platform for Open Source project.</p>
-        </div>
-        
-        <div class="signup-form-wrap frm-wrap">
-            <form action="@routes.UserApp.newUser()" method="POST" name="signup">
-            	<dl>
-            		<dt>
-            			<label for="loginId">@Messages("user.signupId")</label>
-            		</dt>
-            		<dd>
-            			<input type="text" class="text password" id="loginId" placeholder="" autocomplete="off" name="loginId">
-            		</dd>
+<div class="page full">
+	<div class="center-wrap tag-line-wrap signup">
+		<h1 class="title">
+			<span class="high-light">Sign Up for</span> @Messages("hive.name")
+		</h1>
+		<p class="tag-line">Software development platform for Open Source
+			project.</p>
+	</div>
 
-					<dt>
-						<label for="uname">@Messages("user.name")</label>
-					</dt>
-					<dd>
-						<input type="text" class="text password" id="uname" placeholder="" autocomplete="off" name="name">
-					</dd>
-					
-					<dt>
-						<label for="email">@Messages("user.email")</label>
-					</dt>
-					<dd>
-						<input type="text" class="text password" id="email" placeholder="" autocomplete="off" name="email">
-					</dd>
-					
-					<dt>
-						<label for="password">@Messages("user.password")</label>
-					</dt>
-					<dd>
-						<input type="password" class="text password" id="password" placeholder="" autocomplete="off" name="password">
-					</dd>
-					
-					<dt>
-						<label for="retypedPassword">@Messages("validation.retypePassword")</label>
-					</dt>
-					<dd>
-						<input type="password" class="text password" id="retypedPassword" placeholder="" autocomplete="off" name="retypedPassword">
-					</dd>
-            	</dl>
+	<div class="signup-form-wrap frm-wrap">
+		<form action="@routes.UserApp.newUser()" method="post" name="signup">
+			<dl>
+				<dt>
+					<label for="loginId">@Messages("user.signupId")</label>
+				</dt>
+				<dd>
+					<input id="loginId" type="text" name="loginId" class="text password" placeholder="" autocomplete="off">
+				</dd>
 
-                <div class="act-row">
-                    @Messages("user.isAlreadySignupUser") <a href="@routes.UserApp.loginForm()" class="go-login">@Messages("title.login")</a>
-                </div>
-                <div class="btns-row">
-                    <button type="submit" class="n-btn orange sign-up">@Messages("user.signupBtn")</button>
-                </div>
-            </form>
-        </div>
-    </div>
-    
-    <script type="text/javascript" src="@getJSLink("lib/validate")"></script>
-    <script type="text/javascript">
-    	$(document).ready(function(){
+				<dt>
+					<label for="uname">@Messages("user.name")</label>
+				</dt>
+				<dd>
+					<input id="uname" type="text" name="name" class="text password" placeholder="" autocomplete="off">
+				</dd>
+
+				<dt>
+					<label for="email">@Messages("user.email")</label>
+				</dt>
+				<dd>
+					<input id="email" type="text" name="email" class="text password" placeholder="" autocomplete="off">
+				</dd>
+
+				<dt>
+					<label for="password">@Messages("user.password")</label>
+				</dt>
+				<dd>
+					<input id="password" type="password" name="password" class="text password" placeholder="" autocomplete="off">
+				</dd>
+
+				<dt>
+					<label for="retypedPassword">@Messages("validation.retypePassword")</label>
+				</dt>
+				<dd>
+					<input id="retypedPassword" type="password" name="retypedPassword" class="text password" placeholder="" autocomplete="off">
+				</dd>
+			</dl>
+
+			<div class="act-row">
+				@Messages("user.isAlreadySignupUser") <a href="@routes.UserApp.loginForm()" class="go-login">@Messages("title.login")</a>
+			</div>
+			<div class="btns-row">
+				<button type="submit" class="nbtn medium orange">@Messages("user.signupBtn")</button>
+			</div>
+		</form>
+	</div>
+</div>
+
+<script type="text/javascript" src="@getJSLink("lib/validate")"></script>
+<script type="text/javascript">
+   	$(document).ready(function(){
 		$hive.loadModule("user.SignUp");
-    	});
-    </script>
+   	});
+</script>
 }
conf/messages.en
--- conf/messages.en
+++ conf/messages.en
@@ -11,14 +11,14 @@
 title.newProject = Create a New Project
 title.projectSetting = Project Setting
 title.memberList = Member List
-title.post.notExistingPage = Not Existing Page
+title.post.notExistingPage = Page not found
 title.siteSetting = Site Setting
 title.site.userEdit = Edit a User
 title.login = Log in
 title.logout = Log out
 title.signup = Sign Up
 title.forgotpassword = Forgot password?
-title.rememberMe = REMEMBER ME
+title.rememberMe = Remember Me
 title.commitHistory = Commit History
 title.mailSetting = Mail Configuration
 title.sendMail = Send Mail
@@ -30,9 +30,6 @@
 hive.name = HIVE
 hive.title = Collaborative Software Development Platform
 hive.description = Make it better and simpler!
-
-orderby.name = Name
-orderby.recent = Recent
 
 menu.home = Home
 menu.board = Board
@@ -57,7 +54,7 @@
 label.customColor = Custom Color
 label.category = Category
 label.name = Name
-label.add = Add
+label.add = Add Label
 label.manage = Manage Label
 label.confirm.delete = Are you Sure?
 label.select = Select Label
@@ -70,6 +67,8 @@
 order.comments = Comments
 order.completionRate = Completion Rate
 order.dueDate = Due Date
+order.name = Name
+order.recent = Recent
 
 button.save = Save
 button.confirm = Confirm
@@ -109,8 +108,6 @@
 milestone.is.empty = There is no milestone.
 milestone.menu.manage = Manage
 milestone.menu.new = New
-sort.by.dueDate = Due Date
-sort.by.completionRate = Completeness
 milestone.title.duplicated = Title is duplicated.
 milestone.form.title = Title
 milestone.form.content = Descriptions
@@ -367,11 +364,11 @@
 #Search
 label.writer = Writer
 post.is.empty = There is no post.
-title.contentSearchResult = Conetnet Search Result
+title.contentSearchResult = Content Search Result
 
-#Vaildation
-error.required = It is required.
-error.wrong.format = It is wrong format.
+#Validation
+error.required = Mandatory field is empty
+error.wrong.format = Wrong format
 
 #Code
 code.files = Files
@@ -438,4 +435,4 @@
 #Admin
 admin.resetPasswordEmail.title = [HIVE] Password reset mail request
 admin.resetPasswordEmail.mailcontents = copy the below url and paste it to browser url bar
-admin.resetPasswordEmail.invalidRequest = Invalid Password Reset Request
+admin.resetPasswordEmail.invalidRequest = Invalid Password Reset Request
(No newline at end of file)
conf/messages.ko
--- conf/messages.ko
+++ conf/messages.ko
@@ -1,19 +1,19 @@
 # Messages
 title.newIssue = 새 이슈
 title.issueList = 이슈 목록
-title.issueDetail = 이슈 상세조회
+title.issueDetail = 이슈 상세보기
 title.editIssue = 이슈 수정
 title.newMilestone = 새 마일스톤
-title.milestoneList = 마일스톤 리스트
+title.milestoneList = 마일스톤 목록
 title.editMilestone = 마일스톤 수정
 title.milestoneManage = 마일스톤 관리
 title.projectHome = Overview
 title.newProject = 새 프로젝트 시작
 title.projectSetting = 프로젝트 설정
-title.memberList = 멤버 리스트
+title.memberList = 멤버 목록
 title.post.notExistingPage = 존재하지 않는 게시물
 title.siteSetting = 사이트 설정
-title.site.userEdit = 유저 설정
+title.site.userEdit = 사용자 설정
 title.login = 로그인
 title.logout = 로그아웃
 title.signup = 회원 가입
@@ -26,14 +26,11 @@
 title.projectList = 프로젝트 목록
 title.help = 도움말
 title.search = 검색
-title.resetPassword = 패스워드 재설정
+title.resetPassword = 비밀번호 재설정
 
 hive.name = HIVE
 hive.title = 협업개발 플랫폼
 hive.description = Make it better and simpler!
-
-orderby.name = 이름순
-orderby.recent = 생성일자순
 
 menu.home = 홈
 menu.board = 게시판
@@ -59,8 +56,8 @@
 label.customColor = 색
 label.category = 분류
 label.name = 이름
-label.add = 추가
-label.manage = 라벨관리
+label.add = 라벨 추가
+label.manage = 라벨 관리
 label.confirm.delete = 라벨을 삭제하면 이슈에 지정한 라벨도 함께 제거됩니다. 정말 삭제하시겠습니까?
 label.select = 라벨 선택
 label.error.duplicated = 라벨 생성에 실패했습니다.\n이미 동일한 라벨이 존재할지도 모릅니다.
@@ -72,6 +69,8 @@
 order.comments = 댓글순
 order.completionRate = 완료율순
 order.dueDate = 완료일순
+order.name = 이름순
+order.recent = 생성일자순
 
 button.save = 저장
 button.confirm = 확인
@@ -112,8 +111,6 @@
 milestone.menu.manage = 마일스톤 관리
 milestone.menu.new = 새 마일스톤
 milestone.none = 없음
-sort.by.dueDate = 완료일 순
-sort.by.completionRate = 완료율 순
 milestone.title.duplicated = 마일스톤 제목이 다른것과 중복 됩니다. 다른 제목을 사용하세요.
 milestone.form.title = 마일스톤 제목
 milestone.form.content = 내용을 입력해주세요
@@ -257,9 +254,9 @@
 project.members.addMember = 새로운 멤버의 아이디를 입력하세요
 project.member.isManager = 프로젝트 관리자 권한이 필요합니다
 project.member.alreadyMember = 이미 프로젝트에 가입되어 있는 멤버입니다.
-project.member.deleteConfirm = 정말로 해당 유저를 프로젝트에서 탈퇴시키겠습니까?
-project.member.delete = 프로젝트 유저 삭제
-project.member.notExist = 존재하지 않는 유저입니다.
+project.member.deleteConfirm = 정말로 해당 사용자를 프로젝트에서 탈퇴시키겠습니까?
+project.member.delete = 프로젝트 사용자 삭제
+project.member.notExist = 존재하지 않는 사용자입니다.
 project.member.ownerCannotLeave = 프로젝트 소유자는 탈퇴할 수 없습니다.
 project.member.ownerMustBeAManager = 프로젝트 소유자는 관리 권한을 가져야 합니다.
 project.sidebar = 프로젝트 설정
@@ -295,7 +292,7 @@
 #Site
 site.sidebar = 사이트 관리
 site.sidebar.setting = 설정
-site.sidebar.userList = 유저
+site.sidebar.userList = 사용자
 site.sidebar.postList = 게시물
 site.sidebar.issueList = 이슈
 site.sidebar.projectList = 프로젝트 설정
@@ -306,12 +303,12 @@
 site.userList.search = 찾으려는 사용자의 ID를 입력하세요
 site.userList.isActive = 활성 상태
 site.userList.deleteAlert = 프로젝트의 유일한 관리자이므로 사이트에서 삭제할 수 없습니다.
-site.user.delete = 유저 삭제
-site.user.deleteConfirm = 정말로 해당 유저를 사이트에서 탈퇴시키겠습니까?
+site.user.delete = 사용자 삭제
+site.user.deleteConfirm = 정말로 해당 사용자를 사이트에서 탈퇴시키겠습니까?
 site.project.delete = 프로젝트 삭제
 site.project.deleteConfirm = 정말로 해당 프로젝트를 사이트에서 삭제하겠습니까?
-site.userlist.unlocked = 활성화된 유저 목록
-site.userlist.locked = 계정이 잠긴 유저 목록
+site.userlist.unlocked = 활성화된 사용자 목록
+site.userlist.locked = 계정이 잠긴 사용자 목록
 site.massMail.toAll = 모두에게
 site.massMail.toProjects = 특정 프로젝트의 멤버들에게
 site.massMail.loading = 불러오는중...
@@ -338,10 +335,10 @@
 user.signupId = 아이디
 user.signupBtn = 참여하기
 user.loginWithNewPassword = 새로 설정한 비밀번호로 로그인 하세요
-user.notExists.name = 존재하지 않는 유저입니다.
+user.notExists.name = 존재하지 않는 사용자입니다.
 user.locked = 잠긴 사용자 계정입니다.
 user.isLocked = 잠김여부
-user.signup.requested = 하이브 가입이 요청되었습니다. 사이트 관리자가 검토/승인 후 사용가능합니다. 감사합니다.
+user.signup.requested = HIVE 가입이 요청되었습니다. 사이트 관리자가 검토/승인 후 사용가능합니다. 감사합니다.
 
 #Role
 role.manager = 관리자
@@ -366,7 +363,7 @@
 board.post.notExist = 존재하지 않는 게시물입니다.
 board.post.new = 새 게시물
 board.post.modify = 게시물 수정
-board.comment.empty = 댓글내용은 반드시 쓰셔야 합니다.
+board.comment.empty = 댓글 내용은 반드시 입력해야 합니다.
 board.notAuthor = 글쓴이가 아닙니다.
 
 #Search
@@ -442,6 +439,6 @@
 userinfo.starredProjects = 관심 프로젝트
 
 #Admin
-admin.resetPasswordEmail.title = [HIVE] 패스워드 재 설정
+admin.resetPasswordEmail.title = [HIVE] 비밀번호 재 설정
 admin.resetPasswordEmail.mailcontents = 아래 URL을 브라우저 주소창에 붙여 넣으세요
-admin.resetPasswordEmail.invalidRequest = 잘못된 패스워드 재 설정 요청입니다.
+admin.resetPasswordEmail.invalidRequest = 잘못된 비밀번호 재 설정 요청입니다.
conf/routes
--- conf/routes
+++ conf/routes
@@ -93,7 +93,7 @@
 
 # Milestones
 GET     /:user/:project/milestones                      controllers.MilestoneApp.milestones(user, project)
-GET     /:user/:project/milestones/manage               controllers.MilestoneApp.manageMilestones(user, project)
+#GET     /:user/:project/milestones/manage               controllers.MilestoneApp.manageMilestones(user, project)
 GET     /:user/:project/newMilestoneForm                controllers.MilestoneApp.newMilestoneForm(user, project)
 POST    /:user/:project/milestones                      controllers.MilestoneApp.newMilestone(user, project)
 GET     /:user/:project/milestone/:id/editform          controllers.MilestoneApp.editMilestoneForm(user, project, id: Long)
public/stylesheets/pikaday.css
--- public/stylesheets/pikaday.css
+++ public/stylesheets/pikaday.css
@@ -6,7 +6,7 @@
  */
 
 .pika-single {
-    z-index: 9999;
+    z-index: 9;/*999;*/
     display: block;
     position: relative;
     width: 240px;
Add a comment
List