Commit @c4a39923f85d0f314ea0629282f5a9d9aaf89877

doortts 2017-01-25

usermenu: Unify the style of both project and org list

@c4a39923f85d0f314ea0629282f5a9d9aaf89877

98caf01

c4a3992

app/views/index/myOrganizationList.scala.html

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

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


 
 @displayProjects(title:String, organizations:List[Organization], isActive:Boolean = false) = {
 @if(organizations.isEmpty) {
-    <div id='no-result' class="no-result">No results</div>
+    <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">
     @for(organization <- organizations){

                     <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 flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" >@organization.name</a></div>
+                    <div class="projectName-owner flex-item" onclick="window.location='@routes.OrganizationApp.organization(organization.name)';">
+                        <div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)">@organization.name</a></div>
+                        <div class="project-owner flex-item"></div>
                     </div>
                 </div>
                 <div class="star-project flex-item">
-                    <label>
-                        <i class="star material-icons">star</i>
-                    </label>
+                    <i class="star material-icons">star</i>
                 </div>
             </div>
         </li>

 
     <div class="search-result">
         <div class="group">
-            <input class="search-input org-search" type="text" id="query" autocomplete="off" placeholder="Type name">
+            <input class="search-input org-search" type="text" id="query" autocomplete="off" placeholder="@Messages("title.type.name")">
             <span class="bar"></span>
         </div>
         @displayProjects("recentlyVisited", Organization.findOrganizationsByUserLoginId(UserApp.currentUser.loginId))

98caf01

c4a3992

app/views/index/myProjectList.scala.html

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

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


     } else {
         <ul class="tab-pane user-ul @if(isActive){active}" id="@title">
         @for(project <- projects){
-            <li class="user-li">
+            <li class="user-li" onclick="window.location='@routes.ProjectApp.project(project.owner, project.name)';">
                 <div class="project-list project-flex-container">
                     <div class="project-item project-item-container">
                         <div class="flex-item site-logo">
                             <i class="project-avatar">@if(hasProjectLogo(project)){<a href="@routes.ProjectApp.project(project.owner, project.name)" ><img class="logo" src="@urlToProjectLogo(project)"></a>}else{<span class="dummy-25px"> </span>}</i>
                         </div>
                         <div class="projectName-owner flex-item">
-                            <div class="project-name flex-item"><a href="@routes.ProjectApp.project(project.owner, project.name)" >@project.name @if(project.isPrivate){<i class="yobicon-lock yobicon-small"></i>}</a></div>
+                            <div class="project-name flex-item"><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name @if(project.isPrivate){<i class="yobicon-lock yobicon-small"></i>}</a></div>
                             <div class="project-owner flex-item"><a href="@routes.UserApp.userInfo(project.owner)" >@project.owner</a></div>
                         </div>
                     </div>

                         <input class="search-input project-search" type="text" id="query" autocomplete="off" placeholder="@Messages("title.type.name")">
                         <span class="bar"></span>
                     </div>
-                    <div class="subtab-wrap">
+                    <div class="subtab-wrap subtab-group">
                         <ul class="nav-subtab unstyled">
                             <li class="active">
                                 <a href="#recentlyVisited" data-toggle="tab">

Add a comment

Open 0
Closed 0

List

...	...	@@ -13,14 +13,14 @@
13	13	} else {
14	14	<ul class="tab-pane user-ul @if(isActive){active}" id="@title">
15	15	@for(project <- projects){
16		- <li class="user-li">
	16	+ <li class="user-li" onclick="window.location='@routes.ProjectApp.project(project.owner, project.name)';">
17	17	<div class="project-list project-flex-container">
18	18	<div class="project-item project-item-container">
19	19	<div class="flex-item site-logo">
20	20	<i class="project-avatar">@if(hasProjectLogo(project)){<a href="@routes.ProjectApp.project(project.owner, project.name)" ><img class="logo" src="@urlToProjectLogo(project)"></a>}else{<span class="dummy-25px"> </span>}</i>
21	21	</div>
22	22	<div class="projectName-owner flex-item">
23		- <div class="project-name flex-item"><a href="@routes.ProjectApp.project(project.owner, project.name)" >@project.name @if(project.isPrivate){<i class="yobicon-lock yobicon-small"></i>}</a></div>
	23	+ <div class="project-name flex-item"><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name @if(project.isPrivate){<i class="yobicon-lock yobicon-small"></i>}</a></div>
24	24	<div class="project-owner flex-item"><a href="@routes.UserApp.userInfo(project.owner)" >@project.owner</a></div>
25	25	</div>
26	26	</div>
...	...	@@ -40,7 +40,7 @@
40	40	<input class="search-input project-search" type="text" id="query" autocomplete="off" placeholder="@Messages("title.type.name")">
41	41	<span class="bar"></span>
42	42	</div>
43		- <div class="subtab-wrap">
	43	+ <div class="subtab-wrap subtab-group">
44	44	<ul class="nav-subtab unstyled">
45	45	<li class="active">
46	46	<a href="#recentlyVisited" data-toggle="tab">

...	...	@@ -9,7 +9,7 @@
9	9
10	10	@displayProjects(title:String, organizations:List[Organization], isActive:Boolean = false) = {
11	11	@if(organizations.isEmpty) {
12		- <div id='no-result' class="no-result">No results</div>
	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	15	@for(organization <- organizations){
...	...	@@ -19,14 +19,13 @@
19	19	<div class="flex-item site-logo">
20	20	<i class="project-avatar">@if(hasOrganizationLogo(organization)){<img class="logo" src="@urlToOrganizationLogo(organization)">}else{<span class="dummy-25px"> </span>}</i>
21	21	</div>
22		- <div class="projectName-owner flex-item">
23		- <div class="project-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" >@organization.name</a></div>
	22	+ <div class="projectName-owner flex-item" onclick="window.location='@routes.OrganizationApp.organization(organization.name)';">
	23	+ <div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)">@organization.name</a></div>
	24	+ <div class="project-owner flex-item"></div>
24	25	</div>
25	26	</div>
26	27	<div class="star-project flex-item">
27		- <label>
28		- <i class="star material-icons">star</i>
29		- </label>
	28	+ <i class="star material-icons">star</i>
30	29	</div>
31	30	</div>
32	31	</li>
...	...	@@ -37,7 +36,7 @@
37	36
38	37	<div class="search-result">
39	38	<div class="group">
40		- <input class="search-input org-search" type="text" id="query" autocomplete="off" placeholder="Type name">
	39	+ <input class="search-input org-search" type="text" id="query" autocomplete="off" placeholder="@Messages("title.type.name")">
41	40	<span class="bar"></span>
42	41	</div>
43	42	@displayProjects("recentlyVisited", Organization.findOrganizationsByUserLoginId(UserApp.currentUser.loginId))

Delete comment