Commit @a40084e25f33f34f5312ac01c6b92357c43d9053

457680f

a40084e

app/assets/stylesheets/less/_page.less

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

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


             &.mentioned {
                 .media-body {
                     &:before {
-                        background-color: #C5EBFD;
+                        background-color: #e1f5fe;
                         border-color: #56C5F7;
                     }
                     border: 1px solid #56C5F7;
                 }
 
                 .meta-info {
-                    background-color: #C5EBFD;
+                    background-color: #e1f5fe;
                 }
             }
 

     color: white;
 
     &.me {
-        background-color: #4FC3F7;
+        background-color: #BA68C8;
+        border: 1px solid #BA68C8;
     }
 
     &:hover {

     }
 }
 
+.project-link, .org-link {
+    -webkit-font-smoothing: antialiased;
+    -webkit-text-size-adjust: 100%;
+    -webkit-font-feature-settings: "kern" 1;
+    -moz-font-feature-settings: "kern" 1;
+    -o-font-feature-settings: "kern" 1;
+    font-feature-settings: "kern" 1;
+    font-kerning: normal;
+    border: 1px solid #9741ff;
+    border-radius: 3px;
+    margin-right: 3px;
+    padding-left: 2px;
+    padding-right: 2px;
+    background-color: #9741ff;
+    font-weight: 600;
+    color: white;
+
+    &:hover {
+        color: white;
+        background-color: #9741ff !important;
+    }
+}
+
 .ago-date {
   vertical-align: middle;
 }

457680f

a40084e

app/utils/AutoLinkRenderer.java

--- app/utils/AutoLinkRenderer.java

+++ app/utils/AutoLinkRenderer.java


         Organization org = Organization.findByName(userId);
 
         if(org != null) {
-            return new Link(RouteUtil.getUrl(org), "@" + org.name);
+            return new Link(RouteUtil.getUrl(org), "<span class='org-link'>@" + org.name + "</span>");
         }
 
         if (user.isAnonymous() ) {

         Project project = Project.findByOwnerAndProjectName(ownerName, projectName);
 
         if (project != null) {
-            return new Link(RouteUtil.getUrl(project), "@" + project.toString());
+            return new Link(RouteUtil.getUrl(project), "<span class='project-link'>@" + project.toString() + "</span>");
         } else {
             return Link.EMPTY_LINK;
         }

457680f

a40084e

app/views/board/view.scala.html

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

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


 
             // detect comment which contains mention at me
             $(".comment-body:contains('@UserApp.currentUser().getPureNameOnly')").closest(".comment").addClass("mentioned");
+            $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
 
             $('#translate').one('click', function (e) {
                 var data = {

457680f

a40084e

app/views/git/view.scala.html

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

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


 @**
-* Yobi, Project Hosting SW
+* Yona, 21st Century Project Hosting SW
 *
-* Copyright 2013 NAVER Corp.
-* http://yobi.io
-*
-* @author Keesun Baik
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+* https://yona.io
 **@
 @(project: Project, pull: PullRequest, canDeleteBranch: Boolean, canRestoreBranch: Boolean)
 

         $("button.moreBtn").on("click", function(){
             $(this).next("pre.commitMsg.desc").toggleClass("hidden");
         });
+
+        // detect comment which contains mention at me
+        $(".comment-body:contains('@UserApp.currentUser().getPureNameOnly')").closest(".comment").addClass("mentioned");
+        $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
     });
 </script>
 }

457680f

a40084e

app/views/issue/view.scala.html

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

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


 
         // detect comment which contains mention at me
         $(".comment-body:contains('@UserApp.currentUser().getPureNameOnly')").closest(".comment").addClass("mentioned");
+        $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
     });
 
         $(function () {

457680f

a40084e

app/views/milestone/view.scala.html

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

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


 @**
-* Yobi, Project Hosting SW
+* Yona, 21st Century Project Hosting SW
 *
-* Copyright 2013 NAVER Corp.
-* http://yobi.io
-*
-* @author Keesun Baik
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+* https://yona.io
 **@
-@(title: String, milestone: models.Milestone, project: Project, issueState:State)
+@(title: String, milestone: Milestone, project: Project, issueState:State)
 @import scala.collection.immutable._
 @import org.apache.commons.lang.StringUtils
 @import utils.TemplateHelper._

             "sMilestoneId" : "@milestone.id",
             "sURLLabels"   : "@routes.IssueApp.issues(project.owner, project.name)"
         });
+
+        // detect links contains mention at me
+        $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
     });
 </script>
 }

