Commit @cb66cd6659bf20d6f84dfaffb6b09dd075eb8a1c

[Notice] Announcing the End of Demo Server [Read me]

doortts 2017-04-23

issue: Refine my issues list style

@cb66cd6659bf20d6f84dfaffb6b09dd075eb8a1c

c954740

cb66cd6

app/views/issue/my_partial_list.scala.html

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

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


 
 @issueLabels(issue:Issue) = {@for(label <- issue.labels.toList.sortBy(r => (r.category.name, r.name))) {@label.category.name,@label.id,@label.name|}}
 
+@isAssignedToMeTab = @{
+    UserApp.currentUser().id == searchCondition.assigneeId
+}
+@isAuthoredMeTab = @{
+    UserApp.currentUser().id == searchCondition.authorId
+}
 <ul class="post-list-wrap">
 @for(issue <- issueList){
     @defining(issue.project){ project =>
     @defining(User.findByLoginId(issue.authorLoginId)){ user =>
     <li class="post-item title" id="issue-item-@issue.id" href="@routes.IssueApp.issue(project.owner, project.name, issue.getNumber)">
         <div class="span10 span-hard-wrap">
-            <a href="@routes.UserApp.userInfo(user.loginId)" class="avatar-wrap mlarge hide-in-mobile" data-toggle="tooltip" data-placement="bottom" title="@user.loginId">
-                @if(user.avatarUrl == UserApp.DEFAULT_AVATAR_URL){
-                    <img src="@urlToPicture(user.email, 32)">
-                } else {
-                    <img src="@user.avatarUrl" alt="@user.name" width="32" height="32"/>
-                }
-            </a>
             <div class="title-wrap">
                 <a href="@routes.IssueApp.issue(project.owner, project.name, issue.getNumber)" class="title">
                     @issue.title
                 </a>
             </div>
             <div class="infos">
-                @if(user.name){
-                    <a href="@routes.UserApp.userInfo(user.loginId)" class="infos-item infos-link-item" data-toggle="tooltip" data-placement="bottom" title="@user.loginId">
-                        @user.name
+                <span class="infos-item project-name">
+                    <a href="@routes.ProjectApp.project(project.owner,project.name)" class="title project" data-toggle="tooltip" data-placement="bottom" title="@Messages("project.name")">
+                    @project.name
                     </a>
-                } else {
-                    <span class="infos-item">@Messages("issue.noAuthor")</span>
+                </span>
+                <span class="infos-item post-id">#@issue.getNumber</span>
+                @if(!isAuthoredMeTab) {
+                    @if(user.name) {
+                        <a href="@routes.UserApp.userInfo(user.loginId)" class="infos-item infos-link-item" data-toggle="tooltip" data-placement="bottom" title="@user.loginId">
+                        @user.name
+                        </a>
+                    } else {
+                        <span class="infos-item">@Messages("issue.noAuthor")</span>
+                    }
                 }
 
                 <span class="infos-item" data-toggle="tooltip" data-placement="bottom" title="@JodaDateUtil.getDateString(issue.createdDate)">

                 </span>
 
                 @partial_list_subtask(project, issue)
-
-                <span class="infos-item project-name">
-                <a href="@routes.ProjectApp.project(project.owner,project.name)" class="title project" data-toggle="tooltip" data-placement="bottom" title="@Messages("project.name")">
-                @project.name
-                </a>
-                </span>
-                <span class="infos-item post-id">#@issue.getNumber</span>
 
                 @if(issue.milestone != null && project != null && project.menuSetting != null && project.menuSetting.milestone) {
                 <span class="mileston-tag">

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

                    <div class="empty-avatar-wrap">&nbsp;</div>
                 }
             </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> 

Add a comment

Open 0
Closed 0

List

...	...	@@ -14,31 +14,38 @@
14	14
15	15	@issueLabels(issue:Issue) = {@for(label <- issue.labels.toList.sortBy(r => (r.category.name, r.name))) {@label.category.name,@label.id,@label.name\|}}
16	16
	17	+@isAssignedToMeTab = @{
	18	+ UserApp.currentUser().id == searchCondition.assigneeId
	19	+}
	20	+@isAuthoredMeTab = @{
	21	+ UserApp.currentUser().id == searchCondition.authorId
	22	+}
17	23	<ul class="post-list-wrap">
18	24	@for(issue <- issueList){
19	25	@defining(issue.project){ project =>
20	26	@defining(User.findByLoginId(issue.authorLoginId)){ user =>
21	27	<li class="post-item title" id="issue-item-@issue.id" href="@routes.IssueApp.issue(project.owner, project.name, issue.getNumber)">
22	28	<div class="span10 span-hard-wrap">
23		- <a href="@routes.UserApp.userInfo(user.loginId)" class="avatar-wrap mlarge hide-in-mobile" data-toggle="tooltip" data-placement="bottom" title="@user.loginId">
24		- @if(user.avatarUrl == UserApp.DEFAULT_AVATAR_URL){
25		- <img src="@urlToPicture(user.email, 32)">
26		- } else {
27		- <img src="@user.avatarUrl" alt="@user.name" width="32" height="32"/>
28		- }
29		- </a>
30	29	<div class="title-wrap">
31	30	<a href="@routes.IssueApp.issue(project.owner, project.name, issue.getNumber)" class="title">
32	31	@issue.title
33	32	</a>
34	33	</div>
35	34	<div class="infos">
36		- @if(user.name){
37		- <a href="@routes.UserApp.userInfo(user.loginId)" class="infos-item infos-link-item" data-toggle="tooltip" data-placement="bottom" title="@user.loginId">
38		- @user.name
	35	+ <span class="infos-item project-name">
	36	+ <a href="@routes.ProjectApp.project(project.owner,project.name)" class="title project" data-toggle="tooltip" data-placement="bottom" title="@Messages("project.name")">
	37	+ @project.name
39	38	</a>
40		- } else {
41		- <span class="infos-item">@Messages("issue.noAuthor")</span>
	39	+ </span>
	40	+ <span class="infos-item post-id">#@issue.getNumber</span>
	41	+ @if(!isAuthoredMeTab) {
	42	+ @if(user.name) {
	43	+ <a href="@routes.UserApp.userInfo(user.loginId)" class="infos-item infos-link-item" data-toggle="tooltip" data-placement="bottom" title="@user.loginId">
	44	+ @user.name
	45	+ </a>
	46	+ } else {
	47	+ <span class="infos-item">@Messages("issue.noAuthor")</span>
	48	+ }
42	49	}
43	50
44	51	<span class="infos-item" data-toggle="tooltip" data-placement="bottom" title="@JodaDateUtil.getDateString(issue.createdDate)">
...	...	@@ -46,13 +53,6 @@
46	53	</span>
47	54
48	55	@partial_list_subtask(project, issue)
49		-
50		- <span class="infos-item project-name">
51		- <a href="@routes.ProjectApp.project(project.owner,project.name)" class="title project" data-toggle="tooltip" data-placement="bottom" title="@Messages("project.name")">
52		- @project.name
53		- </a>
54		- </span>
55		- <span class="infos-item post-id">#@issue.getNumber</span>
56	56
57	57	@if(issue.milestone != null && project != null && project.menuSetting != null && project.menuSetting.milestone) {
58	58	<span class="mileston-tag">
...	...	@@ -79,6 +79,7 @@
79	79	</div>
80	80	</div>
81	81	<div class="span2 hide-in-mobile">
	82	+ @if(!isAssignedToMeTab){
82	83	<div class="mt5 pull-right hide-in-mobile">
83	84	@if(issue.assigneeName != null) {
84	85	<a href="@routes.UserApp.userInfo(issue.assignee.user.loginId)" class="avatar-wrap assinee" data-toggle="tooltip" data-placement="bottom" title="@Messages("issue.assignee"): @issue.assigneeName">
...	...	@@ -88,6 +89,7 @@
88	89	<div class="empty-avatar-wrap"> </div>
89	90	}
90	91	</div>
	92	+ }
91	93	@if(issue.dueDate != null) {
92	94	<div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
93	95	<i class="yobicon-clock2"></i>

Delete comment