Commit @134d0391d0af29713d8bd5bb55d325338607f0b3

김창근 2014-07-02

add duedate in issue

@134d0391d0af29713d8bd5bb55d325338607f0b3

5497913

134d039

app/assets/stylesheets/less/_page.less

--- app/assets/stylesheets/less/_page.less

+++ app/assets/stylesheets/less/_page.less


              width: 100%;
            }
        }
+       span {
+           &.over { color:#f36c22; }
+       }
 }
 .label-editor {
     padding-top:10px;

 
                 .bar { height:100%; }
             }
+
+            &.over { color:#f36c22; }
         }
     }
 }

 }
 
 .mileston-tag {
-    margin-top:7px;
-    margin-right: 25px;
     font-weight: bold;
     max-width: 135px;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
     color: darken(@secondary, 10%);
-    padding: 3px 10px;
-    background: #f7f7f7;
     font-size:11px;
     .border-radius(6px);
-    .box-shadow(1px 1px 1px rgba(0,0,0,0.15));
+}
+
+.overdue {
+    color:@yobi-red;
 }
 
 .pullRequest-branchInfo {

5497913

134d039

app/controllers/IssueApp.java

--- app/controllers/IssueApp.java

+++ app/controllers/IssueApp.java


                 }
             }
 
+            if (issueMassUpdate.isDueDateChanged) {
+                issue.dueDate = issueMassUpdate.dueDate;
+                issue.expandDueDate();
+            }
+
             issue.updatedDate = JodaDateUtil.now();
             issue.update();
             updatedItems++;

         addLabels(newIssue, request());
         setMilestone(issueForm, newIssue);
 
+        newIssue.expandDueDate();
         newIssue.save();
 
         attachUploadFilesToPost(newIssue.asResource());

         final Issue issue = issueForm.get();
         removeAnonymousAssignee(issue);
         setMilestone(issueForm, issue);
+        issue.expandDueDate();
 
         final Issue originalIssue = Issue.findByNumber(project, number);
 

5497913

134d039

app/models/Issue.java

--- app/models/Issue.java

+++ app/models/Issue.java


 import models.enumeration.State;
 import models.resource.Resource;
 import models.support.SearchCondition;
+import org.apache.commons.lang3.time.DateUtils;
+import org.joda.time.*;
+import org.joda.time.DateTime;
+import play.data.format.Formats;
+import play.i18n.Messages;
 import utils.JodaDateUtil;
 
 import javax.persistence.*;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.lang.Boolean;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Pattern;
 import com.avaje.ebean.Page;

     public static final Pattern ISSUE_PATTERN = Pattern.compile("#\\d+");
 
     public State state;
+
+    @Formats.DateTime(pattern = "yyyy-MM-dd")
+    public Date dueDate;
 
     public static List<State> availableStates = new ArrayList<>();
     static {

         }
         if(!updateProps.isEmpty()) {
             Ebean.update(this, updateProps);
+        }
+    }
+
+    public void expandDueDate() {
+        if (dueDate != null) {
+            dueDate = DateUtils.setHours(dueDate, 23);
+            dueDate = DateUtils.setMinutes(dueDate, 59);
+            dueDate = DateUtils.setSeconds(dueDate, 59);
         }
     }
 

     public boolean isVotedBy(User user) {
         return this.voters.contains(user);
     }
+
+    public String getDueDateString() {
+        if (dueDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(this.dueDate);
+    }
+
+    public Boolean isOverDueDate(){
+        return (JodaDateUtil.ago(dueDate).getMillis() > 0);
+    }
+
+    public String until(){
+        if (dueDate == null) {
+            return null;
+        }
+
+        Date now = JodaDateUtil.now();
+
+        if (DateUtils.isSameDay(now, dueDate)) {
+            return Messages.get("common.time.today");
+        } else if (isOverDueDate()) {
+            return Messages.get("common.time.default.day", JodaDateUtil.localDaysBetween(dueDate, now));
+        } else {
+            return Messages.get("common.time.default.day", JodaDateUtil.localDaysBetween(now, dueDate));
+        }
+    }
 }

5497913

134d039

app/models/IssueMassUpdate.java

--- app/models/IssueMassUpdate.java

+++ app/models/IssueMassUpdate.java


 package models;
 
 import models.enumeration.State;
+import play.data.format.Formats;
 import play.data.validation.Constraints;
 
