Commit @824b64c7070c8b4880f5753d1f20b6426a15f539

Hyeonjae Park 2018-12-24

my-issue: Add glyphicon

@824b64c7070c8b4880f5753d1f20b6426a15f539

ebb2a70

824b64c

app/views/issue/my_partial_list_quicksearch.scala.html

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

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


 }
 
 <ul class="lst-stacked unstyled">
-    @if(!UserApp.currentUser().isAnonymous()){
-    <li @if(param.assigneeId == currentUserId){ class="active"}>
-        <a pjax-filter href="#"
-            data-author-id=""
-            data-assignee-id="@currentUserId"
-            data-commenter-id=""
-            data-milestone-id="@param.milestoneId"
-            data-mention-id=""
-            data-sharer-id=""
-            data-favorite-id="">
-            @Messages("issue.list.assignedToMe")
-        </a>
-    </li>
-    <li @if(param.authorId == currentUserId){ class="active"}>
-        <a pjax-filter href="#"
-            data-author-id="@currentUserId"
-            data-assignee-id=""
-            data-commenter-id=""
-            data-milestone-id="@param.milestoneId"
-            data-mention-id=""
-            data-sharer-id=""
-            data-favorite-id="">
-            @Messages("issue.list.authoredByMe")
-        </a>
-    </li>
-    <li @if(param.commenterId == currentUserId){ class="active"}>
-        <a pjax-filter href="#"
-        data-author-id=""
-        data-assignee-id=""
-        data-commenter-id="@currentUserId"
-        data-milestone-id="@param.milestoneId"
-        data-mention-id=""
-        data-sharer-id=""
-        data-favorite-id="">
-        @Messages("issue.list.commentedByMe")
-        </a>
-    </li>
-    <li @if(param.mentionId == currentUserId){ class="active"}>
-        <a pjax-filter href="#"
-            data-author-id=""
-            data-assignee-id=""
-            data-commenter-id=""
-            data-milestone-id="@param.milestoneId"
-            data-mention-id="@currentUserId"
-            data-sharer-id=""
-            data-favorite-id="">
-            @Messages("issue.list.mentionedOfMe") @if(StringUtils.isBlank(param.filter)) {
-                (@Issue.getCountOfMentionedOpenIssues(currentUserId))
-            }
-        </a>
-    </li>
-    <li @if(param.sharerId == currentUserId){ class="active"}>
-        <a pjax-filter href="#"
-        data-author-id=""
-        data-assignee-id=""
-        data-commenter-id=""
-        data-milestone-id="@param.milestoneId"
-        data-mention-id=""
-        data-sharer-id="@currentUserId"
-        data-favorite-id="">
-        @Messages("issue.list.sharedWithMe") @if(StringUtils.isBlank(param.filter)) {
-            (@IssueSharer.getNumberOfIssuesSharedWithUser(currentUserId))
-        }
-        </a>
-    </li>
+    @if(!UserApp.currentUser().isAnonymous()) {
+        <li @if(param.assigneeId == currentUserId){ class="active"}>
+            <a pjax-filter href="#"
+                data-author-id=""
+                data-assignee-id="@currentUserId"
+                data-commenter-id=""
+                data-milestone-id="@param.milestoneId"
+                data-mention-id=""
+                data-sharer-id=""
+                data-favorite-id="">
+                <span class="assigned-to-me">
+                    <i class="yobicon-user"></i>
+                    @Messages("issue.list.assignedToMe")
+                </span>
+            </a>
+        </li>
+        <li @if(param.authorId == currentUserId){ class="active"}>
+            <a pjax-filter href="#"
+                data-author-id="@currentUserId"
+                data-assignee-id=""
+                data-commenter-id=""
+                data-milestone-id="@param.milestoneId"
+                data-mention-id=""
+                data-sharer-id=""
+                data-favorite-id="">
+                <span class="authored-by-me">
+                    <i class="yobicon-pencil"></i>
+                    @Messages("issue.list.authoredByMe")
+                </span>
+            </a>
+        </li>
+        <li @if(param.commenterId == currentUserId){ class="active"}>
+            <a pjax-filter href="#"
+                data-author-id=""
+                data-assignee-id=""
+                data-commenter-id="@currentUserId"
+                data-milestone-id="@param.milestoneId"
+                data-mention-id=""
+                data-sharer-id=""
+                data-favorite-id="">
+                <span class="commented-by-me">
+                    <i class="yobicon-comments"></i>
+                    @Messages("issue.list.commentedByMe")
+                </span>
+            </a>
+        </li>
+        <li @if(param.mentionId == currentUserId){ class="active"}>
+            <a pjax-filter href="#"
+                data-author-id=""
+                data-assignee-id=""
+                data-commenter-id=""
+                data-milestone-id="@param.milestoneId"
+                data-mention-id="@currentUserId"
+                data-sharer-id=""
+                data-favorite-id="">
+                <span class="mentioned-of-me">
+                    <i class="yobicon-at"></i>
+                    @Messages("issue.list.mentionedOfMe")
+                </span>
+                @if(StringUtils.isBlank(param.filter)) {
+                    (@Issue.getCountOfMentionedOpenIssues(currentUserId))
+                }
+            </a>
+        </li>
+        <li @if(param.sharerId == currentUserId){ class="active"}>
+            <a pjax-filter href="#"
+                data-author-id=""
+                data-assignee-id=""
+                data-commenter-id=""
+                data-milestone-id="@param.milestoneId"
+                data-mention-id=""
+                data-sharer-id="@currentUserId"
+                data-favorite-id="">
+                <span class="shared-with-me">
+                    <i class="yobicon-share"></i>
+                    @Messages("issue.list.sharedWithMe")
+                </span>
+                @if(StringUtils.isBlank(param.filter)) {
+                    (@IssueSharer.getNumberOfIssuesSharedWithUser(currentUserId))
+                }
+            </a>
+        </li>
         <li @if(param.favoriteId == currentUserId) {
             class="active"}>
             <a pjax-filter href="#"
-            data-author-id=""
-            data-assignee-id=""
-            data-commenter-id=""
-            data-milestone-id="@param.milestoneId"
-            data-mention-id=""
-            data-sharer-id=""
-            data-favorite-id="@currentUserId">
+                data-author-id=""
+                data-assignee-id=""
+                data-commenter-id=""
+                data-milestone-id="@param.milestoneId"
+                data-mention-id=""
+                data-sharer-id=""
+                data-favorite-id="@currentUserId">
                 <span class="favorite-issue">
-                <i class="starred star material-icons va-text-top my-issue">star</i>@Messages("issue.list.favorite")
+                    <i class="yobicon-favorite"></i>
+                    @Messages("issue.list.favorite")
                 </span>
                 @if(StringUtils.isBlank(param.filter)) {
-                (@FavoriteIssue.getNumberOpenFavoriteIssues(currentUserId))
-            }
+                    (@FavoriteIssue.getNumberOpenFavoriteIssues(currentUserId))
+                }
             </a>
         </li>
     }

