Skip to content

Commit

Permalink
subtask: Fix designs, alignments and typos
Browse files Browse the repository at this point in the history
  • Loading branch information
doortts committed Mar 13, 2017
1 parent 2bfc22d commit 9c08aea
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 11 deletions.
4 changes: 4 additions & 0 deletions app/assets/stylesheets/less/_page.less
Original file line number Diff line number Diff line change
Expand Up @@ -3412,6 +3412,7 @@ div.markdown-preview {
resize:vertical;
}
.title {
margin-top: 15px;
margin-bottom: 15px;
font-size:18px;
border: none;
Expand Down Expand Up @@ -6596,6 +6597,7 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
}

.right-menu{
margin-top: 10px;
margin-left: 10px;
width: 400px;
}
Expand Down Expand Up @@ -6705,6 +6707,8 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
max-width: 80px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-top: 14px;
&:hover {
color: @primary;
cursor:pointer;
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/less/_responsive.less
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@

.span-hard-wrap {
min-width: 95%;
margin-left: 0 !important;
width: 100vw;
}
.nav-tabs li a {
Expand Down
2 changes: 1 addition & 1 deletion app/views/common/select2.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</div>
</script>
<script id="tplSelect2Projects" type="text/x-jquery-tmpl">
<div class="usf-group" title="${name}>
<div class="usf-group" title="${name}">
<span class="avatar-wrap smaller"><img src="${avatarURL}" width="16" height="16"></span>
<span class="name">${name}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/issue/create.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<div class="span11">
<input type="text" id="title" name="title" value="" class="text title @if(errors != null) {error}" maxlength="250" tabindex="1" placeholder="@Messages("title")">
</div>
<div class="span1"><div><div class="subtask-message">Options</div></div></div>
<div class="span1 subtask-message">@Messages("issue.subtask")</div>
</div>
@if(errors != null) {
<div class="message">
Expand Down
4 changes: 2 additions & 2 deletions app/views/issue/edit.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<div class="span11">
<input type="text" id="title" name="title" value="@issue.title" class="text title @if(errors != null) {error}" maxlength="250" tabindex="1" placeholder="@Messages("title")">
</div>
<div class="span1 subtask-message">@Messages("title.options")</div>
<div class="span1 subtask-message">@Messages("issue.subtask")</div>
</div>
@if(errors != null) {
<div class="message">
Expand Down Expand Up @@ -85,7 +85,7 @@
</div>
</div>

<div class="span3 span-hard-wrap">
<div class="span3 span-hard-wrap right-menu">
@if(isAllowed(UserApp.currentUser(), issue.stateAsResource(), Operation.UPDATE)){
<dl class="issue-option">
<dt>@Messages("issue.state")</dt>
Expand Down
6 changes: 3 additions & 3 deletions conf/messages
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,16 @@ issue.noAuthor = No author
issue.noMilestone = No milestone
issue.noDuedate = No due date
issue.search = SEARCH
issue.subtask.select = -- If you want to make a sub-issue, choose parent issue --
issue.subtask = Sub-Task
issue.subtask.select = - If you want to make a Sub-Task, select the parent issue -
issue.state = Status
issue.state.all = All
issue.state.assigned = Assigned
issue.state.closed = Closed
issue.state.enrolled = Status entered
issue.state.open = Open
issue.template = Issue Template
issue.template.edit = Edit
issue.template.edit = Edit
issue.template.no.attachment.allow = Issue templates do not support attachments.
issue.unvote.description = Click here if you no longer agree with this issue.
issue.unwatch = Unsubscribe this issue
Expand Down Expand Up @@ -891,7 +892,6 @@ title.newOrganization = New Group
title.newProject = Create new project
title.newPullRequest = Send pull request
title.no.results = No results
title.options = Options
title.organization = Groups
title.organizationHome = Group Home
title.post.notExistingPage = Page not found
Expand Down
4 changes: 2 additions & 2 deletions conf/messages.ko-KR
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ issue.noAuthor = 작성자 없음
issue.noMilestone = 마일스톤 없음
issue.noDuedate = 목표 완료일 없음
issue.search = 검색
issue.subtask.select = -- 서브 이슈로 만들고 싶으면 부모 이슈를 선택하세요 --
issue.subtask = 이슈 옵션
issue.subtask.select = — 자식 이슈(Sub-Task)로 지정하고 싶으면 부모 이슈를 선택하세요 —
issue.state = 상태
issue.state.all = 전체
issue.state.assigned = 할당됨
Expand Down Expand Up @@ -882,7 +883,6 @@ title.newOrganization = 새 그룹 만들기
title.newProject = 새 프로젝트 시작
title.newPullRequest = 코드 보내기
title.no.results = 결과 없음
title.options = 옵션
title.organization = 그룹
title.organizationHome = 홈
title.post.notExistingPage = 페이지를 찾지 못했습니다.
Expand Down
2 changes: 1 addition & 1 deletion public/javascripts/common/yona.Subtask.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ $(function () {
var initialProjectId = initialProject.val();
initialProject.on("change", function(){
var parentId = $("#parentId");
console.log("$(this).val()", $(this).val());
if($(this).val() === initialProjectId){
parentId.prop("disabled", false);
parentId.trigger('change.select2');
} else {
parentId.val(parentId.find("option:first").val());
parentId.prop("disabled", true);
parentId.trigger('change.select2');
$yobi.notify("Create or Move to '" + initialProject.find(":selected").text() + "'", 3000);
}
});
});

0 comments on commit 9c08aea

Please sign in to comment.