+import java.util.Date;
 import java.util.List;
 
 public class IssueMassUpdate {

     public User assignee;
     public Milestone milestone;
     public boolean delete;
+    @Formats.DateTime(pattern = "yyyy-MM-dd")
+    public Date dueDate;
+    public boolean isDueDateChanged;
 
     @Constraints.Required
     public List<Issue> issues;

5497913

134d039

app/models/support/SearchCondition.java

--- app/models/support/SearchCondition.java

+++ app/models/support/SearchCondition.java


 import models.enumeration.State;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import play.data.format.Formats;
 import utils.LabelSearchUtil;
 
 import javax.persistence.Transient;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static models.enumeration.ResourceType.*;
 

     public Project project;
 
     public Long mentionId;
+
+    @Formats.DateTime(pattern = "yyyy-MM-dd")
+    public Date dueDate;
 
     /**
      * This doesn't copy {@code pageNum}, because it is safe when changing tabs with page parameter.

         one.authorId = this.authorId;
         one.assigneeId = this.assigneeId;
         one.mentionId = this.mentionId;
+        one.dueDate = this.dueDate;
         return one;
     }
 

             el.orderBy(orderBy + " " + orderDir);
         }
 
+        if (dueDate != null) {
+            el.lt("dueDate", DateUtils.addDays(dueDate, 1));
+        }
+
         return el;
     }
 

             el.orderBy(orderBy + " " + orderDir);
         }
 
+        if (dueDate != null) {
+            el.lt("dueDate", DateUtils.addDays(dueDate, 1));
+        }
+
         return el;
     }
+
+    public String getDueDateString() {
+        if (dueDate == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(this.dueDate);
+    }
 }

5497913

134d039

app/utils/JodaDateUtil.java

--- app/utils/JodaDateUtil.java

+++ app/utils/JodaDateUtil.java

...	...	@@ -83,4 +83,7 @@
83	83	return moment.invoke("fromNow");
84	84	}
85	85
	86	+ public static int localDaysBetween(Date from, Date to) {
	87	+ return Days.daysBetween(new DateTime(from).toLocalDate(), new DateTime(to).toLocalDate()).getDays();
	88	+ }
86	89	}

134d039

app/views/common/calendar.scala.html (added)

+++ app/views/common/calendar.scala.html

...	...	@@ -0,0 +1,24 @@
	1	+@**
	2	+* Yobi, Project Hosting SW
	3	+*
	4	+* Copyright 2014 NAVER Corp.
	5	+* http://yobi.io
	6	+*
	7	+* @Author Changgun Kim
	8	+*
	9	+* Licensed under the Apache License, Version 2.0 (the "License");
	10	+* you may not use this file except in compliance with the License.
	11	+* You may obtain a copy of the License at
	12	+*
	13	+* http://www.apache.org/licenses/LICENSE-2.0
	14	+*
	15	+* Unless required by applicable law or agreed to in writing, software
	16	+* distributed under the License is distributed on an "AS IS" BASIS,
	17	+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+* See the License for the specific language governing permissions and
	19	+* limitations under the License.
	20	+**@
	21	+
	22	+<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/moment-with-langs.min.js")"></script>
	23	+<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/pikaday/pikaday.js")"></script>
	24	+<script type="text/javascript" src="@routes.Assets.at("javascripts/common/yobi.ui.Calendar.js")"></script>

5497913

134d039

app/views/issue/create.scala.html

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

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


                         </dl>
                     }
 
+                    <dl class="issue-option">
+                        <dt>@Messages("issue.dueDate")</dt>
+                        <dd>
+                            <div class="search search-bar">
+                                <input type="text" id="issueDueDate" data-toggle="calendar" name="dueDate" class="textbox full">
+                                <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
+                            </div>
+                        </dd>
+                    </dl>
+
                     <dl id="labels" class="issue-option">
                         <dt>
                             @Messages("label")

 @common.markdown(project)
 @common.issueLabel()
 @common.select2()
+@common.calendar()
 <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.caret.min.js")"></script>
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.js")"></script>
 <script type="text/javascript">
-	$(document).ready(function(){
-	    // yobi.Label
+    $(document).ready(function(){
+        // yobi.Label
         yobi.Label.init({
             "sURLLabels": "@routes.IssueLabelApp.labels(project.owner, project.name)",
             "sURLPost"  : "@routes.IssueLabelApp.newLabel(project.owner, project.name)"
         });
 
         // yobi.issue.Write
-		$yobi.loadModule("issue.Write", {
-			"sMode"		   : "new",
+        $yobi.loadModule("issue.Write", {
+            "sMode": "new",
             "sIssueFormURL": "@routes.IssueApp.newIssueForm(project.owner, project.name)",
-			"sIssueListURL": "@routes.IssueApp.issues(project.owner, project.name)",
-            "elTextarea"   : 'textarea[data-editor-mode="content-body"]',
-            "elMilestoneRefresh": $("#milestoneOption .yobicon-refresh")
-		});
+            "sIssueListURL": "@routes.IssueApp.issues(project.owner, project.name)",
+            "elTextarea": 'textarea[data-editor-mode="content-body"]',
+            "elMilestoneRefresh": $("#milestoneOption .yobicon-refresh"),
+        });
 
         // yobi.Mention
         yobi.Mention({

5497913

134d039

app/views/issue/edit.scala.html

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

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


                     </dl>
                     }
 
+                    <dl class="issue-option">
+                        <dt>@Messages("issue.dueDate")</dt>
+                        <dd>
+                            <div class="search search-bar">
+                                <input type="text" id="issueDueDate" data-toggle="calendar" name="dueDate" class="textbox full" value="@issue.getDueDateString">
+                                <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
+                            </div>
+                        </dd>
+                    </dl>
+
                     <dl id="labels" class="issue-option">
                         <dt>
                             @Messages("label")

 @common.markdown(project)
 @common.issueLabel()
 @common.select2()
+@common.calendar()
 <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.caret.min.js")"></script>
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.js")"></script>

5497913

134d039

app/views/issue/list.scala.html

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

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


     </div>
 </div>
 @common.select2()
+@common.calendar()
 <script type="text/javascript">
     $(document).ready(function(){
         var htPjaxOptions = {

5497913

134d039

app/views/issue/my_partial_list.scala.html

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

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


 @for(issue <- issueList){
 @defining(User.findByLoginId(issue.authorLoginId)){ user =>
     <li class="post-item" id="issue-item-@issue.id">
-        <div class="span9">
+        <div class="span10">
             <a href="@routes.UserApp.userInfo(user.loginId)" class="avatar-wrap mlarge" data-toggle="tooltip" data-placement="top" title="@user.loginId">
                 @if(user.avatarUrl == UserApp.DEFAULT_AVATAR_URL){
                     <img src="@urlToPicture(user.email, 32)">

                     @agoOrDateString(issue.createdDate)
                 </span>
 
+                @if(issue.milestone != null && issue.project != null && issue.project.menuSetting != null && issue.project.menuSetting.milestone) {
+                <span class="infos-item mileston-tag">
+                    <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
+                        @issue.milestone.title
+                    </a>
+                </span>
+                }
+
                 @if(issue.comments.size()>0 || issue.voters.size()>0) {
                 <span class="infos-item item-count-groups">
                     @if(issue.comments.size()>0){

                 }
             </div>
         </div>
-        <div class="span3">
+        <div class="span2">
             <div class="mt5 pull-right">
                 @if(issue.assigneeName != null) {
                     <a href="@routes.UserApp.userInfo(issue.assignee.user.loginId)" class="avatar-wrap assinee" data-toggle="tooltip" data-placement="top" title="@Messages("issue.assignee"): @issue.assigneeName">

                    <div class="empty-avatar-wrap">&nbsp;</div>
                 }
             </div>
-            <div class="pull-right">
-                @if(issue.milestone != null && issue.project != null && issue.project.menuSetting != null && issue.project.menuSetting.milestone) {
-                <div class="mileston-tag">
-                    <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
-                    @issue.milestone.title
-                    </a>
-                </div>
+            @if(issue.dueDate != null) {
+            <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
+                <i class="yobicon-clock2"></i> 
+                @if(issue.isOverDueDate) {
+                    @Messages("issue.dueDate.overdue")
+                } else {
+                    @issue.until
                 }
             </div>
+            }
         </div>
     </li>
 }

5497913

134d039

app/views/issue/my_partial_search.scala.html

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

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


 		<div class="filter-wrap small-heights">
                 @if(currentPage.getList.size() > 1){
 			<div class="filters pull-right">
+                @makeFilterLink("dueDate", param.orderBy, param.orderDir, Messages("common.order.dueDate"))
 				@makeFilterLink("updatedDate", param.orderBy, param.orderDir, Messages("common.order.updatedDate"))
 				@makeFilterLink("createdDate", param.orderBy, param.orderDir, Messages("common.order.date"))
 				@makeFilterLink("numOfComments", param.orderBy, param.orderDir, Messages("common.order.comments"))

5497913

134d039

app/views/issue/partial_list.scala.html

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

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


                         @agoOrDateString(issue.createdDate)
                     </span>
 
+                    @if(project.menuSetting.milestone && issue.milestone != null) {
+                    <span class="infos-item mileston-tag">
+                        <a href="@routes.MilestoneApp.milestone(project.owner, project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
+                            @issue.milestone.title
+                        </a>
+                    </span>
+                    }
+
                     @if(issue.comments.size()>0 || issue.voters.size()>0) {
                     <span class="infos-item item-count-groups">
                     @if(issue.comments.size()>0){

                    <div class="empty-avatar-wrap">&nbsp;</div>
                 }
             </div>
-            <div class="pull-right">
-                @if(project.menuSetting.milestone && issue.milestone != null) {
-                    <div class="mileston-tag">
-                        <a href="@routes.MilestoneApp.milestone(project.owner, project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
-                        @issue.milestone.title
-                    </a>
-                    </div>
+            @if(issue.dueDate != null) {
+            <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
+                <i class="yobicon-clock2"></i> 
+                @if(issue.isOverDueDate) {
+                    @Messages("issue.dueDate.overdue")
+                } else {
+                    @issue.until
                 }
             </div>
+            }       
         </div>
     </li>
     }

5497913

134d039

app/views/issue/partial_search.scala.html

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

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


                         </dd>
                     </dl>
                     }
+
+                    <dl class="issue-option">
+                        <dt>@Messages("issue.dueDate")</dt>
+                        <dd class="search search-bar">
+                            <input type="text" id="issueDueDate" data-toggle="calendar" name="dueDate" class="textbox full" value="@param.getDueDateString">
+                            <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
+                        </dd>
+                    </dl>
                 </div>
 
                 <hr>

 
                 @if(currentPage.getList.size() > 1){
                 <div class="filters pull-right">
+                    @makeFilterLink("dueDate", param.orderBy, param.orderDir, Messages("common.order.dueDate"))
                     @makeFilterLink("updatedDate", param.orderBy, param.orderDir, Messages("common.order.updatedDate"))
                     @makeFilterLink("createdDate", param.orderBy, param.orderDir, Messages("common.order.date"))
                     @makeFilterLink("numOfComments", param.orderBy, param.orderDir, Messages("common.order.comments"))

         <script type="text/javascript">
             $(document).ready(function(){
                 // Label
-				        yobi.Label.init({
+                yobi.Label.init({
                     "bRefresh"     : true,
                     "sURLLabels"   : "@routes.IssueLabelApp.labels(project.owner, project.name)",
                     "sURLPost"     : "@routes.IssueLabelApp.newLabel(project.owner, project.name)",

 
                 // issue.List
                 $yobi.loadModule("issue.List", {
-                    "welSearchOrder": $("a[orderBy]"),
-                    "welSearchState": $("a[state]"),
-                    "welSearchForm" : $("form[name='search']"),
-                    "welFilter"     : $("a[pjax-filter]"),
-                    "elPagination"  : $("#pagination"),
-                    "nTotalPages" : @currentPage.getTotalPageCount
+                    "welSearchOrder"  : $("a[orderBy]"),
+                    "welSearchState"  : $("a[state]"),
+                    "welSearchForm"   : $("form[name='search']"),
+                    "welFilter"       : $("a[pjax-filter]"),
+                    "elPagination"    : $("#pagination"),
+                    "nTotalPages"     : @currentPage.getTotalPageCount,
+                    "welIssueDueDate" : $("#issueDueDate")
                 });
 
                 // ShortcutKey

5497913

134d039

app/views/issue/view.scala.html

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

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


                             <dt>@Messages("milestone")</dt>
                             <dd style="padding:5px 10px;">
                             @if(Milestone.findByProjectId(project.id).isEmpty()){
+                                @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
                                 <a href="@routes.MilestoneApp.newMilestoneForm(project.owner, project.name)" target="_blank" class="ybtn ybtn-success ybtn-small">@Messages("milestone.menu.new")</a>
+                                } else {
+                                    @Messages("issue.noMilestone")
+                                }
                             } else {
                                 @defining(issue.milestone != null) { hasMilestone =>
                                     @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {

                         </dl>
                         }
                         @**<!-- // -->**@
+
+                        <dl class="issue-option">
+                            <dt>
+                                @Messages("issue.dueDate")
+                                @if(issue.dueDate != null) {
+                                <span class="@if(issue.isOverDueDate) {overdue}">
+                                    @if(issue.isOverDueDate) {
+                                        (@Messages("issue.dueDate.overdue"))
+                                    } else {
+                                        (@issue.until)
+                                    }
+                                </span>
+                                }
+                            </dt>
+                            <dd style="padding:5px 10px;">
+                                @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
+                                <div class="search search-bar">
+                                    <input type="text" id="issueDueDate" data-toggle="calendar" data-oDueDate="@issue.getDueDateString" name="dueDate" class="textbox full" value="@issue.getDueDateString">
+                                    <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
+                                </div>
+                                } else {
+                                    @if(issue.dueDate != null) {
+                                        @issue.getDueDateString
+                                    } else {
+                                        @Messages("issue.noDuedate")
+                                    }
+                                }
+                            </dd>
+                        </dl>
 
                         @**<!-- labels -->**@
                         @if(!IssueLabel.findByProject(project).isEmpty){

 @common.markdown(project)
 @common.commentDeleteModal()
 @common.select2()
+@common.calendar()
 
 <link rel="stylesheet" type="text/css" media="screen" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)">
 <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">

             "sIssueCheckBoxesSelector": "[type=checkbox][name=checked-issue]",
             "sNextState"    : "@issue.nextState().toString.toLowerCase",
             "sNextStateUrl" : "@routes.IssueApp.nextState(project.owner, project.name, issue.getNumber)",
-            "sCommentWithStateUrl": "@routes.IssueApp.newComment(project.owner, project.name, issue.getNumber)"
+            "sCommentWithStateUrl": "@routes.IssueApp.newComment(project.owner, project.name, issue.getNumber)",
+            "welDueDate": $("#issueDueDate")
         });
 
         // yobi.ShortcutKey

5497913

134d039

app/views/layout.scala.html

--- app/views/layout.scala.html

+++ app/views/layout.scala.html


 <link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("bootstrap/css/bootstrap.css")">
 <link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/yobicon/style.css")">
 <link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("javascripts/lib/select2/select2.css")"/>
+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("javascripts/lib/pikaday/pikaday.css")" />
 <link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/yobi.css")">
 
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/jquery/jquery-1.9.0.js")"></script>

5497913

134d039

app/views/user/partial_issues.scala.html

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

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


 }
 @defining(User.findByLoginId(issue.authorLoginId)){ user =>
 <li class="post-item " id="issue-item-@issue.id">
-    <div class="span9">
+    <div class="span10">
         <a href="@routes.ProjectApp.project(project.owner, project.name)" class="avatar-wrap mlarge">
             <img src="@urlToProjectLogo(project)" alt="@project.owner / @project.name">
         </a>

                 @agoOrDateString(issue.createdDate)
             </span>
 
+            @if(project.menuSetting.milestone && issue.milestone != null) {
+            <span class="infos-item mileston-tag">
+                <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
+                    @issue.milestone.title
+                </a>
+            </span>
+            }
+
             @if(issue.comments.size()>0 || issue.voters.size()>0) {
             <span class="infos-item item-count-groups">
             @if(issue.comments.size()>0){

             }
         </div>
     </div>
-    <div class="span3">
+    <div class="span2">
         <div class="mt5 pull-right">
             @if(issue.assigneeName != null) {
                 <a href="@routes.UserApp.userInfo(issue.assignee.user.loginId)" class="avatar-wrap assinee" data-toggle="tooltip" data-placement="top" title="@Messages("issue.assignee"): @issue.assigneeName">

             }
         </div>
         <div class="pull-right">
-            @if(project.menuSetting.milestone && issue.milestone != null) {
-                <div class="mileston-tag">
-                    <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
-                    @issue.milestone.title
-                </a>
-                </div>
-            }
+            @if(issue.dueDate != null) {
+            <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
+                <i class="yobicon-clock2"></i>
+                @if(issue.isOverDueDate) {
+                    @Messages("issue.dueDate.overdue")
+                } else {
+                    @issue.until
+                }
+            </div>
         </div>
+        }
     </div>
 </li>
 }

134d039

conf/evolutions/default/85.sql (added)

+++ conf/evolutions/default/85.sql

...	...	@@ -0,0 +1,6 @@
	1	+# --- !Ups
	2	+
	3	+ALTER TABLE issue add column due_date timestamp;
	4	+
	5	+# --- !Downs
	6	+ALTER TABLE issue drop column due_date;

5497913

134d039

conf/messages

--- conf/messages

+++ conf/messages


 common.none = None
 common.noAuthor = No author
 common.order.all = All
-common.order.comments = Order by comments
-common.order.completionRate = Order by completion Rate
-common.order.date = Order by date
-common.order.dueDate = Order by due date
-common.order.name = Order by name
-common.order.recent = Order by creation date
-common.order.updatedDate = Order by updated date
+common.order.comments = comments
+common.order.completionRate = completion Rate
+common.order.date = created date
+common.order.dueDate = due date
+common.order.name = name
+common.order.recent = creation date
+common.order.updatedDate = updated date
 common.time.after = After {0} days
 common.time.before = Before {0} days
 common.time.day = {0} days ago
 common.time.days = {0} days ago
+common.time.default.day = {0} days
 common.time.hour = {0} hours ago
 common.time.hours = {0} hours ago
 common.time.just = Just now

 issue.createdDate = Created date
 issue.delete = Delete issue
 issue.downloadAsExcel = Download as Excel file
+issue.dueDate = Due date
+issue.dueDate.overdue = Overdue
 issue.error.beforeunload = Issue has not saved yet. Would you like to exit this page without saving?
 issue.error.emptyBody = Issue description is a required field.
 issue.error.emptyTitle = Issue title is a required field.

 issue.noAssignee = No assignee
 issue.noAuthor = No author
 issue.noMilestone = No milestone
+issue.noDuedate = No due date
 issue.search = SEARCH
 issue.state = Status
 issue.state.all = All

 issue.update.assignee = Update assignee
 issue.update.attachLabel = Attach label
 issue.update.detachLabel = Detach label
+issue.update.duedate = Update due date
 issue.update.label = Update label
 issue.update.milestone = Update milestone
 issue.update.state = Update status

5497913

134d039

conf/messages.ko

--- conf/messages.ko

+++ conf/messages.ko


 common.time.before = {0}일 전
 common.time.day = {0}일 전
 common.time.days = {0}일 전
+common.time.default.day = {0}일
 common.time.hour = {0}시간 전
 common.time.hours = {0}시간 전
 common.time.just = 방금 전

 issue.createdDate = 작성일
 issue.delete = 이슈 삭제
 issue.downloadAsExcel = 엑셀파일로 다운받기
+issue.dueDate= 목표 완료일
+issue.dueDate.overdue= 기한지남
 issue.error.beforeunload = 아직 이슈를 저장하지 않았습니다. 저장하지 않은 채로 다른 페이지로 이동하시겠습니까?
 issue.error.emptyBody = 이슈 내용을 입력해주세요
 issue.error.emptyTitle = 이슈 제목을 입력해주세요

 issue.noAssignee = 담당자 없음
 issue.noAuthor = 작성자 없음
 issue.noMilestone = 마일스톤 없음
+issue.noDuedate = 목표 완료일 없음
 issue.search = 검색
 issue.state = 상태
 issue.state.all = 전체

 issue.update.assignee = 담당자 변경
 issue.update.attachLabel = 라벨 추가
 issue.update.detachLabel = 라벨 제거
+issue.update.duedate = 목표완료일 변경
 issue.update.label = 라벨 변경
 issue.update.milestone = 마일스톤 변경
 issue.update.state = 상태 변경

134d039

public/javascripts/common/yobi.ui.Calendar.js (added)

+++ public/javascripts/common/yobi.ui.Calendar.js

...	...	@@ -0,0 +1,87 @@
	1	+/**
	2	+ * Yobi, Project Hosting SW
	3	+ *
	4	+ * Copyright 2014 NAVER Corp.
	5	+ * http://yobi.io
	6	+ *
	7	+ * @Author Changgun Kim
	8	+ *
	9	+ * Licensed under the Apache License, Version 2.0 (the "License");
	10	+ * you may not use this file except in compliance with the License.
	11	+ * You may obtain a copy of the License at
	12	+ *
	13	+ * http://www.apache.org/licenses/LICENSE-2.0
	14	+ *
	15	+ * Unless required by applicable law or agreed to in writing, software
	16	+ * distributed under the License is distributed on an "AS IS" BASIS,
	17	+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	+ * See the License for the specific language governing permissions and
	19	+ * limitations under the License.
	20	+ */
	21	+/**
	22	+ * yobi.ui.Calendar
	23	+ *
	24	+ * @requires Pikaday.js (https://github.com/dbushell/Pikaday/)
	25	+ */
	26	+
	27	+(function(ns){
	28	+ var oNS = $yobi.createNamespace(ns);
	29	+ oNS.container[oNS.name] = function(elInput, htOptions){
	30	+ var welInput = $(elInput);
	31	+
	32	+ var htVar = {
	33	+ "sDateFormat": "YYYY-MM-DD",
	34	+ "rxDateFormat": /\d{4}-\d{2}-\d{2}/
	35	+ };
	36	+
	37	+ var htElement = {};
	38	+
	39	+ function _init(htOptions){
	40	+ _initElement(htOptions);
	41	+ }
	42	+
	43	+ function _initElement(htOptions) {
	44	+ if (!welInput.data("pickaday")) {
	45	+ htVar.oPicker = new Pikaday({
	46	+ "format": htVar.sDateFormat,
	47	+ "field": welInput.get(0),
	48	+ "setDefaultDate": true,
	49	+ "defaultDate": welInput.val()
	50	+ });
	51	+ welInput.data("pickaday", true);
	52	+
	53	+ htElement.welBtn = welInput.next();
	54	+
	55	+ htElement.welBtn.on("click", function() {
	56	+ htVar.oPicker.show();
	57	+ });
	58	+
	59	+ if(welInput.val().length > 0){
	60	+ htVar.oPicker.setDate(welInput.val());
	61	+ }
	62	+ }
	63	+ }
	64	+
	65	+ function _getDate() {
	66	+ return htVar.oPicker.getDate();
	67	+ }
	68	+
	69	+ function _setDate(dateStr) {
	70	+ return htVar.oPicker.setDate(dateStr);
	71	+ }
	72	+
	73	+ _init(htOptions);
	74	+
	75	+ return {
	76	+ "getDate": _getDate,
	77	+ "setDate": _setDate
	78	+ };
	79	+ };
	80	+
	81	+})("yobi.ui.Calendar");
	82	+
	83	+$(function(){
	84	+ $('[data-toggle="calendar"]').each(function(i, el){
	85	+ yobi.ui.Calendar(el);
	86	+ });
	87	+});

5497913

134d039

public/javascripts/lib/pikaday/pikaday.js

--- public/javascripts/lib/pikaday/pikaday.js

+++ public/javascripts/lib/pikaday/pikaday.js


 /*!
  * Pikaday
- * Copyright © 2012 David Bushell | BSD & MIT license | http://dbushell.com/
+ *
+ * Copyright © 2014 David Bushell | BSD & MIT license | https://github.com/dbushell/Pikaday
  */
 
-(function(window, document, undefined)
+(function (root, factory)
+{
+    'use strict';
+
+    var moment;
+    if (typeof exports === 'object') {
+        // CommonJS module
+        // Load moment.js as an optional dependency
+        try { moment = require('moment'); } catch (e) {}
+        module.exports = factory(moment);
+    } else if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(function (req)
+        {
+            // Load moment.js as an optional dependency
+            var id = 'moment';
+            moment = req.defined && req.defined(id) ? req(id) : undefined;
+            return factory(moment);
+        });
+    } else {
+        root.Pikaday = factory(root.moment);
+    }
+}(this, function (moment)
 {
     'use strict';
 
     /**
      * feature detection and helper functions
      */
-    var hasMoment = typeof window.moment === 'function',
+    var hasMoment = typeof moment === 'function',
 
-    hasEventListeners = !!window.addEventListener,
+        hasEventListeners = !!window.addEventListener,
 
-    sto = window.setTimeout,
+        document = window.document,
 
-    addEvent = function(el, e, callback, capture)
-    {
-        if (hasEventListeners) {
-            el.addEventListener(e, callback, !!capture);
-        } else {
-            el.attachEvent('on' + e, callback);
-        }
-    },
+        sto = window.setTimeout,
 
-    removeEvent = function(el, e, callback, capture)
-    {
-        if (hasEventListeners) {
-            el.removeEventListener(e, callback, !!capture);
-        } else {
-            el.detachEvent('on' + e, callback);
-        }
-    },
-
-    trim = function(str)
-    {
-        return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g,'');
-    },
-
-    hasClass = function(el, cn)
-    {
-        return (' ' + el.className + ' ').indexOf(' ' + cn + ' ') !== -1;
-    },
-
-    addClass = function(el, cn)
-    {
-        if (!hasClass(el, cn)) {
-            el.className = (el.className === '') ? cn : el.className + ' ' + cn;
-        }
-    },
-
-    removeClass = function(el, cn)
-    {
-        el.className = trim((' ' + el.className + ' ').replace(' ' + cn + ' ', ' '));
-    },
-
-    isArray = function(obj)
-    {
-        return (/Array/).test(Object.prototype.toString.call(obj));
-    },
-
-    isDate = function(obj)
-    {
-        return (/Date/).test(Object.prototype.toString.call(obj)) && !isNaN(obj.getTime());
-    },
-
-    isLeapYear = function(year)
-    {
-        // solution by Matti Virkkunen: http://stackoverflow.com/a/4881951
-        return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
-    },
-
-    getDaysInMonth = function(year, month)
-    {
-        return [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
-    },
-
-    compareDates = function(a,b)
-    {
-        // weak date comparison (use date.setHours(0,0,0,0) to ensure correct result)
-        return a.getTime() === b.getTime();
-    },
-
-    extend = function(to, from, overwrite)
-    {
-        var prop, hasProp;
-        for (prop in from) {
-            hasProp = to[prop] !== undefined;
-            if (hasProp && typeof from[prop] === 'object' && from[prop].nodeName === undefined) {
-                if (isDate(from[prop])) {
-                    if (overwrite) {
-                        to[prop] = new Date(from[prop].getTime());
-                    }
-                }
-                else if (isArray(from[prop])) {
-                    if (overwrite) {
-                        to[prop] = from[prop].slice(0);
-                    }
-                } else {
-                    to[prop] = extend({}, from[prop], overwrite);
-                }
-            } else if (overwrite || !hasProp) {
-                to[prop] = from[prop];
+        addEvent = function(el, e, callback, capture)
+        {
+            if (hasEventListeners) {
+                el.addEventListener(e, callback, !!capture);
+            } else {
+                el.attachEvent('on' + e, callback);
             }
-        }
-        return to;
-    },
-
-
-    /**
-     * defaults and localisation
-     */
-    defaults = {
-
-        // bind the picker to a form field
-        field: null,
-
-        // automatically show/hide the picker on `field` focus (default `true` if `field` is set)
-        bound: undefined,
-
-        // the default output format for `.toString()` and `field` value
-        format: 'YYYY-MM-DD',
-
-        // the initial date to view when first opened
-        defaultDate: null,
-
-        // make the `defaultDate` the initial selected value
-        setDefaultDate: false,
-
-        // first day of week (0: Sunday, 1: Monday etc)
-        firstDay: 0,
-
-        // the minimum/earliest date that can be selected
-        minDate: null,
-        // the maximum/latest date that can be selected
-        maxDate: null,
-
-        // number of years either side, or array of upper/lower range
-        yearRange: 10,
-
-        // used internally (don't config outside)
-        minYear: 0,
-        maxYear: 9999,
-        minMonth: undefined,
-        maxMonth: undefined,
-
-        isRTL: false,
-
-        // how many months are visible (not implemented yet)
-        numberOfMonths: 1,
-
-        // internationalization
-        i18n: {
-
-                months        : ['January','February','March','April','May','June','July','August','September','October','November','December'],
-                //monthsShort   : ['Jan_Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'],
-                weekdays      : ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
-                weekdaysShort : ['Sun','Mon','Tue','Wed','Thu','Fri','Sat']
         },
 
-        // callback function
-        onSelect: null,
-        onOpen: null,
-        onClose: null
-    },
-
-
-    /**
-     * templating functions to abstract HTML rendering
-     */
-    renderDayName = function(opts, day, abbr)
-    {
-        day += opts.firstDay;
-        while (day >= 7) {
-            day -= 7;
-        }
-        return abbr ? opts.i18n.weekdaysShort[day] : opts.i18n.weekdays[day];
-    },
-
-    renderDay = function(i, isSelected, isToday, isDisabled, isEmpty)
-    {
-        if (isEmpty) {
-            return '<td class="is-empty"></td>';
-        }
-        var arr = [];
-        if (isDisabled) {
-            arr.push('is-disabled');
-        }
-        if (isToday) {
-            arr.push('is-today');
-        }
-        if (isSelected) {
-            arr.push('is-selected');
-        }
-        return '<td data-day="' + i + '" class="' + arr.join(' ') + '"><button class="pika-button" type="button">' + i + '</button>' + '</td>';
-    },
-
-    renderRow = function(days, isRTL)
-    {
-        return '<tr>' + (isRTL ? days.reverse() : days).join('') + '</tr>';
-    },
-
-    renderBody = function(rows)
-    {
-        return '<tbody>' + rows.join('') + '</tbody>';
-    },
-
-    renderHead = function(opts)
-    {
-        var i, arr = [];
-        for (i = 0; i < 7; i++) {
-            arr.push('<th scope="col"><abbr title="' + renderDayName(opts, i) + '">' + renderDayName(opts, i, true) + '</abbr></th>');
-        }
-        return '<thead>' + (opts.isRTL ? arr.reverse() : arr).join('') + '</thead>';
-    },
-
-    renderTitle = function(instance)
-    {
-        var i, j, arr,
-            opts = instance._o,
-            month = instance._m,
-            year  = instance._y,
-            isMinYear = year === opts.minYear,
-            isMaxYear = year === opts.maxYear,
-            html = '<div class="pika-title">',
-            prev = true,
-            next = true;
-
-        for (arr = [], i = 0; i < 12; i++) {
-            arr.push('<option value="' + i + '"' +
-                (i === month ? ' selected': '') +
-                ((isMinYear && i < opts.minMonth) || (isMaxYear && i > opts.maxMonth) ? 'disabled' : '') + '>' +
-                opts.i18n.months[i] + '</option>');
-        }
-        html += '<div class="pika-label">' + opts.i18n.months[month] + '<select class="pika-select pika-select-month">' + arr.join('') + '</select></div>';
-
-        if (isArray(opts.yearRange)) {
-            i = opts.yearRange[0];
-            j = opts.yearRange[1] + 1;
-        } else {
-            i = year - opts.yearRange;
-            j = 1 + year + opts.yearRange;
-        }
-
-        for (arr = []; i < j && i <= opts.maxYear; i++) {
-            if (i >= opts.minYear) {
-                arr.push('<option value="' + i + '"' + (i === year ? ' selected': '') + '>' + (i) + '</option>');
-            }
-        }
-        html += '<div class="pika-label">' + year + '<select class="pika-select pika-select-year">' + arr.join('') + '</select></div>';
-
-        if (isMinYear && (month === 0 || opts.minMonth >= month)) {
-            prev = false;
-        }
-
-        if (isMaxYear && (month === 11 || opts.maxMonth <= month)) {
-            next = false;
-        }
-
-        html += '<button class="pika-prev' + (prev ? '' : ' is-disabled') + '" type="button">Previous Month</button>';
-        html += '<button class="pika-next' + (next ? '' : ' is-disabled') + '" type="button">Next Month</button>';
-
-        return html += '</div>';
-    },
-
-    renderTable = function(opts, data)
-    {
-        return '<table cellpadding="0" cellspacing="0" class="pika-table">' + renderHead(opts) + renderBody(data) + '</table>';
-    };
-
-
-    /**
-     * Pikaday constructor
-     */
-    window.Pikaday = function(options)
-    {
-        var self = this,
-            opts = self.config(options);
-
-        self._onMouseDown = function(e)
+        removeEvent = function(el, e, callback, capture)
         {
-            if (!self._v) {
-                return;
+            if (hasEventListeners) {
+                el.removeEventListener(e, callback, !!capture);
+            } else {
+                el.detachEvent('on' + e, callback);
             }
-            e = e || window.event;
-            var target = e.target || e.srcElement;
-            if (!target) {
-                return;
-            }
+        },
 
-            if (!hasClass(target, 'is-disabled')) {
-                if (hasClass(target, 'pika-button') && !hasClass(target, 'is-empty')) {
-                    self.setDate(new Date(self._y, self._m, parseInt(target.innerHTML, 10)));
-                    if (opts.bound) {
-                        sto(function() {
-                            self.hide();
-                        }, 100);
+        fireEvent = function(el, eventName, data)
+        {
+            var ev;
+
+            if (document.createEvent) {
+                ev = document.createEvent('HTMLEvents');
+                ev.initEvent(eventName, true, false);
+                ev = extend(ev, data);
+                el.dispatchEvent(ev);
+            } else if (document.createEventObject) {
+                ev = document.createEventObject();
+                ev = extend(ev, data);
+                el.fireEvent('on' + eventName, ev);
+            }
+        },
+
+        trim = function(str)
+        {
+            return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g,'');
+        },
+
+        hasClass = function(el, cn)
+        {
+            return (' ' + el.className + ' ').indexOf(' ' + cn + ' ') !== -1;
+        },
+
+        addClass = function(el, cn)
+        {
+            if (!hasClass(el, cn)) {
+                el.className = (el.className === '') ? cn : el.className + ' ' + cn;
+            }
+        },
+
+        removeClass = function(el, cn)
+        {
+            el.className = trim((' ' + el.className + ' ').replace(' ' + cn + ' ', ' '));
+        },
+
+        isArray = function(obj)
+        {
+            return (/Array/).test(Object.prototype.toString.call(obj));
+        },
+
+        isDate = function(obj)
+        {
+            return (/Date/).test(Object.prototype.toString.call(obj)) && !isNaN(obj.getTime());
+        },
+
+        isLeapYear = function(year)
+        {
+            // solution by Matti Virkkunen: http://stackoverflow.com/a/4881951
+            return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+        },
+
+        getDaysInMonth = function(year, month)
+        {
+            return [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
+        },
+
+        setToStartOfDay = function(date)
+        {
+            if (isDate(date)) date.setHours(0,0,0,0);
+        },
+
+        compareDates = function(a,b)
+        {
+            // weak date comparison (use setToStartOfDay(date) to ensure correct result)
+            return a.getTime() === b.getTime();
+        },
+
+        extend = function(to, from, overwrite)
+        {
+            var prop, hasProp;
+            for (prop in from) {
+                hasProp = to[prop] !== undefined;
+                if (hasProp && typeof from[prop] === 'object' && from[prop].nodeName === undefined) {
+                    if (isDate(from[prop])) {
+                        if (overwrite) {
+                            to[prop] = new Date(from[prop].getTime());
+                        }
                     }
+                    else if (isArray(from[prop])) {
+                        if (overwrite) {
+                            to[prop] = from[prop].slice(0);
+                        }
+                    } else {
+                        to[prop] = extend({}, from[prop], overwrite);
+                    }
+                } else if (overwrite || !hasProp) {
+                    to[prop] = from[prop];
+                }
+            }
+            return to;
+        },
+
+        adjustCalendar = function(calendar) {
+            if (calendar.month < 0) {
+                calendar.year -= Math.ceil(Math.abs(calendar.month)/12);
+                calendar.month += 12;
+            }
+            if (calendar.month > 11) {
+                calendar.year += Math.floor(Math.abs(calendar.month)/12);
+                calendar.month -= 12;
+            }
+            return calendar;
+        },
+
+        /**
+         * defaults and localisation
+         */
+        defaults = {
+
+            // bind the picker to a form field
+            field: null,
+
+            // automatically show/hide the picker on `field` focus (default `true` if `field` is set)
+            bound: undefined,
+
+            // position of the datepicker, relative to the field (default to bottom & left)
+            // ('bottom' & 'left' keywords are not used, 'top' & 'right' are modifier on the bottom/left position)
+            position: 'bottom left',
+
+            // the default output format for `.toString()` and `field` value
+            format: 'YYYY-MM-DD',
+
+            // the initial date to view when first opened
+            defaultDate: null,
+
+            // make the `defaultDate` the initial selected value
+            setDefaultDate: false,
+
+            // first day of week (0: Sunday, 1: Monday etc)
+            firstDay: 0,
+
+            // the minimum/earliest date that can be selected
+            minDate: null,
+            // the maximum/latest date that can be selected
+            maxDate: null,
+
+            // number of years either side, or array of upper/lower range
+            yearRange: 10,
+
+            // show week numbers at head of row
+            showWeekNumber: false,
+
+            // used internally (don't config outside)
+            minYear: 0,
+            maxYear: 9999,
+            minMonth: undefined,
+            maxMonth: undefined,
+
+            isRTL: false,
+
+            // Additional text to append to the year in the calendar title
+            yearSuffix: '',
+
+            // Render the month after year in the calendar title
+            showMonthAfterYear: false,
+
+            // how many months are visible
+            numberOfMonths: 1,
+
+            // when numberOfMonths is used, this will help you to choose where the main calendar will be (default `left`, can be set to `right`)
+            // only used for the first display or when a selected date is not visible
+            mainCalendar: 'left',
+
+            // Specify a DOM element to render the calendar in
+            container: undefined,
+
+            // internationalization
+            i18n: {
+                previousMonth : 'Previous Month',
+                nextMonth     : 'Next Month',
+                months        : ['January','February','March','April','May','June','July','August','September','October','November','December'],
+                weekdays      : ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
+                weekdaysShort : ['Sun','Mon','Tue','Wed','Thu','Fri','Sat']
+            },
+
+            // callback function
+            onSelect: null,
+            onOpen: null,
+            onClose: null,
+            onDraw: null
+        },
+
+
+        /**
+         * templating functions to abstract HTML rendering
+         */
+        renderDayName = function(opts, day, abbr)
+        {
+            day += opts.firstDay;
+            while (day >= 7) {
+                day -= 7;
+            }
+            return abbr ? opts.i18n.weekdaysShort[day] : opts.i18n.weekdays[day];
+        },
+
+        renderDay = function(d, m, y, isSelected, isToday, isDisabled, isEmpty)
+        {
+            if (isEmpty) {
+                return '<td class="is-empty"></td>';
+            }
+            var arr = [];
+            if (isDisabled) {
+                arr.push('is-disabled');
+            }
+            if (isToday) {
+                arr.push('is-today');
+            }
+            if (isSelected) {
+                arr.push('is-selected');
+            }
+            return '<td data-day="' + d + '" class="' + arr.join(' ') + '">' +
+                '<button class="pika-button pika-day" type="button" ' +
+                'data-pika-year="' + y + '" data-pika-month="' + m + '" data-pika-day="' + d + '">' +
+                d +
+                '</button>' +
+                '</td>';
+        },
+
+        renderWeek = function (d, m, y) {
+            // Lifted from http://javascript.about.com/library/blweekyear.htm, lightly modified.
+            var onejan = new Date(y, 0, 1),
+                weekNum = Math.ceil((((new Date(y, m, d) - onejan) / 86400000) + onejan.getDay()+1)/7);
+            return '<td class="pika-week">' + weekNum + '</td>';
+        },
+
+        renderRow = function(days, isRTL)
+        {
+            return '<tr>' + (isRTL ? days.reverse() : days).join('') + '</tr>';
+        },
+
+        renderBody = function(rows)
+        {
+            return '<tbody>' + rows.join('') + '</tbody>';
+        },
+
+        renderHead = function(opts)
+        {
+            var i, arr = [];
+            if (opts.showWeekNumber) {
+                arr.push('<th></th>');
+            }
+            for (i = 0; i < 7; i++) {
+                arr.push('<th scope="col"><abbr title="' + renderDayName(opts, i) + '">' + renderDayName(opts, i, true) + '</abbr></th>');
+            }
+            return '<thead>' + (opts.isRTL ? arr.reverse() : arr).join('') + '</thead>';
+        },
+
+        renderTitle = function(instance, c, year, month, refYear)
+        {
+            var i, j, arr,
+                opts = instance._o,
+                isMinYear = year === opts.minYear,
+                isMaxYear = year === opts.maxYear,
+                html = '<div class="pika-title">',
+                monthHtml,
+                yearHtml,
+                prev = true,
+                next = true;
+
+            for (arr = [], i = 0; i < 12; i++) {
+                arr.push('<option value="' + (year === refYear ? i - c : 12 + i - c) + '"' +
+                    (i === month ? ' selected': '') +
+                    ((isMinYear && i < opts.minMonth) || (isMaxYear && i > opts.maxMonth) ? 'disabled' : '') + '>' +
+                    opts.i18n.months[i] + '</option>');
+            }
+            monthHtml = '<div class="pika-label">' + opts.i18n.months[month] + '<select class="pika-select pika-select-month">' + arr.join('') + '</select></div>';
+
+            if (isArray(opts.yearRange)) {
+                i = opts.yearRange[0];
+                j = opts.yearRange[1] + 1;
+            } else {
+                i = year - opts.yearRange;
+                j = 1 + year + opts.yearRange;
+            }
+
+            for (arr = []; i < j && i <= opts.maxYear; i++) {
+                if (i >= opts.minYear) {
+                    arr.push('<option value="' + i + '"' + (i === year ? ' selected': '') + '>' + (i) + '</option>');
+                }
+            }
+            yearHtml = '<div class="pika-label">' + year + opts.yearSuffix + '<select class="pika-select pika-select-year">' + arr.join('') + '</select></div>';
+
+            if (opts.showMonthAfterYear) {
+                html += yearHtml + monthHtml;
+            } else {
+                html += monthHtml + yearHtml;
+            }
+
+            if (isMinYear && (month === 0 || opts.minMonth >= month)) {
+                prev = false;
+            }
+
+            if (isMaxYear && (month === 11 || opts.maxMonth <= month)) {
+                next = false;
+            }
+
+            if (c === 0) {
+                html += '<button class="pika-prev' + (prev ? '' : ' is-disabled') + '" type="button">' + opts.i18n.previousMonth + '</button>';
+            }
+            if (c === (instance._o.numberOfMonths - 1) ) {
+                html += '<button class="pika-next' + (next ? '' : ' is-disabled') + '" type="button">' + opts.i18n.nextMonth + '</button>';
+            }
+
+            return html += '</div>';
+        },
+
+        renderTable = function(opts, data)
+        {
+            return '<table cellpadding="0" cellspacing="0" class="pika-table">' + renderHead(opts) + renderBody(data) + '</table>';
+        },
+
+
+        /**
+         * Pikaday constructor
+         */
+        Pikaday = function(options)
+        {
+            var self = this,
+                opts = self.config(options);
+
+            self._onMouseDown = function(e)
+            {
+                if (!self._v) {
                     return;
                 }
-                else if (hasClass(target, 'pika-prev')) {
-                    self.prevMonth();
+                e = e || window.event;
+                var target = e.target || e.srcElement;
+                if (!target) {
+                    return;
                 }
-                else if (hasClass(target, 'pika-next')) {
-                    self.nextMonth();
+
+                if (!hasClass(target, 'is-disabled')) {
+                    if (hasClass(target, 'pika-button') && !hasClass(target, 'is-empty')) {
+                        self.setDate(new Date(target.getAttribute('data-pika-year'), target.getAttribute('data-pika-month'), target.getAttribute('data-pika-day')));
+                        if (opts.bound) {
+                            sto(function() {
+                                self.hide();
+                                if (opts.field) {
+                                    opts.field.blur();
+                                }
+                            }, 100);
+                        }
+                        return;
+                    }
+                    else if (hasClass(target, 'pika-prev')) {
+                        self.prevMonth();
+                    }
+                    else if (hasClass(target, 'pika-next')) {
+                        self.nextMonth();
+                    }
                 }
-            }
-            if (!hasClass(target, 'pika-select')) {
-                if (e.preventDefault) {
-                    e.preventDefault();
+                if (!hasClass(target, 'pika-select')) {
+                    if (e.preventDefault) {
+                        e.preventDefault();
+                    } else {
+                        e.returnValue = false;
+                        return false;
+                    }
                 } else {
-                    return e.returnValue = false;
+                    self._c = true;
                 }
-            } else {
-                self._c = true;
-            }
-        };
+            };
 
-        self._onChange = function(e)
-        {
-            e = e || window.event;
-            var target = e.target || e.srcElement;
-            if (!target) {
-                return;
-            }
-            if (hasClass(target, 'pika-select-month')) {
-                self.gotoMonth(target.value);
-            }
-            else if (hasClass(target, 'pika-select-year')) {
-                self.gotoYear(target.value);
-            }
-        };
+            self._onChange = function(e)
+            {
+                e = e || window.event;
+                var target = e.target || e.srcElement;
+                if (!target) {
+                    return;
+                }
+                if (hasClass(target, 'pika-select-month')) {
+                    self.gotoMonth(target.value);
+                }
+                else if (hasClass(target, 'pika-select-year')) {
+                    self.gotoYear(target.value);
+                }
+            };
 
-        self._onInputChange = function(e)
-        {
-            if (hasMoment) {
-                self.setDate(window.moment(opts.field.value, opts.format).toDate());
-            }
-            else {
-                var date = new Date(Date.parse(opts.field.value));
+            self._onInputChange = function(e)
+            {
+                var date;
+
+                if (e.firedBy === self) {
+                    return;
+                }
+                if (hasMoment) {
+                    date = moment(opts.field.value, opts.format);
+                    date = (date && date.isValid()) ? date.toDate() : null;
+                }
+                else {
+                    date = new Date(Date.parse(opts.field.value));
+                }
                 self.setDate(isDate(date) ? date : null);
-            }
-            if (!self._v) {
-                self.show();
-            }
-        };
-
-        self._onInputFocus = function(e)
-        {
-            self.show();
-        };
-
-        self._onInputClick = function(e)
-        {
-            self.show();
-        };
-
-        self._onInputBlur = function(e)
-        {
-            if (!self._c) {
-                self._b = sto(function() {
-                    self.hide();
-                }, 50);
-            }
-            self._c = false;
-        };
-
-        self._onClick = function(e)
-        {
-            e = e || window.event;
-            var target = e.target || e.srcElement,
-                pEl = target;
-            if (!target) {
-                return;
-            }
-            if (!hasEventListeners && hasClass(target, 'pika-select')) {
-                if (!target.onchange) {
-                    target.setAttribute('onchange', 'return;');
-                    addEvent(target, 'change', self._onChange);
+                if (!self._v) {
+                    self.show();
                 }
-            }
-            do {
-                if (hasClass(pEl, 'pika-single')) {
+            };
+
+            self._onInputFocus = function()
+            {
+                self.show();
+            };
+
+            self._onInputClick = function()
+            {
+                self.show();
+            };
+
+            self._onInputBlur = function()
+            {
+                if (!self._c) {
+                    self._b = sto(function() {
+                        self.hide();
+                    }, 50);
+                }
+                self._c = false;
+            };
+
+            self._onClick = function(e)
+            {
+                e = e || window.event;
+                var target = e.target || e.srcElement,
+                    pEl = target;
+                if (!target) {
                     return;
                 }
+                if (!hasEventListeners && hasClass(target, 'pika-select')) {
+                    if (!target.onchange) {
+                        target.setAttribute('onchange', 'return;');
+                        addEvent(target, 'change', self._onChange);
+                    }
+                }
+                do {
+                    if (hasClass(pEl, 'pika-single')) {
+                        return;
+                    }
+                }
+                while ((pEl = pEl.parentNode));
+                if (self._v && target !== opts.trigger) {
+                    self.hide();
+                }
+            };
+
+            self.el = document.createElement('div');
+            self.el.className = 'pika-single' + (opts.isRTL ? ' is-rtl' : '');
+
+            addEvent(self.el, 'mousedown', self._onMouseDown, true);
+            addEvent(self.el, 'change', self._onChange);
+
+            if (opts.field) {
+                if (opts.container) {
+                    opts.container.appendChild(self.el);
+                } else if (opts.bound) {
+                    document.body.appendChild(self.el);
+                } else {
+                    opts.field.parentNode.insertBefore(self.el, opts.field.nextSibling);
+                }
+                addEvent(opts.field, 'change', self._onInputChange);
+
+                if (!opts.defaultDate) {
+                    if (hasMoment && opts.field.value) {
+                        opts.defaultDate = moment(opts.field.value, opts.format).toDate();
+                    } else {
+                        opts.defaultDate = new Date(Date.parse(opts.field.value));
+                    }
+                    opts.setDefaultDate = true;
+                }
             }
-            while ((pEl = pEl.parentNode));
-            if (self._v && target !== opts.field) {
-                self.hide();
+
+            var defDate = opts.defaultDate;
+
+            if (isDate(defDate)) {
+                if (opts.setDefaultDate) {
+                    self.setDate(defDate, true);
+                } else {
+                    self.gotoDate(defDate);
+                }
+            } else {
+                self.gotoDate(new Date());
+            }
+
+            if (opts.bound) {
+                this.hide();
+                self.el.className += ' is-bound';
+                addEvent(opts.trigger, 'click', self._onInputClick);
+                addEvent(opts.trigger, 'focus', self._onInputFocus);
+                addEvent(opts.trigger, 'blur', self._onInputBlur);
+            } else {
+                this.show();
             }
         };
-
-        self.el = document.createElement('div');
-        self.el.className = 'pika-single' + (opts.isRTL ? ' is-rtl' : '');
-
-        addEvent(self.el, 'mousedown', self._onMouseDown, true);
-        addEvent(self.el, 'change', self._onChange);
-
-        if (opts.field) {
-            if (opts.bound) {
-                document.body.appendChild(self.el);
-            } else {
-                opts.field.parentNode.insertBefore(self.el, opts.field.nextSibling);
-            }
-            addEvent(opts.field, 'change', self._onInputChange);
-            
-            if (!opts.defaultDate) {
-                if (hasMoment && opts.field.value) {
-                    opts.defaultDate = window.moment(opts.field.value, opts.format).toDate();
-                } else {
-                    opts.defaultDate = new Date(Date.parse(opts.field.value));
-                }
-                opts.setDefaultDate = true;
-            }
-        }
-
-        var defDate = opts.defaultDate;
-
-        if (isDate(defDate)) {
-            if (opts.setDefaultDate) {
-                self.setDate(defDate);
-            } else {
-                self.gotoDate(defDate);
-            }
-        } else {
-            self.gotoDate(new Date());
-        }
-
-        if (opts.bound) {
-            this.hide();
-            self.el.className += ' is-bound';
-            addEvent(opts.field, 'click', self._onInputClick);
-            addEvent(opts.field, 'focus', self._onInputFocus);
-            addEvent(opts.field, 'blur', self._onInputBlur);
-        } else {
-            this.show();
-        }
-
-    };
 
 
     /**
      * public Pikaday API
      */
-    window.Pikaday.prototype = {
+    Pikaday.prototype = {
 
 
         /**

 
             opts.bound = !!(opts.bound !== undefined ? opts.field && opts.bound : opts.field);
 
+            opts.trigger = (opts.trigger && opts.trigger.nodeName) ? opts.trigger : opts.field;
+
             var nom = parseInt(opts.numberOfMonths, 10) || 1;
             opts.numberOfMonths = nom > 4 ? 4 : nom;
 

                 opts.maxDate = opts.minDate = false;
             }
             if (opts.minDate) {
-                opts.minYear = opts.minDate.getFullYear();
+                setToStartOfDay(opts.minDate);
+                opts.minYear  = opts.minDate.getFullYear();
                 opts.minMonth = opts.minDate.getMonth();
             }
             if (opts.maxDate) {
-                opts.maxYear = opts.maxDate.getFullYear();
+                setToStartOfDay(opts.maxDate);
+                opts.maxYear  = opts.maxDate.getFullYear();
                 opts.maxMonth = opts.maxDate.getMonth();
             }
 

          */
         toString: function(format)
         {
-            return !isDate(this._d) ? '' : hasMoment ? window.moment(this._d).format(format || this._o.format) : this._d.toDateString();
+            return !isDate(this._d) ? '' : hasMoment ? moment(this._d).format(format || this._o.format) : this._d.toDateString();
         },
 
         /**

          */
         getMoment: function()
         {
-            return hasMoment ? window.moment(this._d) : null;
+            return hasMoment ? moment(this._d) : null;
+        },
+
+        /**
+         * set the current selection from a Moment.js object (if available)
+         */
+        setMoment: function(date, preventOnSelect)
+        {
+            if (hasMoment && moment.isMoment(date)) {
+                this.setDate(date.toDate(), preventOnSelect);
+            }
         },
 
         /**

         /**
          * set the current selection
          */
-        setDate: function(date)
+        setDate: function(date, preventOnSelect)
         {
             if (!date) {
                 this._d = null;

             }
 
             this._d = new Date(date.getTime());
-            this._d.setHours(0,0,0,0);
+            setToStartOfDay(this._d);
             this.gotoDate(this._d);
 
             if (this._o.field) {
                 this._o.field.value = this.toString();
+                fireEvent(this._o.field, 'change', { firedBy: this });
             }
-            if (typeof this._o.onSelect === 'function') {
+            if (!preventOnSelect && typeof this._o.onSelect === 'function') {
                 this._o.onSelect.call(this, this.getDate());
             }
         },

          */
         gotoDate: function(date)
         {
+            var newCalendar = true;
+
             if (!isDate(date)) {
                 return;
             }
-            this._y = date.getFullYear();
-            this._m = date.getMonth();
+
+            if (this.calendars) {
+                var firstVisibleDate = new Date(this.calendars[0].year, this.calendars[0].month, 1),
+                    lastVisibleDate = new Date(this.calendars[this.calendars.length-1].year, this.calendars[this.calendars.length-1].month, 1),
+                    visibleDate = date.getTime();
+                // get the end of the month
+                lastVisibleDate.setMonth(lastVisibleDate.getMonth()+1);
+                lastVisibleDate.setDate(lastVisibleDate.getDate()-1);
+                newCalendar = (visibleDate < firstVisibleDate.getTime() || lastVisibleDate.getTime() < visibleDate);
+            }
+
+            if (newCalendar) {
+                this.calendars = [{
+                    month: date.getMonth(),
+                    year: date.getFullYear()
+                }];
+                if (this._o.mainCalendar === 'right') {
+                    this.calendars[0].month += 1 - this._o.numberOfMonths;
+                }
+            }
+
+            this.adjustCalendars();
+        },
+
+        adjustCalendars: function() {
+            this.calendars[0] = adjustCalendar(this.calendars[0]);
+            for (var c = 1; c < this._o.numberOfMonths; c++) {
+                this.calendars[c] = adjustCalendar({
+                    month: this.calendars[0].month + c,
+                    year: this.calendars[0].year
+                });
+            }
             this.draw();
         },
 

          */
         gotoMonth: function(month)
         {
-            if (!isNaN( (month = parseInt(month, 10)) )) {
-                this._m = month < 0 ? 0 : month > 11 ? 11 : month;
-                this.draw();
+            if (!isNaN(month)) {
+                this.calendars[0].month = parseInt(month, 10);
+                this.adjustCalendars();
             }
         },
 
         nextMonth: function()
         {
-            if (++this._m > 11) {
-                this._m = 0;
-                this._y++;
-            }
-            this.draw();
+            this.calendars[0].month++;
+            this.adjustCalendars();
         },
 
         prevMonth: function()
         {
-            if (--this._m < 0) {
-                this._m = 11;
-                this._y--;
-            }
-            this.draw();
+            this.calendars[0].month--;
+            this.adjustCalendars();
         },
 
         /**

         gotoYear: function(year)
         {
             if (!isNaN(year)) {
-                this._y = parseInt(year, 10);
-                this.draw();
+                this.calendars[0].year = parseInt(year, 10);
+                this.adjustCalendars();
             }
+        },
+
+        /**
+         * change the minDate
+         */
+        setMinDate: function(value)
+        {
+            this._o.minDate = value;
+        },
+
+        /**
+         * change the maxDate
+         */
+        setMaxDate: function(value)
+        {
+            this._o.maxDate = value;
         },
 
         /**

                 minYear = opts.minYear,
                 maxYear = opts.maxYear,
                 minMonth = opts.minMonth,
-                maxMonth = opts.maxMonth;
+                maxMonth = opts.maxMonth,
+                html = '';
 
             if (this._y <= minYear) {
                 this._y = minYear;

                 }
             }
 
-            this.el.innerHTML = renderTitle(this) + this.render(this._y, this._m);
+            for (var c = 0; c < opts.numberOfMonths; c++) {
+                html += '<div class="pika-lendar">' + renderTitle(this, c, this.calendars[c].year, this.calendars[c].month, this.calendars[0].year) + this.render(this.calendars[c].year, this.calendars[c].month) + '</div>';
+            }
+
+            this.el.innerHTML = html;
 
             if (opts.bound) {
-                var pEl  = opts.field,
-                    left = pEl.offsetLeft,
-                    top  = pEl.offsetTop + pEl.offsetHeight;
+                if(opts.field.type !== 'hidden') {
+                    sto(function() {
+                        opts.trigger.focus();
+                    }, 1);
+                }
+            }
+
+            if (typeof this._o.onDraw === 'function') {
+                var self = this;
+                sto(function() {
+                    self._o.onDraw.call(self);
+                }, 0);
+            }
+        },
+
+        adjustPosition: function()
+        {
+            if (this._o.container) return;
+            var field = this._o.trigger, pEl = field,
+                width = this.el.offsetWidth, height = this.el.offsetHeight,
+                viewportWidth = window.innerWidth || document.documentElement.clientWidth,
+                viewportHeight = window.innerHeight || document.documentElement.clientHeight,
+                scrollTop = window.pageYOffset || document.body.scrollTop || document.documentElement.scrollTop,
+                left, top, clientRect;


...	...	@@ -3195,6 +3195,9 @@
3195	3195	width: 100%;
3196	3196	}
3197	3197	}
	3198	+ span {
	3199	+ &.over { color:#f36c22; }
	3200	+ }
3198	3201	}
3199	3202	.label-editor {
3200	3203	padding-top:10px;
...	...	@@ -3457,6 +3460,8 @@
3457	3460
3458	3461	.bar { height:100%; }
3459	3462	}
	3463	+
	3464	+ &.over { color:#f36c22; }
3460	3465	}
3461	3466	}
3462	3467	}
...	...	@@ -3482,19 +3487,18 @@
3482	3487	}
3483	3488
3484	3489	.mileston-tag {
3485		- margin-top:7px;
3486		- margin-right: 25px;
3487	3490	font-weight: bold;
3488	3491	max-width: 135px;
3489	3492	text-overflow: ellipsis;
3490	3493	white-space: nowrap;
3491	3494	overflow: hidden;
3492	3495	color: darken(@secondary, 10%);
3493		- padding: 3px 10px;
3494		- background: #f7f7f7;
3495	3496	font-size:11px;
3496	3497	.border-radius(6px);
3497		- .box-shadow(1px 1px 1px rgba(0,0,0,0.15));
	3498	+}
	3499	+
	3500	+.overdue {
	3501	+ color:@yobi-red;
3498	3502	}
3499	3503
3500	3504	.pullRequest-branchInfo {

...	...	@@ -352,6 +352,11 @@
352	352	}
353	353	}
354	354
	355	+ if (issueMassUpdate.isDueDateChanged) {
	356	+ issue.dueDate = issueMassUpdate.dueDate;
	357	+ issue.expandDueDate();
	358	+ }
	359	+
355	360	issue.updatedDate = JodaDateUtil.now();
356	361	issue.update();
357	362	updatedItems++;
...	...	@@ -408,6 +413,7 @@
408	413	addLabels(newIssue, request());
409	414	setMilestone(issueForm, newIssue);
410	415
	416	+ newIssue.expandDueDate();
411	417	newIssue.save();
412	418
413	419	attachUploadFilesToPost(newIssue.asResource());
...	...	@@ -497,6 +503,7 @@
497	503	final Issue issue = issueForm.get();
498	504	removeAnonymousAssignee(issue);
499	505	setMilestone(issueForm, issue);
	506	+ issue.expandDueDate();
500	507
501	508	final Issue originalIssue = Issue.findByNumber(project, number);
502	509

...	...	@@ -106,6 +106,16 @@
106	106	</dl>
107	107	}
108	108
	109	+ <dl class="issue-option">
	110	+ <dt>@Messages("issue.dueDate")</dt>
	111	+ <dd>
	112	+ <div class="search search-bar">
	113	+ <input type="text" id="issueDueDate" data-toggle="calendar" name="dueDate" class="textbox full">
	114	+ <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
	115	+ </div>
	116	+ </dd>
	117	+ </dl>
	118	+
109	119	<dl id="labels" class="issue-option">
110	120	<dt>
111	121	@Messages("label")
...	...	@@ -127,25 +137,26 @@
127	137	@common.markdown(project)
128	138	@common.issueLabel()
129	139	@common.select2()
	140	+@common.calendar()
130	141	<link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">
131	142	<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.caret.min.js")"></script>
132	143	<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.js")"></script>
133	144	<script type="text/javascript">
134		- $(document).ready(function(){
135		- // yobi.Label
	145	+ $(document).ready(function(){
	146	+ // yobi.Label
136	147	yobi.Label.init({
137	148	"sURLLabels": "@routes.IssueLabelApp.labels(project.owner, project.name)",
138	149	"sURLPost" : "@routes.IssueLabelApp.newLabel(project.owner, project.name)"
139	150	});
140	151
141	152	// yobi.issue.Write
142		- $yobi.loadModule("issue.Write", {
143		- "sMode" : "new",
	153	+ $yobi.loadModule("issue.Write", {
	154	+ "sMode": "new",
144	155	"sIssueFormURL": "@routes.IssueApp.newIssueForm(project.owner, project.name)",
145		- "sIssueListURL": "@routes.IssueApp.issues(project.owner, project.name)",
146		- "elTextarea" : 'textarea[data-editor-mode="content-body"]',
147		- "elMilestoneRefresh": $("#milestoneOption .yobicon-refresh")
148		- });
	156	+ "sIssueListURL": "@routes.IssueApp.issues(project.owner, project.name)",
	157	+ "elTextarea": 'textarea[data-editor-mode="content-body"]',
	158	+ "elMilestoneRefresh": $("#milestoneOption .yobicon-refresh"),
	159	+ });
149	160
150	161	// yobi.Mention
151	162	yobi.Mention({

...	...	@@ -144,6 +144,16 @@
144	144	</dl>
145	145	}
146	146
	147	+ <dl class="issue-option">
	148	+ <dt>@Messages("issue.dueDate")</dt>
	149	+ <dd>
	150	+ <div class="search search-bar">
	151	+ <input type="text" id="issueDueDate" data-toggle="calendar" name="dueDate" class="textbox full" value="@issue.getDueDateString">
	152	+ <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
	153	+ </div>
	154	+ </dd>
	155	+ </dl>
	156	+
147	157	<dl id="labels" class="issue-option">
148	158	<dt>
149	159	@Messages("label")
...	...	@@ -165,6 +175,7 @@
165	175	@common.markdown(project)
166	176	@common.issueLabel()
167	177	@common.select2()
	178	+@common.calendar()
168	179	<link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">
169	180	<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.caret.min.js")"></script>
170	181	<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.js")"></script>

...	...	@@ -109,6 +109,7 @@
109	109	<div class="filter-wrap small-heights">
110	110	@if(currentPage.getList.size() > 1){
111	111	<div class="filters pull-right">
	112	+ @makeFilterLink("dueDate", param.orderBy, param.orderDir, Messages("common.order.dueDate"))
112	113	@makeFilterLink("updatedDate", param.orderBy, param.orderDir, Messages("common.order.updatedDate"))
113	114	@makeFilterLink("createdDate", param.orderBy, param.orderDir, Messages("common.order.date"))
114	115	@makeFilterLink("numOfComments", param.orderBy, param.orderDir, Messages("common.order.comments"))

...	...	@@ -32,14 +32,19 @@
32	32	import models.enumeration.State;
33	33	import models.resource.Resource;
34	34	import models.support.SearchCondition;
	35	+import org.apache.commons.lang3.time.DateUtils;
	36	+import org.joda.time.*;
	37	+import org.joda.time.DateTime;
	38	+import play.data.format.Formats;
	39	+import play.i18n.Messages;
35	40	import utils.JodaDateUtil;
36	41
37	42	import javax.persistence.*;
38	43
39		-import org.apache.commons.lang3.StringUtils;
40		-
41	44	import java.io.ByteArrayOutputStream;
42	45	import java.io.IOException;
	46	+import java.lang.Boolean;
	47	+import java.text.SimpleDateFormat;
43	48	import java.util.*;
44	49	import java.util.regex.Pattern;
45	50	import com.avaje.ebean.Page;
...	...	@@ -61,6 +66,9 @@
61	66	public static final Pattern ISSUE_PATTERN = Pattern.compile("#\\d+");
62	67
63	68	public State state;
	69	+
	70	+ @Formats.DateTime(pattern = "yyyy-MM-dd")
	71	+ public Date dueDate;
64	72
65	73	public static List<State> availableStates = new ArrayList<>();
66	74	static {
...	...	@@ -146,6 +154,14 @@
146	154	}
147	155	if(!updateProps.isEmpty()) {
148	156	Ebean.update(this, updateProps);
	157	+ }
	158	+ }
	159	+
	160	+ public void expandDueDate() {
	161	+ if (dueDate != null) {
	162	+ dueDate = DateUtils.setHours(dueDate, 23);
	163	+ dueDate = DateUtils.setMinutes(dueDate, 59);
	164	+ dueDate = DateUtils.setSeconds(dueDate, 59);
149	165	}
150	166	}
151	167
...	...	@@ -439,4 +455,32 @@
439	455	public boolean isVotedBy(User user) {
440	456	return this.voters.contains(user);
441	457	}
	458	+
	459	+ public String getDueDateString() {
	460	+ if (dueDate == null) {
	461	+ return null;
	462	+ }
	463	+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
	464	+ return sdf.format(this.dueDate);
	465	+ }
	466	+
	467	+ public Boolean isOverDueDate(){
	468	+ return (JodaDateUtil.ago(dueDate).getMillis() > 0);
	469	+ }
	470	+
	471	+ public String until(){
	472	+ if (dueDate == null) {
	473	+ return null;
	474	+ }
	475	+
	476	+ Date now = JodaDateUtil.now();
	477	+
	478	+ if (DateUtils.isSameDay(now, dueDate)) {
	479	+ return Messages.get("common.time.today");
	480	+ } else if (isOverDueDate()) {
	481	+ return Messages.get("common.time.default.day", JodaDateUtil.localDaysBetween(dueDate, now));
	482	+ } else {
	483	+ return Messages.get("common.time.default.day", JodaDateUtil.localDaysBetween(now, dueDate));
	484	+ }
	485	+ }
442	486	}

...	...	@@ -21,8 +21,10 @@
21	21	package models;
22	22
23	23	import models.enumeration.State;
	24	+import play.data.format.Formats;
24	25	import play.data.validation.Constraints;
25	26
	27	+import java.util.Date;
26	28	import java.util.List;
27	29
28	30	public class IssueMassUpdate {
...	...	@@ -30,6 +32,9 @@
30	32	public User assignee;
31	33	public Milestone milestone;
32	34	public boolean delete;
	35	+ @Formats.DateTime(pattern = "yyyy-MM-dd")
	36	+ public Date dueDate;
	37	+ public boolean isDueDateChanged;
33	38
34	39	@Constraints.Required
35	40	public List<Issue> issues;

...	...	@@ -27,13 +27,13 @@
27	27	import models.enumeration.State;
28	28	import org.apache.commons.collections.CollectionUtils;
29	29	import org.apache.commons.lang3.StringUtils;
	30	+import org.apache.commons.lang3.time.DateUtils;
	31	+import play.data.format.Formats;
30	32	import utils.LabelSearchUtil;
31	33
32	34	import javax.persistence.Transient;
33		-import java.util.ArrayList;
34		-import java.util.HashSet;
35		-import java.util.List;
36		-import java.util.Set;
	35	+import java.text.SimpleDateFormat;
	36	+import java.util.*;
37	37
38	38	import static models.enumeration.ResourceType.*;
39	39
...	...	@@ -49,6 +49,9 @@
49	49	public Project project;
50	50
51	51	public Long mentionId;
	52	+
	53	+ @Formats.DateTime(pattern = "yyyy-MM-dd")
	54	+ public Date dueDate;
52	55
53	56	/**
54	57	* This doesn't copy {@code pageNum}, because it is safe when changing tabs with page parameter.
...	...	@@ -67,6 +70,7 @@
67	70	one.authorId = this.authorId;
68	71	one.assigneeId = this.assigneeId;
69	72	one.mentionId = this.mentionId;
	73	+ one.dueDate = this.dueDate;
70	74	return one;
71	75	}
72	76
...	...	@@ -199,6 +203,10 @@
199	203	el.orderBy(orderBy + " " + orderDir);
200	204	}
201	205
	206	+ if (dueDate != null) {
	207	+ el.lt("dueDate", DateUtils.addDays(dueDate, 1));
	208	+ }
	209	+
202	210	return el;
203	211	}
204	212
...	...	@@ -301,6 +309,18 @@
301	309	el.orderBy(orderBy + " " + orderDir);
302	310	}
303	311
	312	+ if (dueDate != null) {
	313	+ el.lt("dueDate", DateUtils.addDays(dueDate, 1));
	314	+ }
	315	+
304	316	return el;
305	317	}
	318	+
	319	+ public String getDueDateString() {
	320	+ if (dueDate == null) {
	321	+ return null;
	322	+ }
	323	+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
	324	+ return sdf.format(this.dueDate);
	325	+ }
306	326	}

...	...	@@ -29,6 +29,7 @@
29	29	</div>
30	30	</div>
31	31	@common.select2()
	32	+@common.calendar()
32	33	<script type="text/javascript">
33	34	$(document).ready(function(){
34	35	var htPjaxOptions = {

...	...	@@ -32,7 +32,7 @@
32	32	@for(issue <- issueList){
33	33	@defining(User.findByLoginId(issue.authorLoginId)){ user =>
34	34	<li class="post-item" id="issue-item-@issue.id">
35		- <div class="span9">
	35	+ <div class="span10">
36	36	<a href="@routes.UserApp.userInfo(user.loginId)" class="avatar-wrap mlarge" data-toggle="tooltip" data-placement="top" title="@user.loginId">
37	37	@if(user.avatarUrl == UserApp.DEFAULT_AVATAR_URL){
38	38	<img src="@urlToPicture(user.email, 32)">
...	...	@@ -62,6 +62,14 @@
62	62	@agoOrDateString(issue.createdDate)
63	63	</span>
64	64
	65	+ @if(issue.milestone != null && issue.project != null && issue.project.menuSetting != null && issue.project.menuSetting.milestone) {
	66	+ <span class="infos-item mileston-tag">
	67	+ <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
	68	+ @issue.milestone.title
	69	+ </a>
	70	+ </span>
	71	+ }
	72	+
65	73	@if(issue.comments.size()>0 \|\| issue.voters.size()>0) {
66	74	<span class="infos-item item-count-groups">
67	75	@if(issue.comments.size()>0){
...	...	@@ -78,7 +86,7 @@
78	86	}
79	87	</div>
80	88	</div>
81		- <div class="span3">
	89	+ <div class="span2">
82	90	<div class="mt5 pull-right">
83	91	@if(issue.assigneeName != null) {
84	92	<a href="@routes.UserApp.userInfo(issue.assignee.user.loginId)" class="avatar-wrap assinee" data-toggle="tooltip" data-placement="top" title="@Messages("issue.assignee"): @issue.assigneeName">
...	...	@@ -88,15 +96,16 @@
88	96	<div class="empty-avatar-wrap"> </div>
89	97	}
90	98	</div>
91		- <div class="pull-right">
92		- @if(issue.milestone != null && issue.project != null && issue.project.menuSetting != null && issue.project.menuSetting.milestone) {
93		- <div class="mileston-tag">
94		- <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
95		- @issue.milestone.title
96		- </a>
97		- </div>
	99	+ @if(issue.dueDate != null) {
	100	+ <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
	101	+ <i class="yobicon-clock2"></i>
	102	+ @if(issue.isOverDueDate) {
	103	+ @Messages("issue.dueDate.overdue")
	104	+ } else {
	105	+ @issue.until
98	106	}
99	107	</div>
	108	+ }
100	109	</div>
101	110	</li>
102	111	}

...	...	@@ -65,6 +65,14 @@
65	65	@agoOrDateString(issue.createdDate)
66	66	</span>
67	67
	68	+ @if(project.menuSetting.milestone && issue.milestone != null) {
	69	+ <span class="infos-item mileston-tag">
	70	+ <a href="@routes.MilestoneApp.milestone(project.owner, project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
	71	+ @issue.milestone.title
	72	+ </a>
	73	+ </span>
	74	+ }
	75	+
68	76	@if(issue.comments.size()>0 \|\| issue.voters.size()>0) {
69	77	<span class="infos-item item-count-groups">
70	78	@if(issue.comments.size()>0){
...	...	@@ -92,15 +100,16 @@
92	100	<div class="empty-avatar-wrap"> </div>
93	101	}
94	102	</div>
95		- <div class="pull-right">
96		- @if(project.menuSetting.milestone && issue.milestone != null) {
97		- <div class="mileston-tag">
98		- <a href="@routes.MilestoneApp.milestone(project.owner, project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
99		- @issue.milestone.title
100		- </a>
101		- </div>
	103	+ @if(issue.dueDate != null) {
	104	+ <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
	105	+ <i class="yobicon-clock2"></i>
	106	+ @if(issue.isOverDueDate) {
	107	+ @Messages("issue.dueDate.overdue")
	108	+ } else {
	109	+ @issue.until
102	110	}
103	111	</div>
	112	+ }
104	113	</div>
105	114	</li>
106	115	}

...	...	@@ -177,6 +177,14 @@
177	177	</dd>
178	178	</dl>
179	179	}
	180	+
	181	+ <dl class="issue-option">
	182	+ <dt>@Messages("issue.dueDate")</dt>
	183	+ <dd class="search search-bar">
	184	+ <input type="text" id="issueDueDate" data-toggle="calendar" name="dueDate" class="textbox full" value="@param.getDueDateString">
	185	+ <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
	186	+ </dd>
	187	+ </dl>
180	188	</div>
181	189
182	190	<hr>
...	...	@@ -216,6 +224,7 @@
216	224
217	225	@if(currentPage.getList.size() > 1){
218	226	<div class="filters pull-right">
	227	+ @makeFilterLink("dueDate", param.orderBy, param.orderDir, Messages("common.order.dueDate"))
219	228	@makeFilterLink("updatedDate", param.orderBy, param.orderDir, Messages("common.order.updatedDate"))
220	229	@makeFilterLink("createdDate", param.orderBy, param.orderDir, Messages("common.order.date"))
221	230	@makeFilterLink("numOfComments", param.orderBy, param.orderDir, Messages("common.order.comments"))
...	...	@@ -243,7 +252,7 @@
243	252	<script type="text/javascript">
244	253	$(document).ready(function(){
245	254	// Label
246		- yobi.Label.init({
	255	+ yobi.Label.init({
247	256	"bRefresh" : true,
248	257	"sURLLabels" : "@routes.IssueLabelApp.labels(project.owner, project.name)",
249	258	"sURLPost" : "@routes.IssueLabelApp.newLabel(project.owner, project.name)",
...	...	@@ -252,12 +261,13 @@
252	261
253	262	// issue.List
254	263	$yobi.loadModule("issue.List", {
255		- "welSearchOrder": $("a[orderBy]"),
256		- "welSearchState": $("a[state]"),
257		- "welSearchForm" : $("form[name='search']"),
258		- "welFilter" : $("a[pjax-filter]"),
259		- "elPagination" : $("#pagination"),
260		- "nTotalPages" : @currentPage.getTotalPageCount
	264	+ "welSearchOrder" : $("a[orderBy]"),
	265	+ "welSearchState" : $("a[state]"),
	266	+ "welSearchForm" : $("form[name='search']"),
	267	+ "welFilter" : $("a[pjax-filter]"),
	268	+ "elPagination" : $("#pagination"),
	269	+ "nTotalPages" : @currentPage.getTotalPageCount,
	270	+ "welIssueDueDate" : $("#issueDueDate")
261	271	});
262	272
263	273	// ShortcutKey

...	...	@@ -164,7 +164,11 @@
164	164	<dt>@Messages("milestone")</dt>
165	165	<dd style="padding:5px 10px;">
166	166	@if(Milestone.findByProjectId(project.id).isEmpty()){
	167	+ @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
167	168	<a href="@routes.MilestoneApp.newMilestoneForm(project.owner, project.name)" target="_blank" class="ybtn ybtn-success ybtn-small">@Messages("milestone.menu.new")</a>
	169	+ } else {
	170	+ @Messages("issue.noMilestone")
	171	+ }
168	172	} else {
169	173	@defining(issue.milestone != null) { hasMilestone =>
170	174	@if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
...	...	@@ -208,6 +212,35 @@
208	212	</dl>
209	213	}
210	214	@<!-- // -->@
	215	+
	216	+ <dl class="issue-option">
	217	+ <dt>
	218	+ @Messages("issue.dueDate")
	219	+ @if(issue.dueDate != null) {
	220	+ <span class="@if(issue.isOverDueDate) {overdue}">
	221	+ @if(issue.isOverDueDate) {
	222	+ (@Messages("issue.dueDate.overdue"))
	223	+ } else {
	224	+ (@issue.until)
	225	+ }
	226	+ </span>
	227	+ }
	228	+ </dt>
	229	+ <dd style="padding:5px 10px;">
	230	+ @if(isAllowed(UserApp.currentUser(), issue.asResource(), Operation.UPDATE)) {
	231	+ <div class="search search-bar">
	232	+ <input type="text" id="issueDueDate" data-toggle="calendar" data-oDueDate="@issue.getDueDateString" name="dueDate" class="textbox full" value="@issue.getDueDateString">
	233	+ <button type="button" class="search-btn"><i class="yobicon-calendar2"></i></button>
	234	+ </div>
	235	+ } else {
	236	+ @if(issue.dueDate != null) {
	237	+ @issue.getDueDateString
	238	+ } else {
	239	+ @Messages("issue.noDuedate")
	240	+ }
	241	+ }
	242	+ </dd>
	243	+ </dl>
211	244
212	245	@<!-- labels -->@
213	246	@if(!IssueLabel.findByProject(project).isEmpty){
...	...	@@ -343,6 +376,7 @@
343	376	@common.markdown(project)
344	377	@common.commentDeleteModal()
345	378	@common.select2()
	379	+@common.calendar()
346	380
347	381	<link rel="stylesheet" type="text/css" media="screen" href="@routes.IssueLabelApp.labelStyles(project.owner, project.name)">
348	382	<link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">
...	...	@@ -363,7 +397,8 @@
363	397	"sIssueCheckBoxesSelector": "[type=checkbox][name=checked-issue]",
364	398	"sNextState" : "@issue.nextState().toString.toLowerCase",
365	399	"sNextStateUrl" : "@routes.IssueApp.nextState(project.owner, project.name, issue.getNumber)",
366		- "sCommentWithStateUrl": "@routes.IssueApp.newComment(project.owner, project.name, issue.getNumber)"
	400	+ "sCommentWithStateUrl": "@routes.IssueApp.newComment(project.owner, project.name, issue.getNumber)",
	401	+ "welDueDate": $("#issueDueDate")
367	402	});
368	403
369	404	// yobi.ShortcutKey

...	...	@@ -31,6 +31,7 @@
31	31	<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("bootstrap/css/bootstrap.css")">
32	32	<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/yobicon/style.css")">
33	33	<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("javascripts/lib/select2/select2.css")"/>
	34	+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("javascripts/lib/pikaday/pikaday.css")" />
34	35	<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/yobi.css")">
35	36
36	37	<script type="text/javascript" src="@routes.Assets.at("javascripts/lib/jquery/jquery-1.9.0.js")"></script>

...	...	@@ -30,7 +30,7 @@
30	30	}
31	31	@defining(User.findByLoginId(issue.authorLoginId)){ user =>
32	32	<li class="post-item " id="issue-item-@issue.id">
33		- <div class="span9">
	33	+ <div class="span10">
34	34	<a href="@routes.ProjectApp.project(project.owner, project.name)" class="avatar-wrap mlarge">
35	35	<img src="@urlToProjectLogo(project)" alt="@project.owner / @project.name">
36	36	</a>
...	...	@@ -56,6 +56,14 @@
56	56	@agoOrDateString(issue.createdDate)
57	57	</span>
58	58
	59	+ @if(project.menuSetting.milestone && issue.milestone != null) {
	60	+ <span class="infos-item mileston-tag">
	61	+ <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
	62	+ @issue.milestone.title
	63	+ </a>
	64	+ </span>
	65	+ }
	66	+
59	67	@if(issue.comments.size()>0 \|\| issue.voters.size()>0) {
60	68	<span class="infos-item item-count-groups">
61	69	@if(issue.comments.size()>0){
...	...	@@ -72,7 +80,7 @@
72	80	}
73	81	</div>
74	82	</div>
75		- <div class="span3">
	83	+ <div class="span2">
76	84	<div class="mt5 pull-right">
77	85	@if(issue.assigneeName != null) {
78	86	<a href="@routes.UserApp.userInfo(issue.assignee.user.loginId)" class="avatar-wrap assinee" data-toggle="tooltip" data-placement="top" title="@Messages("issue.assignee"): @issue.assigneeName">
...	...	@@ -83,14 +91,17 @@
83	91	}
84	92	</div>
85	93	<div class="pull-right">
86		- @if(project.menuSetting.milestone && issue.milestone != null) {
87		- <div class="mileston-tag">
88		- <a href="@routes.MilestoneApp.milestone(issue.project.owner, issue.project.name, issue.milestone.id)" data-toggle="tooltip" data-placement="top" title="@Messages("milestone")">
89		- @issue.milestone.title
90		- </a>
91		- </div>
92		- }
	94	+ @if(issue.dueDate != null) {
	95	+ <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
	96	+ <i class="yobicon-clock2"></i>
	97	+ @if(issue.isOverDueDate) {
	98	+ @Messages("issue.dueDate.overdue")
	99	+ } else {
	100	+ @issue.until
	101	+ }
	102	+ </div>
93	103	</div>
	104	+ }
94	105	</div>
95	106	</li>
96	107	}

...	...	@@ -142,17 +142,18 @@
142	142	common.none = None
143	143	common.noAuthor = No author
144	144	common.order.all = All
145		-common.order.comments = Order by comments
146		-common.order.completionRate = Order by completion Rate
147		-common.order.date = Order by date
148		-common.order.dueDate = Order by due date
149		-common.order.name = Order by name
150		-common.order.recent = Order by creation date
151		-common.order.updatedDate = Order by updated date
	145	+common.order.comments = comments
	146	+common.order.completionRate = completion Rate
	147	+common.order.date = created date
	148	+common.order.dueDate = due date
	149	+common.order.name = name
	150	+common.order.recent = creation date
	151	+common.order.updatedDate = updated date
152	152	common.time.after = After {0} days
153	153	common.time.before = Before {0} days
154	154	common.time.day = {0} days ago
155	155	common.time.days = {0} days ago
	156	+common.time.default.day = {0} days
156	157	common.time.hour = {0} hours ago
157	158	common.time.hours = {0} hours ago
158	159	common.time.just = Just now
...	...	@@ -217,6 +218,8 @@
217	218	issue.createdDate = Created date
218	219	issue.delete = Delete issue
219	220	issue.downloadAsExcel = Download as Excel file
	221	+issue.dueDate = Due date
	222	+issue.dueDate.overdue = Overdue
220	223	issue.error.beforeunload = Issue has not saved yet. Would you like to exit this page without saving?
221	224	issue.error.emptyBody = Issue description is a required field.
222	225	issue.error.emptyTitle = Issue title is a required field.
...	...	@@ -238,6 +241,7 @@
238	241	issue.noAssignee = No assignee
239	242	issue.noAuthor = No author
240	243	issue.noMilestone = No milestone
	244	+issue.noDuedate = No due date
241	245	issue.search = SEARCH
242	246	issue.state = Status
243	247	issue.state.all = All
...	...	@@ -250,6 +254,7 @@
250	254	issue.update.assignee = Update assignee
251	255	issue.update.attachLabel = Attach label
252	256	issue.update.detachLabel = Detach label
	257	+issue.update.duedate = Update due date
253	258	issue.update.label = Update label
254	259	issue.update.milestone = Update milestone
255	260	issue.update.state = Update status

...	...	@@ -153,6 +153,7 @@
153	153	common.time.before = {0}일 전
154	154	common.time.day = {0}일 전
155	155	common.time.days = {0}일 전
	156	+common.time.default.day = {0}일
156	157	common.time.hour = {0}시간 전
157	158	common.time.hours = {0}시간 전
158	159	common.time.just = 방금 전
...	...	@@ -217,6 +218,8 @@
217	218	issue.createdDate = 작성일
218	219	issue.delete = 이슈 삭제
219	220	issue.downloadAsExcel = 엑셀파일로 다운받기
	221	+issue.dueDate= 목표 완료일
	222	+issue.dueDate.overdue= 기한지남
220	223	issue.error.beforeunload = 아직 이슈를 저장하지 않았습니다. 저장하지 않은 채로 다른 페이지로 이동하시겠습니까?
221	224	issue.error.emptyBody = 이슈 내용을 입력해주세요
222	225	issue.error.emptyTitle = 이슈 제목을 입력해주세요
...	...	@@ -238,6 +241,7 @@
238	241	issue.noAssignee = 담당자 없음
239	242	issue.noAuthor = 작성자 없음
240	243	issue.noMilestone = 마일스톤 없음
	244	+issue.noDuedate = 목표 완료일 없음
241	245	issue.search = 검색
242	246	issue.state = 상태
243	247	issue.state.all = 전체
...	...	@@ -250,6 +254,7 @@
250	254	issue.update.assignee = 담당자 변경
251	255	issue.update.attachLabel = 라벨 추가
252	256	issue.update.detachLabel = 라벨 제거
	257	+issue.update.duedate = 목표완료일 변경
253	258	issue.update.label = 라벨 변경
254	259	issue.update.milestone = 마일스톤 변경
255	260	issue.update.state = 상태 변경