Add a comment

Open 0
Closed 0

List

...	...	@@ -13,87 +13,105 @@
13	13	}
14	14
15	15	<ul class="lst-stacked unstyled">
16		- @if(!UserApp.currentUser().isAnonymous()){
17		- <li @if(param.assigneeId == currentUserId){ class="active"}>
18		- <a pjax-filter href="#"
19		- data-author-id=""
20		- data-assignee-id="@currentUserId"
21		- data-commenter-id=""
22		- data-milestone-id="@param.milestoneId"
23		- data-mention-id=""
24		- data-sharer-id=""
25		- data-favorite-id="">
26		- @Messages("issue.list.assignedToMe")
27		- </a>
28		- </li>
29		- <li @if(param.authorId == currentUserId){ class="active"}>
30		- <a pjax-filter href="#"
31		- data-author-id="@currentUserId"
32		- data-assignee-id=""
33		- data-commenter-id=""
34		- data-milestone-id="@param.milestoneId"
35		- data-mention-id=""
36		- data-sharer-id=""
37		- data-favorite-id="">
38		- @Messages("issue.list.authoredByMe")
39		- </a>
40		- </li>
41		- <li @if(param.commenterId == currentUserId){ class="active"}>
42		- <a pjax-filter href="#"
43		- data-author-id=""
44		- data-assignee-id=""
45		- data-commenter-id="@currentUserId"
46		- data-milestone-id="@param.milestoneId"
47		- data-mention-id=""
48		- data-sharer-id=""
49		- data-favorite-id="">
50		- @Messages("issue.list.commentedByMe")
51		- </a>
52		- </li>
53		- <li @if(param.mentionId == currentUserId){ class="active"}>
54		- <a pjax-filter href="#"
55		- data-author-id=""
56		- data-assignee-id=""
57		- data-commenter-id=""
58		- data-milestone-id="@param.milestoneId"
59		- data-mention-id="@currentUserId"
60		- data-sharer-id=""
61		- data-favorite-id="">
62		- @Messages("issue.list.mentionedOfMe") @if(StringUtils.isBlank(param.filter)) {
63		- (@Issue.getCountOfMentionedOpenIssues(currentUserId))
64		- }
65		- </a>
66		- </li>
67		- <li @if(param.sharerId == currentUserId){ class="active"}>
68		- <a pjax-filter href="#"
69		- data-author-id=""
70		- data-assignee-id=""
71		- data-commenter-id=""
72		- data-milestone-id="@param.milestoneId"
73		- data-mention-id=""
74		- data-sharer-id="@currentUserId"
75		- data-favorite-id="">
76		- @Messages("issue.list.sharedWithMe") @if(StringUtils.isBlank(param.filter)) {
77		- (@IssueSharer.getNumberOfIssuesSharedWithUser(currentUserId))
78		- }
79		- </a>
80		- </li>
	16	+ @if(!UserApp.currentUser().isAnonymous()) {
	17	+ <li @if(param.assigneeId == currentUserId){ class="active"}>
	18	+ <a pjax-filter href="#"
	19	+ data-author-id=""
	20	+ data-assignee-id="@currentUserId"
	21	+ data-commenter-id=""
	22	+ data-milestone-id="@param.milestoneId"
	23	+ data-mention-id=""
	24	+ data-sharer-id=""
	25	+ data-favorite-id="">
	26	+ <span class="assigned-to-me">
	27	+ <i class="yobicon-user"></i>
	28	+ @Messages("issue.list.assignedToMe")
	29	+ </span>
	30	+ </a>
	31	+ </li>
	32	+ <li @if(param.authorId == currentUserId){ class="active"}>
	33	+ <a pjax-filter href="#"
	34	+ data-author-id="@currentUserId"
	35	+ data-assignee-id=""
	36	+ data-commenter-id=""
	37	+ data-milestone-id="@param.milestoneId"
	38	+ data-mention-id=""
	39	+ data-sharer-id=""
	40	+ data-favorite-id="">
	41	+ <span class="authored-by-me">
	42	+ <i class="yobicon-pencil"></i>
	43	+ @Messages("issue.list.authoredByMe")
	44	+ </span>
	45	+ </a>
	46	+ </li>
	47	+ <li @if(param.commenterId == currentUserId){ class="active"}>
	48	+ <a pjax-filter href="#"
	49	+ data-author-id=""
	50	+ data-assignee-id=""
	51	+ data-commenter-id="@currentUserId"
	52	+ data-milestone-id="@param.milestoneId"
	53	+ data-mention-id=""
	54	+ data-sharer-id=""
	55	+ data-favorite-id="">
	56	+ <span class="commented-by-me">
	57	+ <i class="yobicon-comments"></i>
	58	+ @Messages("issue.list.commentedByMe")
	59	+ </span>
	60	+ </a>
	61	+ </li>
	62	+ <li @if(param.mentionId == currentUserId){ class="active"}>
	63	+ <a pjax-filter href="#"
	64	+ data-author-id=""
	65	+ data-assignee-id=""
	66	+ data-commenter-id=""
	67	+ data-milestone-id="@param.milestoneId"
	68	+ data-mention-id="@currentUserId"
	69	+ data-sharer-id=""
	70	+ data-favorite-id="">
	71	+ <span class="mentioned-of-me">
	72	+ <i class="yobicon-at"></i>
	73	+ @Messages("issue.list.mentionedOfMe")
	74	+ </span>
	75	+ @if(StringUtils.isBlank(param.filter)) {
	76	+ (@Issue.getCountOfMentionedOpenIssues(currentUserId))
	77	+ }
	78	+ </a>
	79	+ </li>
	80	+ <li @if(param.sharerId == currentUserId){ class="active"}>
	81	+ <a pjax-filter href="#"
	82	+ data-author-id=""
	83	+ data-assignee-id=""
	84	+ data-commenter-id=""
	85	+ data-milestone-id="@param.milestoneId"
	86	+ data-mention-id=""
	87	+ data-sharer-id="@currentUserId"
	88	+ data-favorite-id="">
	89	+ <span class="shared-with-me">
	90	+ <i class="yobicon-share"></i>
	91	+ @Messages("issue.list.sharedWithMe")
	92	+ </span>
	93	+ @if(StringUtils.isBlank(param.filter)) {
	94	+ (@IssueSharer.getNumberOfIssuesSharedWithUser(currentUserId))
	95	+ }
	96	+ </a>
	97	+ </li>
81	98	<li @if(param.favoriteId == currentUserId) {
82	99	class="active"}>
83	100	<a pjax-filter href="#"
84		- data-author-id=""
85		- data-assignee-id=""
86		- data-commenter-id=""
87		- data-milestone-id="@param.milestoneId"
88		- data-mention-id=""
89		- data-sharer-id=""
90		- data-favorite-id="@currentUserId">
	101	+ data-author-id=""
	102	+ data-assignee-id=""
	103	+ data-commenter-id=""
	104	+ data-milestone-id="@param.milestoneId"
	105	+ data-mention-id=""
	106	+ data-sharer-id=""
	107	+ data-favorite-id="@currentUserId">
91	108	<span class="favorite-issue">
92		- <i class="starred star material-icons va-text-top my-issue">star</i>@Messages("issue.list.favorite")
	109	+ <i class="yobicon-favorite"></i>
	110	+ @Messages("issue.list.favorite")
93	111	</span>
94	112	@if(StringUtils.isBlank(param.filter)) {
95		- (@FavoriteIssue.getNumberOpenFavoriteIssues(currentUserId))
96		- }
	113	+ (@FavoriteIssue.getNumberOpenFavoriteIssues(currentUserId))
	114	+ }
97	115	</a>
98	116	</li>
99	117	}

Delete comment