Commit @7a5bfd580519eeb30cde587a3fba37e9e353b656

b782a77

7a5bfd5

app/assets/stylesheets/less/_usermenu.less

--- app/assets/stylesheets/less/_usermenu.less

+++ app/assets/stylesheets/less/_usermenu.less


   }
 
   li {
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid transparent;
     margin-left: 0;
   }
 

   .project-item {
     font-size: 14px;
     overflow: hidden;
+
     .slash {
       padding: 5px;
     }
+
     .project-name{
       min-width: 50px;
       max-width: 220px;
       text-overflow: ellipsis;
       overflow: hidden;
       white-space: nowrap;
+
       &.org-name {
         max-width: 320px;
+        font-size: 1.1em;
       }
+
       a {
         &:hover {
           text-decoration: none;
           color: #3592B5;
         }
+      }
+    }
+
+    .all-project-names {
+      padding-left: 30px;
+    }
+
+    .all-org-names {
+      font-weight: 600;
+      color: black;
+      border-bottom: 1px solid transparent;
+
+      &:hover {
+        border-bottom: 1px solid #3592B5;
       }
     }
 

 
   .project-list, .org-list {
     &:hover {
+      cursor: pointer;
     }
   }
 

b782a77

7a5bfd5

app/models/Organization.java

--- app/models/Organization.java

+++ app/models/Organization.java

...	...	@@ -92,6 +92,16 @@
92	92	return (findRowCount != 0);
93	93	}
94	94
	95	+ public List<Project> getSortedByProjectName() {
	96	+ this.projects.sort(new Comparator<Project>() {
	97	+ @Override
	98	+ public int compare(Project o1, Project o2) {
	99	+ return o1.name.compareToIgnoreCase(o2.name);
	100	+ }
	101	+ });
	102	+ return this.projects;
	103	+ }
	104	+
95	105	public boolean isLastAdmin(User currentUser) {
96	106	return OrganizationUser.isAdmin(this, currentUser) && getAdmins().size() == 1;
97	107	}
...	...	@@ -155,6 +165,40 @@
155	165	.findList();
156	166	}
157	167
	168	+ public static List<Organization> findAllOrganizations() {
	169	+ List<Organization> projects = Organization.find.fetch("projects").where().orderBy("name asc, projects.name asc").findList();
	170	+ projects.sort(new Comparator<Organization>() {
	171	+ @Override
	172	+ public int compare(Organization o1, Organization o2) {
	173	+ return o1.name.compareToIgnoreCase(o2.name);
	174	+ }
	175	+ });
	176	+ return projects;
	177	+ }
	178	+
	179	+ public static List<Organization> findAllOrganizations(String loginId) {
	180	+ User user = User.findByLoginId(loginId);
	181	+
	182	+ Set<String> owners = new TreeSet<>(new Comparator<String>() {
	183	+ @Override
	184	+ public int compare(String o1, String o2) {
	185	+ return o1.compareToIgnoreCase(o2);
	186	+ }
	187	+ });
	188	+ for (FavoriteProject fp : user.favoriteProjects) {
	189	+ owners.add(fp.owner);
	190	+ }
	191	+
	192	+ List<Organization> orgs = new ArrayList<>();
	193	+ for (String owner: owners) {
	194	+ Organization org = Organization.findByName(owner);
	195	+ if (org != null) {
	196	+ orgs.add(org);
	197	+ }
	198	+ }
	199	+ return orgs;
	200	+ }
	201	+