...	...	@@ -3072,14 +3072,14 @@
3072	3072	&.mentioned {
3073	3073	.media-body {
3074	3074	&:before {
3075		- background-color: #C5EBFD;
	3075	+ background-color: #e1f5fe;
3076	3076	border-color: #56C5F7;
3077	3077	}
3078	3078	border: 1px solid #56C5F7;
3079	3079	}
3080	3080
3081	3081	.meta-info {
3082		- background-color: #C5EBFD;
	3082	+ background-color: #e1f5fe;
3083	3083	}
3084	3084	}
3085	3085
...	...	@@ -6652,7 +6652,8 @@
6652	6652	color: white;
6653	6653
6654	6654	&.me {
6655		- background-color: #4FC3F7;
	6655	+ background-color: #BA68C8;
	6656	+ border: 1px solid #BA68C8;
6656	6657	}
6657	6658
6658	6659	&:hover {
...	...	@@ -6666,6 +6667,29 @@
6666	6667	}
6667	6668	}
6668	6669
	6670	+.project-link, .org-link {
	6671	+ -webkit-font-smoothing: antialiased;
	6672	+ -webkit-text-size-adjust: 100%;
	6673	+ -webkit-font-feature-settings: "kern" 1;
	6674	+ -moz-font-feature-settings: "kern" 1;
	6675	+ -o-font-feature-settings: "kern" 1;
	6676	+ font-feature-settings: "kern" 1;
	6677	+ font-kerning: normal;
	6678	+ border: 1px solid #9741ff;
	6679	+ border-radius: 3px;
	6680	+ margin-right: 3px;
	6681	+ padding-left: 2px;
	6682	+ padding-right: 2px;
	6683	+ background-color: #9741ff;
	6684	+ font-weight: 600;
	6685	+ color: white;
	6686	+
	6687	+ &:hover {
	6688	+ color: white;
	6689	+ background-color: #9741ff !important;
	6690	+ }
	6691	+}
	6692	+
6669	6693	.ago-date {
6670	6694	vertical-align: middle;
6671	6695	}

...	...	@@ -305,7 +305,7 @@
305	305	Organization org = Organization.findByName(userId);
306	306
307	307	if(org != null) {
308		- return new Link(RouteUtil.getUrl(org), "@" + org.name);
	308	+ return new Link(RouteUtil.getUrl(org), "<span class='org-link'>@" + org.name + "</span>");
309	309	}
310	310
311	311	if (user.isAnonymous() ) {
...	...	@@ -333,7 +333,7 @@
333	333	Project project = Project.findByOwnerAndProjectName(ownerName, projectName);
334	334
335	335	if (project != null) {
336		- return new Link(RouteUtil.getUrl(project), "@" + project.toString());
	336	+ return new Link(RouteUtil.getUrl(project), "<span class='project-link'>@" + project.toString() + "</span>");
337	337	} else {
338	338	return Link.EMPTY_LINK;
339	339	}

...	...	@@ -251,6 +251,7 @@
251	251
252	252	// detect comment which contains mention at me
253	253	$(".comment-body:contains('@UserApp.currentUser().getPureNameOnly')").closest(".comment").addClass("mentioned");
	254	+ $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
254	255
255	256	$('#translate').one('click', function (e) {
256	257	var data = {

...	...	@@ -500,6 +500,7 @@
500	500
501	501	// detect comment which contains mention at me
502	502	$(".comment-body:contains('@UserApp.currentUser().getPureNameOnly')").closest(".comment").addClass("mentioned");
	503	+ $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
503	504	});
504	505
505	506	$(function () {

...	...	@@ -1,22 +1,8 @@
1	1	@**
2		-* Yobi, Project Hosting SW
	2	+* Yona, 21st Century Project Hosting SW
3	3	*
4		-* Copyright 2013 NAVER Corp.
5		-* http://yobi.io
6		-*
7		-* @author Keesun Baik
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.
	4	+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+* https://yona.io
20	6	**@
21	7	@(project: Project, pull: PullRequest, canDeleteBranch: Boolean, canRestoreBranch: Boolean)
22	8
...	...	@@ -144,6 +130,10 @@
144	130	$("button.moreBtn").on("click", function(){
145	131	$(this).next("pre.commitMsg.desc").toggleClass("hidden");
146	132	});
	133	+
	134	+ // detect comment which contains mention at me
	135	+ $(".comment-body:contains('@UserApp.currentUser().getPureNameOnly')").closest(".comment").addClass("mentioned");
	136	+ $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
147	137	});
148	138	</script>
149	139	}

...	...	@@ -1,24 +1,10 @@
1	1	@**
2		-* Yobi, Project Hosting SW
	2	+* Yona, 21st Century Project Hosting SW
3	3	*
4		-* Copyright 2013 NAVER Corp.
5		-* http://yobi.io
6		-*
7		-* @author Keesun Baik
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.
	4	+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+* https://yona.io
20	6	**@
21		-@(title: String, milestone: models.Milestone, project: Project, issueState:State)
	7	+@(title: String, milestone: Milestone, project: Project, issueState:State)
22	8	@import scala.collection.immutable._
23	9	@import org.apache.commons.lang.StringUtils
24	10	@import utils.TemplateHelper._
...	...	@@ -155,6 +141,9 @@
155	141	"sMilestoneId" : "@milestone.id",
156	142	"sURLLabels" : "@routes.IssueApp.issues(project.owner, project.name)"
157	143	});
	144	+
	145	+ // detect links contains mention at me
	146	+ $(".user-link:contains('@UserApp.currentUser().getPureNameOnly')").addClass("me");
158	147	});
159	148	</script>
160	149	}

Delete comment