Commit @4fd614f1c46e9abc63922ae1640fc289af9a44e5

03f4a1b

4fd614f

app/assets/stylesheets/less/_page.less

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

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


 
             .add-a-comment {
                 font-size: 12px;
-                color: #BDC3C7;
+                background-color: #fff;
                 position: relative;
                 right: 10px;
-                margin-top: -1px;
+                color: #00b0e8;
+                border: 1px solid #00b0e8;
+                margin-top: -32px;
+                padding: 0 5px;
+                border-radius: 3px;
+                display: none;
+                z-index: 2;
 
                 &:hover {
-                    color: #00b0e8;
+                    box-shadow: 1px 1px 2px #e0e0e0;
                     cursor: pointer;
                     display: block;
                 }

                     color: red;
                 }
                 .child-comments {
+                    .one-line-comment:last-child {
+                    }
                 }
                 .one-line-comment {
-                    font-size: 12px;
-
                     :hover {
                        background-color: #f1f1f1;
                     }

                     .contents {
                         text-align: left;
                         margin-left: 12px;
-                        padding: 3px 0 2px 10px;
+                        padding: 5px 0 4px 10px;
                         border-bottom: 1px dashed #ccc;
+
+                        .no-text-decoration {
+                            color: #0e90d2;
+                        }
                     }
                     .author {
                         text-align: right;

03f4a1b

4fd614f

app/views/common/childComments.scala.html

--- app/views/common/childComments.scala.html

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


     User.find.byId(authorId)
 }
 
+<div class="add-a-comment pull-right">@Messages("comment.oneline.comment.placeholder")</div>
 <div class="subcomment-media-body">
     <div class="child-comments">
     @for(comment <- posting.getComments) {

     }
     </div>
     @if(isResourceCreatable(UserApp.currentUser, posting.asResource(), resourceType)) {
-        <div class="add-a-comment pull-right">@Messages("comment.oneline.comment.placeholder")</div>
         <div class="child-comment-input-form">
         @common.child_commentForm(posting.asResource(), resourceType, getNewCommentUrl, currentComment.id)
             <div class="one-line-comment-help">@Messages("comment.oneline.comment.help")</div>

03f4a1b

4fd614f

app/views/issue/partial_comment.scala.html

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

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


         <div id="comment-body-@comment.id">
             @common.tasklistBar()
             <div class="comment-body markdown-wrap" data-allowed-update="@isAllowedUpdate" data-via-email="@OriginalEmail.exists(comment.asResource)">@Html(Markdown.render(comment.contents, project))</div>
-            <div class="attachments pull-right" data-attachments="@toJson(AttachmentApp.getFileList(ResourceType.ISSUE_COMMENT.toString(), comment.id.toString()))"></div>
+            <div class="attachments pull-left" data-attachments="@toJson(AttachmentApp.getFileList(ResourceType.ISSUE_COMMENT.toString(), comment.id.toString()))"></div>
         </div>
     </div>
     @common.childComments(issue, comment, ResourceType.ISSUE_COMMENT)

03f4a1b

4fd614f

app/views/issue/view.scala.html

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

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


 
             // Releated with one line sub-comment feature
             $(".add-a-comment").on("click", function(e){
-                var parent = $(this).parent(".subcomment-media-body");
-
-                // Reset & Ready
-                $(".child-comment-input-form").css("display", "none").css("visibility", "hidden");
-                $(".add-a-comment").show();
-                $(this).hide();
+                var parent = $(this).parents(".comment");
 
                 // Show input form
-                parent.find(".child-comment-input-form").css("display", "block").css("visibility", "visible");
+                parent.find(".child-comment-input-form").toggle();
 
                 parent.find("textarea").on('keypress', function(e) {
                     // Enter to submit

                 }).focus();
             });
 
+            $(".comment").on("mouseenter tab", function () {
+                $(this).find(".add-a-comment").fadeIn(300);
+            }).on("mouseleave", function () {
+                $(this).find(".add-a-comment").fadeOut(300);
+            });
+
             // Releated with one line sub-comment feature
             $(".subcomment-author").each(function addAuthorToLastParagraphOfOnelineComment(index, el){
                 // append Author and addtionals to mardkown rendered contents

03f4a1b

4fd614f

conf/messages

--- conf/messages

+++ conf/messages


 code.tooBigFileForCodeBrowser = Sorry, we cannot show a file larger than {0} bytes here.
 code.unknownError = Unknown error
 code.viewRaw = View Raw
-comment.online.comment.help = Only parent comment author will be notified.
+comment.oneline.comment.help = Only parent comment author will be notified.
 comment.oneline.comment.placeholder = Add a comment
 commentThread.close = Close
 commentThread.open = Open

03f4a1b

4fd614f

conf/messages.ko-KR

--- conf/messages.ko-KR

+++ conf/messages.ko-KR


 code.tooBigFileForCodeBrowser = 죄송하지만 {0} 바이트보다 큰 파일은 여기서는 보여드릴 수 없습니다.
 code.unknownError = 알 수 없는 에러가 발생하였습니다.
 code.viewRaw = Raw로 보기
-comment.oneline.comment.help = 한 줄 댓글은 기본적으로 부모 댓글 작성자에게만 알림이 발송됩니다
-comment.oneline.comment.placeholder = 댓글 추가
+comment.oneline.comment.help = 한 줄 댓글은 멘션을 사용하지 않을 경우 부모 댓글 작성자에게만 알림이 발송됩니다.
+comment.oneline.comment.placeholder = 대댓글 추가
 commentThread.close = 리뷰 닫기
 commentThread.open = 리뷰 다시 열기
 common.attach.attachIfYouSave = 표시된 파일은 글을 저장하면 첨부됩니다.

...	...	@@ -2905,13 +2905,19 @@
2905	2905
2906	2906	.add-a-comment {
2907	2907	font-size: 12px;
2908		- color: #BDC3C7;
	2908	+ background-color: #fff;
2909	2909	position: relative;
2910	2910	right: 10px;
2911		- margin-top: -1px;
	2911	+ color: #00b0e8;
	2912	+ border: 1px solid #00b0e8;
	2913	+ margin-top: -32px;
	2914	+ padding: 0 5px;
	2915	+ border-radius: 3px;
	2916	+ display: none;
	2917	+ z-index: 2;
2912	2918
2913	2919	&:hover {
2914		- color: #00b0e8;
	2920	+ box-shadow: 1px 1px 2px #e0e0e0;
2915	2921	cursor: pointer;
2916	2922	display: block;
2917	2923	}
...	...	@@ -2927,10 +2933,10 @@
2927	2933	color: red;
2928	2934	}
2929	2935	.child-comments {
	2936	+ .one-line-comment:last-child {
	2937	+ }
2930	2938	}
2931	2939	.one-line-comment {
2932		- font-size: 12px;
2933		-
2934	2940	:hover {
2935	2941	background-color: #f1f1f1;
2936	2942	}
...	...	@@ -2938,8 +2944,12 @@
2938	2944	.contents {
2939	2945	text-align: left;
2940	2946	margin-left: 12px;
2941		- padding: 3px 0 2px 10px;
	2947	+ padding: 5px 0 4px 10px;
2942	2948	border-bottom: 1px dashed #ccc;
	2949	+
	2950	+ .no-text-decoration {
	2951	+ color: #0e90d2;
	2952	+ }
2943	2953	}
2944	2954	.author {
2945	2955	text-align: right;

...	...	@@ -59,6 +59,7 @@
59	59	User.find.byId(authorId)
60	60	}
61	61
	62	+<div class="add-a-comment pull-right">@Messages("comment.oneline.comment.placeholder")</div>
62	63	<div class="subcomment-media-body">
63	64	<div class="child-comments">
64	65	@for(comment <- posting.getComments) {
...	...	@@ -75,7 +76,6 @@
75	76	}
76	77	</div>
77	78	@if(isResourceCreatable(UserApp.currentUser, posting.asResource(), resourceType)) {
78		- <div class="add-a-comment pull-right">@Messages("comment.oneline.comment.placeholder")</div>
79	79	<div class="child-comment-input-form">
80	80	@common.child_commentForm(posting.asResource(), resourceType, getNewCommentUrl, currentComment.id)
81	81	<div class="one-line-comment-help">@Messages("comment.oneline.comment.help")</div>

...	...	@@ -104,7 +104,7 @@
104	104	<div id="comment-body-@comment.id">
105	105	@common.tasklistBar()
106	106	<div class="comment-body markdown-wrap" data-allowed-update="@isAllowedUpdate" data-via-email="@OriginalEmail.exists(comment.asResource)">@Html(Markdown.render(comment.contents, project))</div>
107		- <div class="attachments pull-right" data-attachments="@toJson(AttachmentApp.getFileList(ResourceType.ISSUE_COMMENT.toString(), comment.id.toString()))"></div>
	107	+ <div class="attachments pull-left" data-attachments="@toJson(AttachmentApp.getFileList(ResourceType.ISSUE_COMMENT.toString(), comment.id.toString()))"></div>
108	108	</div>
109	109	</div>
110	110	@common.childComments(issue, comment, ResourceType.ISSUE_COMMENT)

...	...	@@ -577,15 +577,10 @@
577	577
578	578	// Releated with one line sub-comment feature
579	579	$(".add-a-comment").on("click", function(e){
580		- var parent = $(this).parent(".subcomment-media-body");
581		-
582		- // Reset & Ready
583		- $(".child-comment-input-form").css("display", "none").css("visibility", "hidden");
584		- $(".add-a-comment").show();
585		- $(this).hide();
	580	+ var parent = $(this).parents(".comment");
586	581
587	582	// Show input form
588		- parent.find(".child-comment-input-form").css("display", "block").css("visibility", "visible");
	583	+ parent.find(".child-comment-input-form").toggle();
589	584
590	585	parent.find("textarea").on('keypress', function(e) {
591	586	// Enter to submit
...	...	@@ -602,6 +597,12 @@
602	597	}).focus();
603	598	});
604	599
	600	+ $(".comment").on("mouseenter tab", function () {
	601	+ $(this).find(".add-a-comment").fadeIn(300);
	602	+ }).on("mouseleave", function () {
	603	+ $(this).find(".add-a-comment").fadeOut(300);
	604	+ });
	605	+
605	606	// Releated with one line sub-comment feature
606	607	$(".subcomment-author").each(function addAuthorToLastParagraphOfOnelineComment(index, el){
607	608	// append Author and addtionals to mardkown rendered contents

...	...	@@ -147,7 +147,7 @@
147	147	code.tooBigFileForCodeBrowser = Sorry, we cannot show a file larger than {0} bytes here.
148	148	code.unknownError = Unknown error
149	149	code.viewRaw = View Raw
150		-comment.online.comment.help = Only parent comment author will be notified.
	150	+comment.oneline.comment.help = Only parent comment author will be notified.
151	151	comment.oneline.comment.placeholder = Add a comment
152	152	commentThread.close = Close
153	153	commentThread.open = Open

...	...	@@ -147,8 +147,8 @@
147	147	code.tooBigFileForCodeBrowser = 죄송하지만 {0} 바이트보다 큰 파일은 여기서는 보여드릴 수 없습니다.
148	148	code.unknownError = 알 수 없는 에러가 발생하였습니다.
149	149	code.viewRaw = Raw로 보기
150		-comment.oneline.comment.help = 한 줄 댓글은 기본적으로 부모 댓글 작성자에게만 알림이 발송됩니다
151		-comment.oneline.comment.placeholder = 댓글 추가
	150	+comment.oneline.comment.help = 한 줄 댓글은 멘션을 사용하지 않을 경우 부모 댓글 작성자에게만 알림이 발송됩니다.
	151	+comment.oneline.comment.placeholder = 대댓글 추가
152	152	commentThread.close = 리뷰 닫기
153	153	commentThread.open = 리뷰 다시 열기
154	154	common.attach.attachIfYouSave = 표시된 파일은 글을 저장하면 첨부됩니다.

Delete comment