158	202	/**
159	203	* As resource.
160	204	*

b782a77

7a5bfd5

app/models/Project.java

--- app/models/Project.java

+++ app/models/Project.java


         }
     }
 
+    public static List<Project> findByOwner(String loginId) {
+        return find.where().ieq("owner", decodeUrlString(loginId)).orderBy("name asc").findList();
+    }
+
     public Set<User> findAuthors() {
         Set<User> allAuthors = new LinkedHashSet<>();
         allAuthors.addAll(getIssueUsers());

b782a77

7a5bfd5

app/models/RecentProject.java

--- app/models/RecentProject.java

+++ app/models/RecentProject.java


 @Table(uniqueConstraints = @UniqueConstraint(columnNames = {"user_id", "project_id"}))
 public class RecentProject extends Model {
     private static final long serialVersionUID = 7306890271871188281L;
-    public static int MAX_RECENT_LIST_PER_USER = 20;
+    public static int MAX_RECENT_LIST_PER_USER = 30;
 
     public static Finder<Long, RecentProject> find = new Finder<>(Long.class, RecentProject.class);
 

b782a77

7a5bfd5

app/models/User.java

--- app/models/User.java

+++ app/models/User.java


         return Project.findProjectsByMemberWithFilter(id, orderString);
     }
 
+    public List<Project> ownProjects() {
+        return Project.findByOwner(loginId);
+    }
+
     /**
      * Create a user and set creation date
      *

     }
 
     public List<Project> getFavoriteProjects() {
+        final User user = this;
+        favoriteProjects.sort(new Comparator<FavoriteProject>() {
+            @Override
+            public int compare(FavoriteProject o1, FavoriteProject o2) {
+                if (o1.owner.equals(user.loginId) || o2.owner.equals(user.loginId)) {
+                    return Integer.MIN_VALUE;
+                }
+                if (o1.owner.equals(o2.owner)) {
+                    return o1.projectName.compareToIgnoreCase(o2.projectName);
+                }
+                return o1.owner.compareToIgnoreCase(o2.owner);
+            }
+        });
+
         List<Project> projects = new ArrayList<>();
         for (FavoriteProject favoriteProject : this.favoriteProjects) {
             favoriteProject.project.refresh();
-            projects.add(0, favoriteProject.project);
+            projects.add(favoriteProject.project);
         }
 
         return projects;

b782a77

7a5bfd5

app/views/common/usermenu.scala.html

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

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


             }
         </div>
         <ul class="nav nav-tabs nm">
-            <li class="myProjectList active">
+            <li class="myOrganizationList active">
+                <a href="#myOrganizationList" data-toggle="tab">
+                @Messages("title.favorite")
+                </a>
+            </li>
+            <li class="myProjectList">
                 <a href="#myProjectList" data-toggle="tab">
                 @Messages("title.project")
                 </a>
             </li>
-            <li class="myOrganizationList">
-                <a href="#myOrganizationList" data-toggle="tab">
-                @Messages("title.organization")
+            <li class="allProjectList">
+                <a href="#allProjectList" data-toggle="tab">
+                @Messages("common.order.all")
                 </a>
             </li>
         </ul>

b782a77

7a5bfd5

app/views/common/usermenu_tab_content_list.scala.html

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

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


 * Copyright Yona & Yobi Authors & NAVER Corp.
 * https://yona.io
 **@
-<div class="tab-pane user-project-list active" id="myProjectList">
-@views.html.index.myProjectList(UserApp.currentUser())
-</div>
-<div class="tab-pane user-project-list" id="myOrganizationList">
+<div class="tab-pane user-project-list active" id="myOrganizationList">
 @views.html.index.myOrganizationList(UserApp.currentUser())
 </div>
+<div class="tab-pane user-project-list" id="myProjectList">
+@views.html.index.myProjectList(UserApp.currentUser())
+</div>
+<div class="tab-pane user-project-list" id="allProjectList">
+@views.html.index.allProjectList(UserApp.currentUser())
+</div>
+

7a5bfd5

app/views/index/allOrganizationList.scala.html (added)

+++ app/views/index/allOrganizationList.scala.html

...	...	@@ -0,0 +1,32 @@
	1	+@**
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
	7	+@(currentUser:User)
	8	+@import utils.TemplateHelper._
	9	+
	10	+@displayOrganizations(title:String, organizations:List[Organization], favoredOrganizations:List[Organization], isActive:Boolean = false) = {
	11	+ @if(organizations.isEmpty && favoredOrganizations.isEmpty) {
	12	+ <div id="@title" class="no-result tab-pane user-ul @if(isActive) {active}">@Messages("title.no.results")</div>
	13	+ } else {
	14	+ <ul class="tab-pane user-ul @if(isActive) {active}" id="@title">
	15	+ @for(organization <- organizations) {
	16	+ @if(favoredOrganizations.last.equals(organization)){
	17	+ @myOrganizationList_partial(organization, true, true)
	18	+ } else {
	19	+ @myOrganizationList_partial(organization, true)
	20	+ }
	21	+ }
	22	+ </ul>
	23	+ }
	24	+}
	25	+
	26	+ <div class="search-result">
	27	+ <div class="group">
	28	+ <input class="search-input org-search" type="text" autocomplete="off" placeholder="@Messages("title.type.name")">
	29	+ <span class="bar"></span>
	30	+ </div>
	31	+ @displayOrganizations("organizations", Organization.findOrganizationsByUserLoginId(UserApp.currentUser.loginId), currentUser.getFavoriteOrganizations)
	32	+ </div>

7a5bfd5

app/views/index/allOrganizationList_partial.scala.html (added)

+++ app/views/index/allOrganizationList_partial.scala.html

...	...	@@ -0,0 +1,36 @@
	1	+@**
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
	7	+@(organization: Organization, favored:Boolean, isLast:Boolean = false)
	8	+@import utils.TemplateHelper._
	9	+
	10	+@isAllowShowCount() = @{
	11	+ UserApp.currentUser().isSiteManager \|\| UserApp.currentUser().isAdminOf(organization)
	12	+}
	13	+
	14	+@defining(UserApp.currentUser().getFavoriteProjects){ favoriteProjects =>
	15	+<li class="@if(isLast){favored} org-li">
	16	+ <div class="org-list project-flex-container all-orgs">
	17	+ <div class="project-item project-item-container">
	18	+ <div class="flex-item site-logo">
	19	+ <i class="project-avatar">@if(hasOrganizationLogo(organization)){<img class="logo" src="@urlToOrganizationLogo(organization)">}else{<span class="dummy-25px"> </span>}</i>
	20	+ </div>
	21	+ <div class="projectName-owner all-org-names flex-item">
	22	+ <div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" target="_blank">@organization.name</a></div>
	23	+ <div class="project-owner flex-item">@if(isAllowShowCount){@organization.projects.size()}</div>
	24	+ </div>
	25	+ </div>
	26	+ <div class="star-org flex-item" data-organization-id="@organization.id">
	27	+ <i class="star @if(favored){starred} material-icons">star</i>
	28	+ </div>
	29	+ </div>
	30	+ <ul class="project-ul">
	31	+ @for(project <- organization.projects){
	32	+ @allProjectList_partial(project, favoriteProjects.contains(project))
	33	+ }
	34	+ </ul>
	35	+</li>
	36	+}

7a5bfd5

app/views/index/allProjectList.scala.html (added)

+++ app/views/index/allProjectList.scala.html

...	...	@@ -0,0 +1,28 @@
	1	+@**
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
	7	+@(currentUser:User)
	8	+@import utils.TemplateHelper._
	9	+
	10	+@displayOrganizations(title:String, organizations:List[Organization], isActive:Boolean = false) = {
	11	+@if(organizations.isEmpty) {
	12	+ <div id="@title" class="no-result tab-pane user-ul @if(isActive) {active}">@Messages("title.no.results")</div>
	13	+} else {
	14	+ <ul class="tab-pane user-ul @if(isActive) {active}" id="@title">
	15	+ @for(organization <- organizations) {
	16	+ @allOrganizationList_partial(organization, UserApp.currentUser().getFavoriteOrganizations.contains(organization))
	17	+ }
	18	+ </ul>
	19	+}
	20	+}
	21	+
	22	+<div class="search-result">
	23	+ <div class="group">
	24	+ <input class="search-input org-search" type="text" autocomplete="off" placeholder="@Messages("title.type.name")">
	25	+ <span class="bar"></span>
	26	+ </div>
	27	+ @displayOrganizations("organizations", Organization.findAllOrganizations())
	28	+</div>

7a5bfd5

app/views/index/allProjectList_partial.scala.html (added)

+++ app/views/index/allProjectList_partial.scala.html

...	...	@@ -0,0 +1,29 @@
	1	+@**
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
	7	+@import utils.AccessControl
	8	+@import models.enumeration.Operation
	9	+@(project:Project, favored:Boolean, isLast:Boolean = false)
	10	+@import utils.TemplateHelper._
	11	+
	12	+
	13	+@if(AccessControl.isAllowed(UserApp.currentUser(), project.asResource(), Operation.READ)){
	14	+<li class="user-li @if(isLast){favored} @if(favored){ show-always } else { hide }" data-location="@routes.ProjectApp.goConventionMenu(project.owner, project.name)">
	15	+ <div class="project-list project-flex-container">
	16	+ <div class="project-item project-item-container">
	17	+ <div class="flex-item site-logo all-project-names">
	18	+ <i class="project-avatar">@if(hasProjectLogo(project)){<img class="logo" src="@urlToProjectLogo(project)">}else{<span class="dummy-25px"> </span>}</i>
	19	+ </div>
	20	+ <div class="projectName-owner flex-item">
	21	+ <div class="project-name flex-item">@project.name @if(project.isPrivate){<i class="yobicon-lock yobicon-small"></i>}</div>
	22	+ </div>
	23	+ </div>
	24	+ <div class="star-project flex-item" data-project-id="@project.id">
	25	+ <i class="star @if(favored){starred} material-icons">star</i>
	26	+ </div>
	27	+ </div>
	28	+</li>
	29	+}

7a5bfd5

app/views/index/displayProjects.scala.html (added)

+++ app/views/index/displayProjects.scala.html

...	...	@@ -0,0 +1,17 @@
	1	+@**
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
	7	+@(title:String, projects:List[Project], isActive:Boolean = false)
	8	+
	9	+@if(projects.isEmpty) {
	10	+ <div id="@title" class="no-result tab-pane user-ul @if(isActive){active}">@Messages("title.no.results")</div>
	11	+} else {
	12	+ <ul class="tab-pane user-ul @if(isActive){active}" id="@title">
	13	+ @for(project <- projects){
	14	+ @views.html.index.myProjectList_partial(project, false)
	15	+ }
	16	+ </ul>
	17	+}

b782a77

app/views/index/displayProjectsWithFavored.scala.html (deleted)

--- app/views/index/displayProjectsWithFavored.scala.html

...	...	@@ -1,26 +0,0 @@
	1	-@**
	2	-* Yona, 21st Century Project Hosting SW
	3	-*
	4	-* Copyright Yona & Yobi Authors & NAVER Corp.
	5	-* https://yona.io
	6	-**@
	7	-@(title:String, projects:List[Project], favoredProjects:List[Project], isActive:Boolean = false)
	8	-
	9	-@if(projects.isEmpty && favoredProjects.isEmpty) {
	10	- <div id="@title" class="no-result tab-pane user-ul @if(isActive){active}">@Messages("title.no.results")</div>
	11	-} else {
	12	- <ul class="tab-pane user-ul @if(isActive){active}" id="@title">
	13	- @for(project <- favoredProjects){
	14	- @if(favoredProjects.last.equals(project)){
	15	- @views.html.index.myProjectList_partial(project, true, true)
	16	- } else {
	17	- @views.html.index.myProjectList_partial(project, true)
	18	- }
	19	- }
	20	- @for(project <- projects){
	21	- @if(!favoredProjects.contains(project)){
	22	- @views.html.index.myProjectList_partial(project, false)
	23	- }
	24	- }
	25	- </ul>
	26	-}

b782a77

7a5bfd5

app/views/index/myOrganizationList.scala.html

--- app/views/index/myOrganizationList.scala.html

+++ app/views/index/myOrganizationList.scala.html


 @**
 * Yona, 21st Century Project Hosting SW
 *
-* Copyright Yona & Yobi Authors & NAVER Corp.
+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
 * https://yona.io
 **@
 @(currentUser:User)

         <div id="@title" class="no-result tab-pane user-ul @if(isActive) {active}">@Messages("title.no.results")</div>
     } else {
         <ul class="tab-pane user-ul @if(isActive) {active}" id="@title">
+            @defining(UserApp.currentUser().ownProjects){ ownProjects =>
+                <li class="org-li">
+                    <div class="org-list project-flex-container all-orgs">
+                        <div class="project-item project-item-container">
+                            <div class="flex-item site-logo">
+                                <i class="project-avatar"></i>
+                            </div>
+                            <div class="projectName-owner all-org-names flex-item">
+                                <div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
+                                <div class="project-owner flex-item">@ownProjects.size()</div>
+                            </div>
+                        </div>
+                        <div class="star-org flex-item"></div>
+                    </div>
+                    <ul class="project-ul">
+                    @for(project <- ownProjects){
+                        @allProjectList_partial(project, FavoriteProject.findByProjectId(UserApp.currentUser().id, project.id) != null)
+                    }
+                    </ul>
+                </li>
+            }
             @for(organization <- favoredOrganizations) {
                 @if(favoredOrganizations.last.equals(organization)){
                     @myOrganizationList_partial(organization, true, true)

     }
 }
 
+
     <div class="search-result">
         <div class="group">
             <input class="search-input org-search" type="text" autocomplete="off" placeholder="@Messages("title.type.name")">
             <span class="bar"></span>
         </div>
-        @displayOrganizations("organizations", Organization.findOrganizationsByUserLoginId(UserApp.currentUser.loginId), currentUser.getFavoriteOrganizations)
+        @displayOrganizations("organizations", Organization.findAllOrganizations(UserApp.currentUser.loginId), currentUser.getFavoriteOrganizations)
     </div>

b782a77

7a5bfd5

app/views/index/myOrganizationList_partial.scala.html

--- app/views/index/myOrganizationList_partial.scala.html

+++ app/views/index/myOrganizationList_partial.scala.html


 @(organization: Organization, favored:Boolean, isLast:Boolean = false)
 @import utils.TemplateHelper._
 
-<li class="user-li @if(isLast){favored}" data-location="@routes.OrganizationApp.organization(organization.name)">
-    <div class="org-list project-flex-container">
+@isAllowShowCount() = @{
+    UserApp.currentUser().isSiteManager || UserApp.currentUser().isAdminOf(organization)
+}
+
+@defining(UserApp.currentUser().getFavoriteProjects){ favoriteProjects =>
+<li class="org-li @if(isLast){favored}">
+    <div class="org-list project-flex-container all-orgs">
         <div class="project-item project-item-container">
             <div class="flex-item site-logo">
                 <i class="project-avatar">@if(hasOrganizationLogo(organization)){<img class="logo" src="@urlToOrganizationLogo(organization)">}else{<span class="dummy-25px"> </span>}</i>
             </div>
-            <div class="projectName-owner flex-item">
-                <div class="project-name org-name flex-item">@organization.name</div>
-                <div class="project-owner flex-item"></div>
+            <div class="projectName-owner all-org-names flex-item">
+                <div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" target="_blank">@organization.name</a></div>
+                <div class="project-owner flex-item">@if(isAllowShowCount){@organization.projects.size()}</div>
             </div>
         </div>
         <div class="star-org flex-item" data-organization-id="@organization.id">
             <i class="star @if(favored){starred} material-icons">star</i>
         </div>
     </div>
+    <ul class="project-ul">
+    @for(project <- organization.getSortedByProjectName){
+        @allProjectList_partial(project, favoriteProjects.contains(project))
+    }
+    </ul>
 </li>
+}

7a5bfd5

app/views/index/myOwnProjectList_partial.scala.html (added)

+++ app/views/index/myOwnProjectList_partial.scala.html

...	...	@@ -0,0 +1,31 @@
	1	+@**
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
	7	+@(organization: Organization, favored:Boolean, isLast:Boolean = false)
	8	+@import utils.TemplateHelper._
	9	+
	10	+@defining(UserApp.currentUser().ownProjects){ ownProjects =>
	11	+<li class="org-li @if(isLast){favored}">
	12	+ <div class="org-list project-flex-container all-orgs">
	13	+ <div class="project-item project-item-container">
	14	+ <div class="flex-item site-logo">
	15	+ <i class="project-avatar">@if(hasOrganizationLogo(organization)){<img class="logo" src="@urlToOrganizationLogo(organization)">}else{<span class="dummy-25px"> </span>}</i>
	16	+ </div>
	17	+ <div class="projectName-owner all-org-names flex-item">
	18	+ <div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
	19	+ <div class="project-owner flex-item">@ownProjects.size()</div>
	20	+ </div>
	21	+ </div>
	22	+ <div class="star-org flex-item">
	23	+ </div>
	24	+ </div>
	25	+ <ul class="project-ul">
	26	+ @for(project <- ownProjects){
	27	+ @allProjectList_partial(project, UserApp.currentUser().favoriteProjects.contains(project))
	28	+ }
	29	+ </ul>
	30	+</li>
	31	+}

b782a77

7a5bfd5

app/views/index/myProjectList.scala.html

--- app/views/index/myProjectList.scala.html

+++ app/views/index/myProjectList.scala.html


 }
         <div>
             <div class="search-result">
-                <div class="tab-pane myproject-list-wrap active" >
+                <div class="tab-pane myproject-list-wrap" >
                     <div class="group">
                         <input class="search-input project-search" type="text" id="query" autocomplete="off" placeholder="@Messages("title.type.name")">
                         <span class="bar"></span>

                         </ul>
                     </div>
                     <div class="tab-content">
-                        @views.html.index.displayProjectsWithFavored("recentlyVisited", currentUser.getVisitedProjects, currentUser.getFavoriteProjects, true)
+                        @views.html.index.displayProjects("recentlyVisited", currentUser.getVisitedProjects, true)
                         @displayProjects("watching", currentUser.getWatchingProjects("name ASC"))
                         @displayProjects("createdByMe", Project.findProjectsCreatedByUser(currentUser.loginId, "createdDate desc"))
                         @displayProjects("joinmember", Project.findProjectsJustMemberAndNotOwner(currentUser, "name ASC"))

b782a77

7a5bfd5

conf/messages

--- conf/messages

+++ conf/messages


 title.editIssue = Edit issue
 title.editMilestone = Edit milestone
 title.editPullRequest = Edit pull request
+title.favorite = Favorite
 title.features = Key features
 title.forgotpassword = Password forgotten?
 title.gettingStarted = Getting your new project started with <strong>{0}</strong>

b782a77

7a5bfd5

conf/messages.ko-KR

--- conf/messages.ko-KR

+++ conf/messages.ko-KR


 title.editIssue = 이슈 수정
 title.editMilestone = 마일스톤 수정
 title.editPullRequest = 코드 보내기 수정
+title.favorite = 즐겨찾기
 title.features = 주요 기능 소개
 title.forgotpassword = 비밀번호를 잊어버리셨나요?
 title.gettingStarted = <strong>{0}</strong> 와 함께 새로운 프로젝트를 시작해 보세요.

b782a77

7a5bfd5

public/javascripts/common/yona.Usermenu.js

--- public/javascripts/common/yona.Usermenu.js

+++ public/javascripts/common/yona.Usermenu.js


         });
 
         // search by keyword
-        $(".search-input").on("keyup", function() {
-            var value = $(this).val().toLowerCase().trim();
-            $(".user-li").each(function() {
-                $(this).toggle($(this).text().toLowerCase().indexOf(value) !== -1);
-            });
+            $(".search-input").on("keyup", function(event) {
+                var value = $(this).val().toLowerCase().trim();
+
+                if ( value !== "" || event.which === 8) {  // 8: backspace
+                    $(".user-li").each(function() {
+                        $(this).toggle($(this).text().toLowerCase().indexOf(value) !== -1);
+                    });
+                    $(".org-li").each(function() {
+                        $(this).toggle($(this).text().toLowerCase().indexOf(value) !== -1);
+                    });
+                }
         }).on("keydown.moveCursorFromInputform", function(e) {
             switch (e.keyCode) {
                 case 27:   // ESC

             }
         }
 
-        $(".user-ul > .user-li").on("click", function (e) {
+        $(".user-ul > .user-li, .project-ul > .user-li").on("click", function (e) {
+            e.preventDefault();
+            e.stopPropagation();
             var location = $(this).data('location');
-            if(e.metaKey || e.ctrlKey) {
-                window.open(location, '_blank');
-            } else {
+            if(e.metaKey || e.ctrlKey || e.shiftKey) {
                 window.location = location;
+            } else {
+                window.open(location, '_blank');
             }
         });
 

                     });
                 });
         }
+
+        $(".all-orgs").on("click", function () {
+            var $li = $(this).closest("li").find(".hide").toggle("fast");
+        });
     }
 });

...	...	@@ -60,7 +60,7 @@
60	60	}
61	61
62	62	li {
63		- border-bottom: 1px solid #eee;
	63	+ border-bottom: 1px solid transparent;
64	64	margin-left: 0;
65	65	}
66	66
...	...	@@ -450,23 +450,42 @@
450	450	.project-item {
451	451	font-size: 14px;
452	452	overflow: hidden;
	453	+
453	454	.slash {
454	455	padding: 5px;
455	456	}
	457	+
456	458	.project-name{
457	459	min-width: 50px;
458	460	max-width: 220px;
459	461	text-overflow: ellipsis;
460	462	overflow: hidden;
461	463	white-space: nowrap;
	464	+
462	465	&.org-name {
463	466	max-width: 320px;
	467	+ font-size: 1.1em;
464	468	}
	469	+
465	470	a {
466	471	&:hover {
467	472	text-decoration: none;
468	473	color: #3592B5;
469	474	}
	475	+ }
	476	+ }
	477	+
	478	+ .all-project-names {
	479	+ padding-left: 30px;
	480	+ }
	481	+
	482	+ .all-org-names {
	483	+ font-weight: 600;
	484	+ color: black;
	485	+ border-bottom: 1px solid transparent;
	486	+
	487	+ &:hover {
	488	+ border-bottom: 1px solid #3592B5;
470	489	}
471	490	}
472	491
...	...	@@ -564,6 +583,7 @@
564	583
565	584	.project-list, .org-list {
566	585	&:hover {
	586	+ cursor: pointer;
567	587	}
568	588	}
569	589

...	...	@@ -249,6 +249,10 @@
249	249	return Project.findProjectsByMemberWithFilter(id, orderString);
250	250	}
251	251
	252	+ public List<Project> ownProjects() {
	253	+ return Project.findByOwner(loginId);
	254	+ }
	255	+
252	256	/**
253	257	* Create a user and set creation date
254	258	*
...	...	@@ -899,10 +903,24 @@
899	903	}
900	904
901	905	public List<Project> getFavoriteProjects() {
	906	+ final User user = this;
	907	+ favoriteProjects.sort(new Comparator<FavoriteProject>() {
	908	+ @Override
	909	+ public int compare(FavoriteProject o1, FavoriteProject o2) {
	910	+ if (o1.owner.equals(user.loginId) \|\| o2.owner.equals(user.loginId)) {
	911	+ return Integer.MIN_VALUE;
	912	+ }
	913	+ if (o1.owner.equals(o2.owner)) {
	914	+ return o1.projectName.compareToIgnoreCase(o2.projectName);
	915	+ }
	916	+ return o1.owner.compareToIgnoreCase(o2.owner);
	917	+ }
	918	+ });
	919	+
902	920	List<Project> projects = new ArrayList<>();
903	921	for (FavoriteProject favoriteProject : this.favoriteProjects) {
904	922	favoriteProject.project.refresh();
905		- projects.add(0, favoriteProject.project);
	923	+ projects.add(favoriteProject.project);
906	924	}
907	925
908	926	return projects;

...	...	@@ -927,6 +927,7 @@
927	927	title.editIssue = Edit issue
928	928	title.editMilestone = Edit milestone
929	929	title.editPullRequest = Edit pull request
	930	+title.favorite = Favorite
930	931	title.features = Key features
931	932	title.forgotpassword = Password forgotten?
932	933	title.gettingStarted = Getting your new project started with <strong>{0}</strong>

...	...	@@ -928,6 +928,7 @@
928	928	title.editIssue = 이슈 수정
929	929	title.editMilestone = 마일스톤 수정
930	930	title.editPullRequest = 코드 보내기 수정
	931	+title.favorite = 즐겨찾기
931	932	title.features = 주요 기능 소개
932	933	title.forgotpassword = 비밀번호를 잊어버리셨나요?
933	934	title.gettingStarted = <strong>{0}</strong> 와 함께 새로운 프로젝트를 시작해 보세요.

...	...	@@ -176,6 +176,10 @@
176	176	}
177	177	}
178	178
	179	+ public static List<Project> findByOwner(String loginId) {
	180	+ return find.where().ieq("owner", decodeUrlString(loginId)).orderBy("name asc").findList();
	181	+ }
	182	+
179	183	public Set<User> findAuthors() {
180	184	Set<User> allAuthors = new LinkedHashSet<>();
181	185	allAuthors.addAll(getIssueUsers());

...	...	@@ -15,7 +15,7 @@
15	15	@Table(uniqueConstraints = @UniqueConstraint(columnNames = {"user_id", "project_id"}))
16	16	public class RecentProject extends Model {
17	17	private static final long serialVersionUID = 7306890271871188281L;
18		- public static int MAX_RECENT_LIST_PER_USER = 20;
	18	+ public static int MAX_RECENT_LIST_PER_USER = 30;
19	19
20	20	public static Finder<Long, RecentProject> find = new Finder<>(Long.class, RecentProject.class);
21	21

...	...	@@ -51,14 +51,19 @@
51	51	}
52	52	</div>
53	53	<ul class="nav nav-tabs nm">
54		- <li class="myProjectList active">
	54	+ <li class="myOrganizationList active">
	55	+ <a href="#myOrganizationList" data-toggle="tab">
	56	+ @Messages("title.favorite")
	57	+ </a>
	58	+ </li>
	59	+ <li class="myProjectList">
55	60	<a href="#myProjectList" data-toggle="tab">
56	61	@Messages("title.project")
57	62	</a>
58	63	</li>
59		- <li class="myOrganizationList">
60		- <a href="#myOrganizationList" data-toggle="tab">
61		- @Messages("title.organization")
	64	+ <li class="allProjectList">
	65	+ <a href="#allProjectList" data-toggle="tab">
	66	+ @Messages("common.order.all")
62	67	</a>
63	68	</li>
64	69	</ul>

...	...	@@ -4,9 +4,13 @@
4	4	* Copyright Yona & Yobi Authors & NAVER Corp.
5	5	* https://yona.io
6	6	**@
7		-<div class="tab-pane user-project-list active" id="myProjectList">
8		-@views.html.index.myProjectList(UserApp.currentUser())
9		-</div>
10		-<div class="tab-pane user-project-list" id="myOrganizationList">
	7	+<div class="tab-pane user-project-list active" id="myOrganizationList">
11	8	@views.html.index.myOrganizationList(UserApp.currentUser())
12	9	</div>
	10	+<div class="tab-pane user-project-list" id="myProjectList">
	11	+@views.html.index.myProjectList(UserApp.currentUser())
	12	+</div>
	13	+<div class="tab-pane user-project-list" id="allProjectList">
	14	+@views.html.index.allProjectList(UserApp.currentUser())
	15	+</div>
	16	+

...	...	@@ -1,7 +1,7 @@
1	1	@**
2	2	* Yona, 21st Century Project Hosting SW
3	3	*
4		-* Copyright Yona & Yobi Authors & NAVER Corp.
	4	+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
5	5	* https://yona.io
6	6	**@
7	7	@(currentUser:User)
...	...	@@ -12,6 +12,27 @@
12	12	<div id="@title" class="no-result tab-pane user-ul @if(isActive) {active}">@Messages("title.no.results")</div>
13	13	} else {
14	14	<ul class="tab-pane user-ul @if(isActive) {active}" id="@title">
	15	+ @defining(UserApp.currentUser().ownProjects){ ownProjects =>
	16	+ <li class="org-li">
	17	+ <div class="org-list project-flex-container all-orgs">
	18	+ <div class="project-item project-item-container">
	19	+ <div class="flex-item site-logo">
	20	+ <i class="project-avatar"></i>
	21	+ </div>
	22	+ <div class="projectName-owner all-org-names flex-item">
	23	+ <div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
	24	+ <div class="project-owner flex-item">@ownProjects.size()</div>
	25	+ </div>
	26	+ </div>
	27	+ <div class="star-org flex-item"></div>
	28	+ </div>
	29	+ <ul class="project-ul">
	30	+ @for(project <- ownProjects){
	31	+ @allProjectList_partial(project, FavoriteProject.findByProjectId(UserApp.currentUser().id, project.id) != null)
	32	+ }
	33	+ </ul>
	34	+ </li>
	35	+ }
15	36	@for(organization <- favoredOrganizations) {
16	37	@if(favoredOrganizations.last.equals(organization)){
17	38	@myOrganizationList_partial(organization, true, true)
...	...	@@ -28,10 +49,11 @@
28	49	}
29	50	}
30	51
	52	+
31	53	<div class="search-result">
32	54	<div class="group">
33	55	<input class="search-input org-search" type="text" autocomplete="off" placeholder="@Messages("title.type.name")">
34	56	<span class="bar"></span>
35	57	</div>
36		- @displayOrganizations("organizations", Organization.findOrganizationsByUserLoginId(UserApp.currentUser.loginId), currentUser.getFavoriteOrganizations)
	58	+ @displayOrganizations("organizations", Organization.findAllOrganizations(UserApp.currentUser.loginId), currentUser.getFavoriteOrganizations)
37	59	</div>

...	...	@@ -7,19 +7,30 @@
7	7	@(organization: Organization, favored:Boolean, isLast:Boolean = false)
8	8	@import utils.TemplateHelper._
9	9
10		-<li class="user-li @if(isLast){favored}" data-location="@routes.OrganizationApp.organization(organization.name)">
11		- <div class="org-list project-flex-container">
	10	+@isAllowShowCount() = @{
	11	+ UserApp.currentUser().isSiteManager \|\| UserApp.currentUser().isAdminOf(organization)
	12	+}
	13	+
	14	+@defining(UserApp.currentUser().getFavoriteProjects){ favoriteProjects =>
	15	+<li class="org-li @if(isLast){favored}">
	16	+ <div class="org-list project-flex-container all-orgs">
12	17	<div class="project-item project-item-container">
13	18	<div class="flex-item site-logo">
14	19	<i class="project-avatar">@if(hasOrganizationLogo(organization)){<img class="logo" src="@urlToOrganizationLogo(organization)">}else{<span class="dummy-25px"> </span>}</i>
15	20	</div>
16		- <div class="projectName-owner flex-item">
17		- <div class="project-name org-name flex-item">@organization.name</div>
18		- <div class="project-owner flex-item"></div>
	21	+ <div class="projectName-owner all-org-names flex-item">
	22	+ <div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" target="_blank">@organization.name</a></div>
	23	+ <div class="project-owner flex-item">@if(isAllowShowCount){@organization.projects.size()}</div>
19	24	</div>
20	25	</div>
21	26	<div class="star-org flex-item" data-organization-id="@organization.id">
22	27	<i class="star @if(favored){starred} material-icons">star</i>
23	28	</div>
24	29	</div>
	30	+ <ul class="project-ul">
	31	+ @for(project <- organization.getSortedByProjectName){
	32	+ @allProjectList_partial(project, favoriteProjects.contains(project))
	33	+ }
	34	+ </ul>
25	35	</li>
	36	+}

...	...	@@ -20,7 +20,7 @@
20	20	}
21	21	<div>
22	22	<div class="search-result">
23		- <div class="tab-pane myproject-list-wrap active" >
	23	+ <div class="tab-pane myproject-list-wrap" >
24	24	<div class="group">
25	25	<input class="search-input project-search" type="text" id="query" autocomplete="off" placeholder="@Messages("title.type.name")">
26	26	<span class="bar"></span>
...	...	@@ -50,7 +50,7 @@
50	50	</ul>
51	51	</div>
52	52	<div class="tab-content">
53		- @views.html.index.displayProjectsWithFavored("recentlyVisited", currentUser.getVisitedProjects, currentUser.getFavoriteProjects, true)
	53	+ @views.html.index.displayProjects("recentlyVisited", currentUser.getVisitedProjects, true)
54	54	@displayProjects("watching", currentUser.getWatchingProjects("name ASC"))
55	55	@displayProjects("createdByMe", Project.findProjectsCreatedByUser(currentUser.loginId, "createdDate desc"))
56	56	@displayProjects("joinmember", Project.findProjectsJustMemberAndNotOwner(currentUser, "name ASC"))

...	...	@@ -91,11 +91,17 @@
91	91	});
92	92
93	93	// search by keyword
94		- $(".search-input").on("keyup", function() {
95		- var value = $(this).val().toLowerCase().trim();
96		- $(".user-li").each(function() {
97		- $(this).toggle($(this).text().toLowerCase().indexOf(value) !== -1);
98		- });
	94	+ $(".search-input").on("keyup", function(event) {
	95	+ var value = $(this).val().toLowerCase().trim();
	96	+
	97	+ if ( value !== "" \|\| event.which === 8) { // 8: backspace
	98	+ $(".user-li").each(function() {
	99	+ $(this).toggle($(this).text().toLowerCase().indexOf(value) !== -1);
	100	+ });
	101	+ $(".org-li").each(function() {
	102	+ $(this).toggle($(this).text().toLowerCase().indexOf(value) !== -1);
	103	+ });
	104	+ }
99	105	}).on("keydown.moveCursorFromInputform", function(e) {
100	106	switch (e.keyCode) {
101	107	case 27: // ESC
...	...	@@ -162,12 +168,14 @@
162	168	}
163	169	}
164	170
165		- $(".user-ul > .user-li").on("click", function (e) {
	171	+ $(".user-ul > .user-li, .project-ul > .user-li").on("click", function (e) {
	172	+ e.preventDefault();
	173	+ e.stopPropagation();
166	174	var location = $(this).data('location');
167		- if(e.metaKey \|\| e.ctrlKey) {
168		- window.open(location, '_blank');
169		- } else {
	175	+ if(e.metaKey \|\| e.ctrlKey \|\| e.shiftKey) {
170	176	window.location = location;
	177	+ } else {
	178	+ window.open(location, '_blank');
171	179	}
172	180	});
173	181
...	...	@@ -201,5 +209,9 @@
201	209	});
202	210	});
203	211	}
	212	+
	213	+ $(".all-orgs").on("click", function () {
	214	+ var $li = $(this).closest("li").find(".hide").toggle("fast");
	215	+ });
204	216	}
205	217	});

Delete comment