Commit @3a2a29af349e8e63c9be55b8e2febb721e740b6f

doortts 2018-11-28

sidebar: Add sidebar feature

@3a2a29af349e8e63c9be55b8e2febb721e740b6f

f6e7c75

3a2a29a

app/assets/stylesheets/less/_mixins.less

--- app/assets/stylesheets/less/_mixins.less

+++ app/assets/stylesheets/less/_mixins.less


 
 // Border Radius
 .border-radius(@radius: 5px){
-    -webkit-border-radius: @radius !important;
-    -moz-border-radius: @radius !important;
-    border-radius: @radius !important;
+    -webkit-border-radius: @radius;
+    -moz-border-radius: @radius;
+    border-radius: @radius;
 }
 .border-radius-bottom(@radius: 5px){
     -webkit-border-bottom-left-radius:@radius;

f6e7c75

3a2a29a

app/assets/stylesheets/less/_page.less

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

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

...	...	@@ -1,4 +1,62 @@
1	1	//--- common
	2	+
	3	+.main {
	4	+ width: 100%;
	5	+ background-color: #fff;
	6	+}
	7	+
	8	+.sidebar {
	9	+ background-color: rgb(51, 51, 51);
	10	+ position: sticky;
	11	+ top: 0;
	12	+ left: 0;
	13	+ bottom: 0;
	14	+ height: 100%;
	15	+
	16	+ .nav {
	17	+ width: 270px;
	18	+ }
	19	+
	20	+ .nav-tabs {
	21	+ border-bottom: none;
	22	+
	23	+ li {
	24	+ margin-bottom: -2px;
	25	+
	26	+ a {
	27	+ padding: 5px 10px;
	28	+ border: none;
	29	+ color: lightgray;
	30	+
	31	+ &:hover {
	32	+ color: #f36c22;
	33	+ background-color: black;
	34	+ border: none;
	35	+ }
	36	+ }
	37	+ }
	38	+
	39	+ .active {
	40	+ a {
	41	+ color: white;
	42	+ background-color: black;
	43	+ border: none;
	44	+ }
	45	+ }
	46	+ }
	47	+
	48	+ .user-menu-wrap {
	49	+ padding: 10px;
	50	+ }
	51	+ .user-menu {
	52	+ padding: 5px;
	53	+ }
	54	+}
	55	+
	56	+#mainFrame {
	57	+ width: 100%;
	58	+}
	59	+
2	60	.prj {
3	61	color:#202020;
4	62	}
...	...	@@ -19,7 +77,6 @@
19	77	display:none;
20	78
21	79	.unsupported-inner {
22		- width: 1170px;
23	80	margin:0 auto;
24	81
25	82	p {
...	...	@@ -56,7 +113,6 @@
56	113	}
57	114
58	115	.gnb-inner {
59		- width: 1170px;
60	116	margin:0 auto;
61	117	color:#788ba7;
62	118	height:40px;
...	...	@@ -350,7 +406,6 @@
350	406
351	407	.project-header-wrap {
352	408	height:inherit;
353		- width:1170px;
354	409	margin:0 auto;
355	410	position: relative;
356	411
...	...	@@ -479,7 +534,6 @@
479	534
480	535	.page-wrap {
481	536	background-color: @white;
482		- width: 1170px;
483	537	margin: 0 auto;
484	538	}
485	539
...	...	@@ -490,7 +544,6 @@
490	544
491	545	.project-menu-inner {
492	546	height:39px;
493		- width: 1170px;
494	547	margin:0 auto;
495	548
496	549	.project-menu-nav {
...	...	@@ -585,7 +638,6 @@
585	638	}
586	639
587	640	.project-page-wrap {
588		- width: 1170px;
589	641	margin:20px auto 0;
590	642
591	643	label {
...	...	@@ -603,7 +655,6 @@
603	655
604	656	.site-breadcrumb-outer {
605	657	.site-breadcrumb-inner {
606		- width: 1170px;
607	658	margin:0 auto;
608	659
609	660	h3 {
...	...	@@ -622,7 +673,6 @@
622	673	margin: 0 auto;
623	674	text-align:center;
624	675	line-height: 34px;
625		- width:1170px;
626	676	}
627	677
628	678	.provider {
...	...	@@ -905,7 +955,6 @@
905	955	background-color:#f9f9f9;
906	956	padding:80px 20px;
907	957	.sample-wrap {
908		- width:980px;
909	958	margin:0 auto;
910	959	text-align:center;
911	960	overflow:auto;
...	...	@@ -5063,7 +5112,6 @@
5063	5112
5064	5113	// -- site admin
5065	5114	.site-setting-wrap {
5066		- width: 1170px;
5067	5115	margin:20px auto 0;
5068	5116
5069	5117	.site-setting-nav {

f6e7c75

3a2a29a

app/assets/stylesheets/less/_responsive.less

--- app/assets/stylesheets/less/_responsive.less

+++ app/assets/stylesheets/less/_responsive.less


     }
 }
 
-@media all and (max-width:1199px){
+@media all {
     .attachment-files {
         font-size: 12px;
         .attachment-files-header {

 
         .unsupported-inner {
             width:95%;
-            max-width: 980px;
         }
     }
 
     .gnb-outer {
-        max-width: 1199px;
-        width: 100%;
         padding:0 10px;
         box-sizing: border-box;
-
-        .gnb-inner {
-            max-width:980px;
-            width: 100%;
-        }
     }
 
     .search-box {

     }
 
     .page-wrap-outer {
-        max-width: 1199px;
         padding:0 10px;
         width: 100%;
         box-sizing: border-box;
     }
 
-    .page-wrap {
-        width: 95%;
-        max-width:980px;
-    }
-
-    .project-menu-inner {
-        width: 95%;
-        max-width:980px;
-    }
-
     .project-page-wrap {
         width: 100%;
         margin-top: 5px !important;
-        max-width:980px;
         .project-breadcrumb {
             font-size: 1.5em;
             font-weight: bold;

 
     .site-breadcrumb-outer {
         width: 100%;
-        max-width: 1199px;
         padding:0 10px;
         box-sizing: border-box;
-
-        .site-breadcrumb-inner {
-            width: 95%;
-            max-width:980px;
-        }
-    }
-    .project-header-outer {
-        max-width: 1199px;
-
-        .project-header-inner {
-            .project-header-wrap {
-                width: 95%;
-                max-width: 980px;
-            }
-        }
-    }
-
-    .project-menu-outer {
-        max-width: 1199px;
-
-        .project-menu-inner {
-            width: 95%;
-            max-width: 980px;
-        }
     }
 
     .project-home-header {

         }
     }
 
-    .site-setting-wrap {
-        width: 95%;
-        max-width:980px;
-    }
-
     .page-footer-outer {
-        max-width: 1199px;
         padding:10px;
 
         .page-footer {

f6e7c75

3a2a29a

app/assets/stylesheets/less/_usermenu.less

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

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


   &:hover {
     background-color: @violet;
   }
+
   a:hover {
     text-decoration: none;
   }

 .user-project-list {
   ul.nav-subtab > li {
     border: none;
+    margin-left: 0;
   }
 
   li {

     list-style-type: none;
 
     .favored {
-      border-bottom: 1px dashed #7b1fa2;
+      border-bottom: 1px dashed gray;
     }
   }
 
   .user-li {
-    color: #000;
-    border-left: 1px solid #fff;
-    border-top: 1px solid #fff;
-    border-right: 1px solid #fff;
     cursor: pointer;
 
     &:hover {
-      color: #3592B5;
-      border: 1px solid #3592B5 !important;
+      background-color: rgba(255, 255, 255, 0.15);
+    }
+
+    .popover {
+      word-wrap: break-word;
+      min-width: 200px;
     }
 
   }
 
   .etc-favorites {
-    border-top: 1px dashed #7b1fa2;
+    border-top: 1px dashed gray;
   }
 
   .user-search-form{

 
   .group {
     position:relative;
-    margin-top: 5px;
   }
 
   .search-input {
-    font-size:14px;
-    padding:10px 10px 10px 20px;
+    font-size:13px;
+    padding: 5px 10px;
     display:block;
     border:none;
-    width: 90%;
+    width: 99%;
     margin-bottom: 0;
+    background-color: black;
+    border-radius: unset;
   }
 
   .search-input:focus {

   .star {
     vertical-align: bottom;
     height: 15px;
+    font-size: 16px;
   }
+
   .starred {
     color: #e91e63;
   }
 
   .star-project, .star-org {
     width: 29px;
-    min-height: 35px;
+    min-height: 26px;
     flex-shrink: 0;
     color: #eee;
+
     &:hover {
       color: #e91e63;
     }

   }
 
   .project-item {
-    font-size: 14px;
+    font-size: 12px;
+    font-weight: 400;
     overflow: hidden;
+    color: rgba( 255, 255, 255, 0.85 );
 
     .slash {
       padding: 5px;

 
     .project-name{
       min-width: 50px;
-      max-width: 220px;
+      max-width: 130px;
       text-overflow: ellipsis;
       overflow: hidden;
       white-space: nowrap;
 
       &.org-name {
-        max-width: 320px;
+        max-width: 140px;
         font-size: 1.1em;
       }
 
       a {
         &:hover {
           text-decoration: none;
-          color: #3592B5;
+          color: white;
         }
       }
     }

 
     .all-org-names {
       font-weight: 600;
-      color: black;
       border-bottom: 1px solid transparent;
-
-      &:hover {
-        border-bottom: 1px solid #3592B5;
-      }
     }
 
     .project-owner {

       text-overflow: ellipsis;
       overflow: hidden;
       white-space: nowrap;
-      max-width: 100px;
+      max-width: 50px;
       min-width: 40px;
       a {
         &:hover {

     align-items: center;
     flex-grow: 1;
     overflow: hidden;
-    padding: 5px 0;
+    padding: 1px 0;
   }
 
   .page-list-item {

   }
 
   .list-end{
-    border-bottom: 1px dashed #7b1fa2;
+    border-bottom: 1px dashed gray;
   }
 
   .project-list, .org-list {
     &:hover {
       cursor: pointer;
+      background-color: rgba(255, 255, 255, 0.15);
     }
   }
 

   color: black;
   background-color: #eee;
   display: inline-block;
+
   a:hover {
     color: black;
   }
 }
 
 .nav-subtab li a {
-  padding: 5px 16px;
+  padding: 5px 8px;
 }
 
 /* Position and style the close button (top right corner) */

f6e7c75

3a2a29a

app/assets/stylesheets/less/_yobiUI.less

--- app/assets/stylesheets/less/_yobiUI.less

+++ app/assets/stylesheets/less/_yobiUI.less


  * (bootstrap 2.3.1 : 14px,
  *  bootstrap 2.2.1 : 12px)
  */
-body { font-size:13px; }
+body {
+    font-size:13px;
+    display: flex;
+}
 label, input, button, select, textarea { font-size:12px; }
 select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"],
 input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"],

 .nav-subtab {
     li {
         display: inline-block;
-        margin-left:10px;
+        margin-left: 5px;
         
         &:first-child {
             margin-left:0;

 
         a {
             display: block;
-            padding: 5px 10px;
+            padding: 5px 8px;
 
             &:hover {
                 text-decoration: none;

f6e7c75

3a2a29a

app/controllers/Application.java

--- app/controllers/Application.java

+++ app/controllers/Application.java


 
     @AnonymousCheck
     public static Result index() {
-        User user = UserApp.currentUser();
-        UserSetting userSetting = UserSetting.findByUser(user.id);
-        if(!user.isAnonymous() && StringUtils.isNotBlank(userSetting.loginDefaultPage)) {
-            return redirect(userSetting.loginDefaultPage);
-        }
         return ok(index.render(UserApp.currentUser()));
     }
 

f6e7c75

3a2a29a

app/views/common/usermenu.scala.html

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

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


     }
 }
 
-<div id="mySidenav" class="sidenav">
-    <div class="span5 right-menu span-hard-wrap">
-        <div class="row-fluid user-menu-wrap">
-            <span class="user-menu"><a href="@routes.UserApp.userInfo(currentUser.loginId)">@Messages("userinfo.profile")</a></span>
-            <span class="user-menu"><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></span>
-            @currentAuth() { auth =>
-                @if(auth != null) {
-                    <a href="@routes.Application.oAuthLogout"><span class="user-menu logout label">@Messages("title.logout")</span></a>
-                } else {
-                    <a href="@routes.UserApp.logout()"><span class="user-menu logout label">@Messages("title.logout")</span></a>
-                }
-            }
-        </div>
-        <ul class="nav nav-tabs nm">
-            <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="allProjectList">
-                <a href="#allProjectList" data-toggle="tab">
-                @Messages("common.order.all")
-                </a>
-            </li>
-        </ul>
-        <div class="tab-content tab-box">
-            <div id="usermenu-tab-content-list" class="tab-content">
-                Loading...
-            </div>
-        </div>
-    </div>
-</div>
 <ul class="gnb-usermenu">
     @if( !currentUser.isAnonymous()) {
         @if(!StringUtils.isBlank(Application.NAVBAR_CUSTOM_LINK_NAME)) {

             <a href="@Application.NAVBAR_CUSTOM_LINK_URL" class="user-item-btn loggged-in">@Application.NAVBAR_CUSTOM_LINK_NAME</a>
         </li>
         }
-       <li class="gnb-usermenu-item hide-in-mobile">
-          <a href="@routes.Application.notifications()" class="user-item-btn loggged-in">@Messages("notification")</a>
-       </li>
        <li class="gnb-usermenu-item" data-toggle="tooltip" data-placement="bottom" title="@Messages("title.shortcut") (A)">
            <a href="@routes.IssueApp.userIssues()" class="user-item-btn loggged-in">@Messages("issue.myIssue")@myOpenIssueCount</a>
         </li>

         </li>
         <li class="divider"></li>
         }
-        <li class="gnb-usermenu-dropdown sidebar-open-btn" id="sidebar-open-btn">
-            <a href="javascript:void(0);" class="gnb-dropdown-toggle" data-toggle="tooltip" data-placement="bottom" title="@Messages("user.menu"), @Messages("title.shortcut") (F)">
-                <span class="avatar-wrap smaller">
-                    <img src="@currentUser.avatarUrl(32)" />
-                </span>
-                <span class="caret-text hide-in-mobile">@currentUser.getPureNameOnly</span>
-                <span class="caret"></span>
-            </a>
-        </li>
       <li class="gnb-usermenu-dropdown">
           <a href="javascript:void(0);" class="gnb-dropdown-toggle dropdwon-box-btn" data-toggle="dropdown">
               <i class="yobicon-plus"></i>

f6e7c75

3a2a29a

app/views/error/notfound_default.scala.html

--- app/views/error/notfound_default.scala.html

+++ app/views/error/notfound_default.scala.html


                     <a href="https://github.com/nforge/yobi/issues?state=open" target="_blank">@Messages("title.yobi.feedback")</a>
                 </li>
             </ul>
-            @common.usermenu()
         </div>
     </header>
     <div class="page-wrap-outer">

f6e7c75

3a2a29a

app/views/index/allOrganizationList_partial.scala.html

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

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


     <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>
+                <i class="yobicon-angle-right"></i>
             </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-name org-name flex-item">@organization.name</div>
                 <div class="project-owner flex-item sub-project-counter"></div>
             </div>
         </div>

f6e7c75

3a2a29a

app/views/index/allProjectList_partial.scala.html

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

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


 
 @if(AccessControl.isAllowed(UserApp.currentUser(), project.asResource(), Operation.READ)){
 <li class="user-li @if(isLast){favored} @if(favored){ show-always } else { hide }" data-location="@routes.ProjectApp.goConventionMenu(project.owner, project.name)">
-    <div class="project-list project-flex-container">
+    <div class="project-list project-flex-container" data-toggle='popover' data-trigger="hover" data-placement="right" data-content="@project.overview">
         <div class="project-item project-item-container">
             <div class="flex-item site-logo all-project-names">
                 <i class="project-avatar">@if(hasProjectLogo(project)){<img class="logo" src="@urlToProjectLogo(project)">}else{<span class="dummy-25px"> </span>}</i>

f6e7c75

3a2a29a

app/views/index/myOrganizationList.scala.html

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

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


                     <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>
+                                <i class="yobicon-angle-right"></i>
                             </div>
                             <div class="projectName-owner all-org-names flex-item">
                                 <div class="project-name org-name flex-item">@currentUser.loginId</div>

f6e7c75

3a2a29a

app/views/index/myOrganizationList_partial.scala.html

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

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


     <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>
+                <i class="yobicon-angle-right"></i>
             </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-name org-name flex-item">@organization.name</div>
                 <div class="project-owner flex-item">@if(isAllowShowCount){@organization.projects.size()}</div>
             </div>
         </div>

f6e7c75

3a2a29a

app/views/index/notifications.scala.html

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

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


 @import utils.JodaDateUtil
 @import utils.MenuType._
 
-@siteLayout(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
+@siteLayout_framed(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
     @if(currentUser == User.anonymous){
     @partial_intro()
     } else {

f6e7c75

3a2a29a

app/views/layout.scala.html

--- app/views/layout.scala.html

+++ app/views/layout.scala.html


 **@
 @(title: String)(theme:String)(content: Html)
 @titleArray = @{title.split(" \\|:\\| ")}
+@currentUser = @{
+    UserApp.currentUser()
+}
+
 <!DOCTYPE html>
 <html lang="@UserApp.currentUser().getPreferredLanguage">
 <head>

 </head>
 
 <body class="@theme" id="html-body">
-    <div id="main">
+    <div id="main" class="main">
     @if(UserApp.isSiteAdminLoggedInSession){
         <div class="admin-logged-in-affix" data-spy="affix" data-offset-top="30">@Messages("user.siteAdminLoggedInAffix") <span class="small-font">@Messages("user.siteAdminLoggedInAffix.maxim")</span></div>
     }

3a2a29a

app/views/layout_framed.scala.html (added)

+++ app/views/layout_framed.scala.html

...	...	@@ -0,0 +1,87 @@
	1	+@**
	2	+* Yona, 21c Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp.
	5	+* https://yona.io
	6	+**@
	7	+@(title: String)(theme:String)(content: Html)
	8	+@titleArray = @{title.split(" \\\|:\\\| ")}
	9	+@currentUser = @{
	10	+ UserApp.currentUser()
	11	+}
	12	+
	13	+<!DOCTYPE html>
	14	+<html lang="@UserApp.currentUser().getPreferredLanguage">
	15	+<head>
	16	+<meta charset="utf-8">
	17	+<title>@titleArray(0)</title>
	18	+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
	19	+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
	20	+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
	21	+<meta property="og:title" content="@titleArray(0)" />
	22	+<meta property="og:url" content="@play.mvc.Http.Context.current().request().path()" />
	23	+<meta property="og:type" content="website" />
	24	+<meta property="og:description" content="@{titleArray(titleArray.length-1)}" />
	25	+<meta name="twitter:card" content="summary" />
	26	+<meta name="twitter:title" content="@titleArray(0)" />
	27	+<meta name="twitter:url" content="@play.mvc.Http.Context.current().request().path()" />
	28	+<meta name="twitter:description" content="@{titleArray(titleArray.length-1)}" />
	29	+<link rel="shortcut icon" type="image/x-icon" href="@routes.Assets.at("images/favicon.ico")">
	30	+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("bootstrap/css/bootstrap.css")">
	31	+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/yobicon/style.css")">
	32	+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("javascripts/lib/select2/select2.css")"/>
	33	+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("javascripts/lib/pikaday/pikaday.css")" />
	34	+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/usermenu.css")">
	35	+<link rel="stylesheet" type="text/css" media="all" href="@routes.Assets.at("stylesheets/yobi.css")">
	36	+<link rel='stylesheet' href="@routes.Assets.at("javascripts/lib/nprogress/nprogress.css")"/>
	37	+<link rel="stylesheet" href="@routes.Assets.at("javascripts/lib/magnific-popup/magnific-popup.css")" />
	38	+<script type="text/javascript" src="@routes.Assets.at("javascripts/yona-layout.js")"></script>
	39	+
	40	+</head>
	41	+
	42	+<body class="@theme" id="html-body">
	43	+ <div id="sidebar" class="sidebar">
	44	+ @sidebar()
	45	+ </div>
	46	+ <div id="mainFrame">
	47	+ <iframe name="mainFrame" frameborder="0" scrolling="no" height="100%" width="100%" src="/user/issues" scrolling="no" onload="resizeIframe(this)"></iframe>
	48	+ @common.scripts()
	49	+ </div>
	50	+
	51	+ <script type="text/javascript">
	52	+ $(function() {
	53	+ NProgress.configure({minimum: 0.7});
	54	+ });
	55	+
	56	+ function resizeIframe(obj) {
	57	+ obj.style.height = obj.contentWindow.document.body.scrollHeight + 'px';
	58	+ }
	59	+
	60	+ //Following three values are used for common/yona.Usermenu.js
	61	+ var UsermenuToggleFavoriteProjectUrl = "@api.routes.UserApi.toggleFoveriteProject("")";
	62	+ var UsermenuToggleFoveriteOrganizationUrl = "@api.routes.UserApi.toggleFoveriteOrganization("")";
	63	+ var UsermenuGetFoveriteProjectsUrl = "@api.routes.UserApi.getFoveriteProjects()";
	64	+ var UsermenuToggleFavoriteIssueUrl = "@api.routes.UserApi.toggleFoveriteIssue("")";
	65	+ var UsermenuGetFoveriteIssuesUrl = "@api.routes.UserApi.getFoveriteIssues()";
	66	+ var UsermenuUrl = "@routes.UserApp.usermenuTabContentList()";
	67	+
	68	+ $(function () {
	69	+ $('[data-toggle="popover"]').popover();
	70	+ })
	71	+ </script>
	72	+ <script type="text/javascript" src="@routes.Assets.at("javascripts/common/yona.Usermenu.js")"></script>
	73	+
	74	+ @if(Application.SEND_YONA_USAGE){
	75	+ <script>
	76	+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]\|\|function(){
	77	+ (i[r].q=i[r].q\|\|[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
	78	+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
	79	+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
	80	+
	81	+ ga('create', 'UA-102735758-1', 'auto');
	82	+ ga('send', 'pageview');
	83	+ </script>
	84	+ }
	85	+
	86	+</body>
	87	+</html>

3a2a29a

app/views/sidebar.scala.html (added)

+++ app/views/sidebar.scala.html

...	...	@@ -0,0 +1,71 @@
	1	+@import org.apache.commons.lang3.StringUtils
	2	+@import utils.TemplateHelper._
	3	+@import com.feth.play.module.pa.PlayAuthenticate._
	4	+@import com.feth.play.module.pa.views.html._
	5	+@import play.mvc.Http._;
	6	+
	7	+@currentUser = @{
	8	+ UserApp.currentUser()
	9	+}
	10	+
	11	+@if(currentUser.isAnonymous){
	12	+ @currentAuth() { auth => @{
	13	+ if(auth == null) {
	14	+ val redirect = Context.current().request().getQueryString("redirectUrl")
	15	+ if(StringUtils.isNotEmpty(redirect)) {
	16	+ val url = Context.current().session().put("pa.url.orig", redirect)
	17	+ } else {
	18	+ val url = storeOriginalUrl(Context.current())
	19	+ }
	20	+ }
	21	+ }
	22	+ }
	23	+}
	24	+
	25	+
	26	+<div class="row-fluid user-menu-wrap">
	27	+ <span class="user-menu"><a href="@routes.UserApp.userInfo(currentUser.loginId)">
	28	+ <span class="avatar-wrap smaller">
	29	+ <img src="@currentUser.avatarUrl(32)" />
	30	+ </span>
	31	+ <span class="caret-text hide-in-mobile">@currentUser.getPureNameOnly</span>
	32	+ </a></span>
	33	+ <span class="user-menu"><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></span>
	34	+ @currentAuth() { auth =>
	35	+ @if(auth != null) {
	36	+ <a href="@routes.Application.oAuthLogout"><span class="user-menu logout label">@Messages("title.logout")</span></a>
	37	+ } else {
	38	+ <a href="@routes.UserApp.logout()"><span class="user-menu logout label">@Messages("title.logout")</span></a>
	39	+ }
	40	+ }
	41	+</div>
	42	+<ul class="nav nav-tabs nm">
	43	+ <li class="myOrganizationList active">
	44	+ <a href="#myOrganizationList" data-toggle="tab">
	45	+ @Messages("title.favorite")
	46	+ </a>
	47	+ </li>
	48	+ <li class="myProjectList">
	49	+ <a href="#myProjectList" data-toggle="tab">
	50	+ @Messages("title.project")
	51	+ </a>
	52	+ </li>
	53	+ <li class="allProjectList">
	54	+ <a href="#allProjectList" data-toggle="tab">
	55	+ @Messages("common.order.all")
	56	+ </a>
	57	+ </li>
	58	+</ul>
	59	+<div class="tab-content tab-box">
	60	+ <div id="usermenu-tab-content-list" class="tab-content">
	61	+ <div class="tab-pane user-project-list active" id="myOrganizationList">
	62	+ @views.html.index.myOrganizationList(UserApp.currentUser())
	63	+ </div>
	64	+ <div class="tab-pane user-project-list" id="myProjectList">
	65	+ @views.html.index.myProjectList(UserApp.currentUser())
	66	+ </div>
	67	+ <div class="tab-pane user-project-list" id="allProjectList">
	68	+ @views.html.index.allProjectList(UserApp.currentUser())
	69	+ </div>
	70	+ </div>
	71	+</div>

3a2a29a

app/views/siteLayout_framed.scala.html (added)

+++ app/views/siteLayout_framed.scala.html

...	...	@@ -0,0 +1,31 @@
	1	+@**
	2	+* Yobi, Project Hosting SW
	3	+*
	4	+* Copyright 2013 NAVER Corp.
	5	+* http://yobi.io
	6	+*
	7	+* @author JiHan Kim
	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.
	20	+**@
	21	+@(title: String, menuType:utils.MenuType)(content: Html)
	22	+
	23	+@import utils._
	24	+
	25	+@layout_framed(Messages(title))(""){
	26	+ @common.navbar(menuType, null, null)
	27	+
	28	+ @content
	29	+
	30	+ @common.footer()
	31	+}

f6e7c75

3a2a29a

conf/messages.ko-KR

--- conf/messages.ko-KR

+++ conf/messages.ko-KR


 title.issueDetail = 이슈 상세보기
 title.issueList = 이슈 목록
 title.issueTracker = 이슈 트래커
-title.joinmember = 멤버로 참여중인
+title.joinmember = 참여 중인
 title.keymap = 단축키 안내
 title.list = 전체 목록
 title.login = 로그인

f6e7c75

3a2a29a

public/bootstrap/css/bootstrap-responsive.css

--- public/bootstrap/css/bootstrap-responsive.css

+++ public/bootstrap/css/bootstrap-responsive.css


   }
 }
 
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}

f6e7c75

3a2a29a

public/javascripts/common/yona.Usermenu.js

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

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


 $(function() {
-    if($(".gnb-usermenu-dropdown").length !== 0) {
-        $.get(UsermenuUrl)
-            .done(function (data) {
-                $("#usermenu-tab-content-list").html(data);
-                afterUsermenuLoaded();
-            })
-            .fail(function (data) {
-                console.log("Usermenu loading failed: " + data);
-            });
-    }
+    afterUsermenuLoaded();
 
     function afterUsermenuLoaded(){
         /* Set side navigation */

             if(e.metaKey || e.ctrlKey || e.shiftKey) {
                 window.location = location;
             } else {
-                window.open(location, '_blank');
+                window.open(location, 'mainFrame');
             }
         });
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -936,7 +936,7 @@
936	936	title.issueDetail = 이슈 상세보기
937	937	title.issueList = 이슈 목록
938	938	title.issueTracker = 이슈 트래커
939		-title.joinmember = 멤버로 참여중인
	939	+title.joinmember = 참여 중인
940	940	title.keymap = 단축키 안내
941	941	title.list = 전체 목록
942	942	title.login = 로그인

...	...	@@ -1101,9 +1101,3 @@
1101	1101	}
1102	1102	}
1103	1103
1104		-@media (min-width: 980px) {
1105		- .nav-collapse.collapse {
1106		- height: auto !important;
1107		- overflow: visible !important;
1108		- }
1109		-}

...	...	@@ -3,9 +3,9 @@
3	3
4	4	// Border Radius
5	5	.border-radius(@radius: 5px){
6		- -webkit-border-radius: @radius !important;
7		- -moz-border-radius: @radius !important;
8		- border-radius: @radius !important;
	6	+ -webkit-border-radius: @radius;
	7	+ -moz-border-radius: @radius;
	8	+ border-radius: @radius;
9	9	}
10	10	.border-radius-bottom(@radius: 5px){
11	11	-webkit-border-bottom-left-radius:@radius;

...	...	@@ -454,7 +454,7 @@
454	454	}
455	455	}
456	456
457		-@media all and (max-width:1199px){
	457	+@media all {
458	458	.attachment-files {
459	459	font-size: 12px;
460	460	.attachment-files-header {
...	...	@@ -491,20 +491,12 @@
491	491
492	492	.unsupported-inner {
493	493	width:95%;
494		- max-width: 980px;
495	494	}
496	495	}
497	496
498	497	.gnb-outer {
499		- max-width: 1199px;
500		- width: 100%;
501	498	padding:0 10px;
502	499	box-sizing: border-box;
503		-
504		- .gnb-inner {
505		- max-width:980px;
506		- width: 100%;
507		- }
508	500	}
509	501
510	502	.search-box {
...	...	@@ -514,26 +506,14 @@
514	506	}
515	507
516	508	.page-wrap-outer {
517		- max-width: 1199px;
518	509	padding:0 10px;
519	510	width: 100%;
520	511	box-sizing: border-box;
521	512	}
522	513
523		- .page-wrap {
524		- width: 95%;
525		- max-width:980px;
526		- }
527		-
528		- .project-menu-inner {
529		- width: 95%;
530		- max-width:980px;
531		- }
532		-
533	514	.project-page-wrap {
534	515	width: 100%;
535	516	margin-top: 5px !important;
536		- max-width:980px;
537	517	.project-breadcrumb {
538	518	font-size: 1.5em;
539	519	font-weight: bold;
...	...	@@ -542,33 +522,8 @@
542	522
543	523	.site-breadcrumb-outer {
544	524	width: 100%;
545		- max-width: 1199px;
546	525	padding:0 10px;
547	526	box-sizing: border-box;
548		-
549		- .site-breadcrumb-inner {
550		- width: 95%;
551		- max-width:980px;
552		- }
553		- }
554		- .project-header-outer {
555		- max-width: 1199px;
556		-
557		- .project-header-inner {
558		- .project-header-wrap {
559		- width: 95%;
560		- max-width: 980px;
561		- }
562		- }
563		- }
564		-
565		- .project-menu-outer {
566		- max-width: 1199px;
567		-
568		- .project-menu-inner {
569		- width: 95%;
570		- max-width: 980px;
571		- }
572	527	}
573	528
574	529	.project-home-header {
...	...	@@ -617,13 +572,7 @@
617	572	}
618	573	}
619	574
620		- .site-setting-wrap {
621		- width: 95%;
622		- max-width:980px;
623		- }
624		-
625	575	.page-footer-outer {
626		- max-width: 1199px;
627	576	padding:10px;
628	577
629	578	.page-footer {

...	...	@@ -49,6 +49,7 @@
49	49	&:hover {
50	50	background-color: @violet;
51	51	}
	52	+
52	53	a:hover {
53	54	text-decoration: none;
54	55	}
...	...	@@ -57,6 +58,7 @@
57	58	.user-project-list {
58	59	ul.nav-subtab > li {
59	60	border: none;
	61	+ margin-left: 0;
60	62	}
61	63
62	64	li {
...	...	@@ -82,26 +84,26 @@
82	84	list-style-type: none;
83	85
84	86	.favored {
85		- border-bottom: 1px dashed #7b1fa2;
	87	+ border-bottom: 1px dashed gray;
86	88	}
87	89	}
88	90
89	91	.user-li {
90		- color: #000;
91		- border-left: 1px solid #fff;
92		- border-top: 1px solid #fff;
93		- border-right: 1px solid #fff;
94	92	cursor: pointer;
95	93
96	94	&:hover {
97		- color: #3592B5;
98		- border: 1px solid #3592B5 !important;
	95	+ background-color: rgba(255, 255, 255, 0.15);
	96	+ }
	97	+
	98	+ .popover {
	99	+ word-wrap: break-word;
	100	+ min-width: 200px;
99	101	}
100	102
101	103	}
102	104
103	105	.etc-favorites {
104		- border-top: 1px dashed #7b1fa2;
	106	+ border-top: 1px dashed gray;
105	107	}
106	108
107	109	.user-search-form{
...	...	@@ -162,16 +164,17 @@
162	164
163	165	.group {
164	166	position:relative;
165		- margin-top: 5px;
166	167	}
167	168
168	169	.search-input {
169		- font-size:14px;
170		- padding:10px 10px 10px 20px;
	170	+ font-size:13px;
	171	+ padding: 5px 10px;
171	172	display:block;
172	173	border:none;
173		- width: 90%;
	174	+ width: 99%;
174	175	margin-bottom: 0;
	176	+ background-color: black;
	177	+ border-radius: unset;
175	178	}
176	179
177	180	.search-input:focus {
...	...	@@ -309,16 +312,19 @@
309	312	.star {
310	313	vertical-align: bottom;
311	314	height: 15px;
	315	+ font-size: 16px;
312	316	}
	317	+
313	318	.starred {
314	319	color: #e91e63;
315	320	}
316	321
317	322	.star-project, .star-org {
318	323	width: 29px;
319		- min-height: 35px;
	324	+ min-height: 26px;
320	325	flex-shrink: 0;
321	326	color: #eee;
	327	+
322	328	&:hover {
323	329	color: #e91e63;
324	330	}
...	...	@@ -455,8 +461,10 @@
455	461	}
456	462
457	463	.project-item {
458		- font-size: 14px;
	464	+ font-size: 12px;
	465	+ font-weight: 400;
459	466	overflow: hidden;
	467	+ color: rgba( 255, 255, 255, 0.85 );
460	468
461	469	.slash {
462	470	padding: 5px;
...	...	@@ -464,20 +472,20 @@
464	472
465	473	.project-name{
466	474	min-width: 50px;
467		- max-width: 220px;
	475	+ max-width: 130px;
468	476	text-overflow: ellipsis;
469	477	overflow: hidden;
470	478	white-space: nowrap;
471	479
472	480	&.org-name {
473		- max-width: 320px;
	481	+ max-width: 140px;
474	482	font-size: 1.1em;
475	483	}
476	484
477	485	a {
478	486	&:hover {
479	487	text-decoration: none;
480		- color: #3592B5;
	488	+ color: white;
481	489	}
482	490	}
483	491	}
...	...	@@ -488,12 +496,7 @@
488	496
489	497	.all-org-names {
490	498	font-weight: 600;
491		- color: black;
492	499	border-bottom: 1px solid transparent;
493		-
494		- &:hover {
495		- border-bottom: 1px solid #3592B5;
496		- }
497	500	}
498	501
499	502	.project-owner {
...	...	@@ -505,7 +508,7 @@
505	508	text-overflow: ellipsis;
506	509	overflow: hidden;
507	510	white-space: nowrap;
508		- max-width: 100px;
	511	+ max-width: 50px;
509	512	min-width: 40px;
510	513	a {
511	514	&:hover {
...	...	@@ -523,7 +526,7 @@
523	526	align-items: center;
524	527	flex-grow: 1;
525	528	overflow: hidden;
526		- padding: 5px 0;
	529	+ padding: 1px 0;
527	530	}
528	531
529	532	.page-list-item {
...	...	@@ -585,12 +588,13 @@
585	588	}
586	589
587	590	.list-end{
588		- border-bottom: 1px dashed #7b1fa2;
	591	+ border-bottom: 1px dashed gray;
589	592	}
590	593
591	594	.project-list, .org-list {
592	595	&:hover {
593	596	cursor: pointer;
	597	+ background-color: rgba(255, 255, 255, 0.15);
594	598	}
595	599	}
596	600
...	...	@@ -785,13 +789,14 @@
785	789	color: black;
786	790	background-color: #eee;
787	791	display: inline-block;
	792	+
788	793	a:hover {
789	794	color: black;
790	795	}
791	796	}
792	797
793	798	.nav-subtab li a {
794		- padding: 5px 16px;
	799	+ padding: 5px 8px;
795	800	}
796	801
797	802	/* Position and style the close button (top right corner) */

...	...	@@ -6,7 +6,10 @@
6	6	* (bootstrap 2.3.1 : 14px,
7	7	* bootstrap 2.2.1 : 12px)
8	8	*/
9		-body { font-size:13px; }
	9	+body {
	10	+ font-size:13px;
	11	+ display: flex;
	12	+}
10	13	label, input, button, select, textarea { font-size:12px; }
11	14	select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"],
12	15	input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"],
...	...	@@ -528,7 +531,7 @@
528	531	.nav-subtab {
529	532	li {
530	533	display: inline-block;
531		- margin-left:10px;
	534	+ margin-left: 5px;
532	535
533	536	&:first-child {
534	537	margin-left:0;
...	...	@@ -536,7 +539,7 @@
536	539
537	540	a {
538	541	display: block;
539		- padding: 5px 10px;
	542	+ padding: 5px 8px;
540	543
541	544	&:hover {
542	545	text-decoration: none;

...	...	@@ -43,11 +43,6 @@
43	43
44	44	@AnonymousCheck
45	45	public static Result index() {
46		- User user = UserApp.currentUser();
47		- UserSetting userSetting = UserSetting.findByUser(user.id);
48		- if(!user.isAnonymous() && StringUtils.isNotBlank(userSetting.loginDefaultPage)) {
49		- return redirect(userSetting.loginDefaultPage);
50		- }
51	46	return ok(index.render(UserApp.currentUser()));
52	47	}
53	48

...	...	@@ -37,43 +37,6 @@
37	37	}
38	38	}
39	39
40		-<div id="mySidenav" class="sidenav">
41		- <div class="span5 right-menu span-hard-wrap">
42		- <div class="row-fluid user-menu-wrap">
43		- <span class="user-menu"><a href="@routes.UserApp.userInfo(currentUser.loginId)">@Messages("userinfo.profile")</a></span>
44		- <span class="user-menu"><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></span>
45		- @currentAuth() { auth =>
46		- @if(auth != null) {
47		- <a href="@routes.Application.oAuthLogout"><span class="user-menu logout label">@Messages("title.logout")</span></a>
48		- } else {
49		- <a href="@routes.UserApp.logout()"><span class="user-menu logout label">@Messages("title.logout")</span></a>
50		- }
51		- }
52		- </div>
53		- <ul class="nav nav-tabs nm">
54		- <li class="myOrganizationList active">
55		- <a href="#myOrganizationList" data-toggle="tab">
56		- @Messages("title.favorite")
57		- </a>
58		- </li>
59		- <li class="myProjectList">
60		- <a href="#myProjectList" data-toggle="tab">
61		- @Messages("title.project")
62		- </a>
63		- </li>
64		- <li class="allProjectList">
65		- <a href="#allProjectList" data-toggle="tab">
66		- @Messages("common.order.all")
67		- </a>
68		- </li>
69		- </ul>
70		- <div class="tab-content tab-box">
71		- <div id="usermenu-tab-content-list" class="tab-content">
72		- Loading...
73		- </div>
74		- </div>
75		- </div>
76		-</div>
77	40	<ul class="gnb-usermenu">
78	41	@if( !currentUser.isAnonymous()) {
79	42	@if(!StringUtils.isBlank(Application.NAVBAR_CUSTOM_LINK_NAME)) {
...	...	@@ -81,9 +44,6 @@
81	44	<a href="@Application.NAVBAR_CUSTOM_LINK_URL" class="user-item-btn loggged-in">@Application.NAVBAR_CUSTOM_LINK_NAME</a>
82	45	</li>
83	46	}
84		- <li class="gnb-usermenu-item hide-in-mobile">
85		- <a href="@routes.Application.notifications()" class="user-item-btn loggged-in">@Messages("notification")</a>
86		- </li>
87	47	<li class="gnb-usermenu-item" data-toggle="tooltip" data-placement="bottom" title="@Messages("title.shortcut") (A)">
88	48	<a href="@routes.IssueApp.userIssues()" class="user-item-btn loggged-in">@Messages("issue.myIssue")@myOpenIssueCount</a>
89	49	</li>
...	...	@@ -96,15 +56,6 @@
96	56	</li>
97	57	<li class="divider"></li>
98	58	}
99		- <li class="gnb-usermenu-dropdown sidebar-open-btn" id="sidebar-open-btn">
100		- <a href="javascript:void(0);" class="gnb-dropdown-toggle" data-toggle="tooltip" data-placement="bottom" title="@Messages("user.menu"), @Messages("title.shortcut") (F)">
101		- <span class="avatar-wrap smaller">
102		- <img src="@currentUser.avatarUrl(32)" />
103		- </span>
104		- <span class="caret-text hide-in-mobile">@currentUser.getPureNameOnly</span>
105		- <span class="caret"></span>
106		- </a>
107		- </li>
108	59	<li class="gnb-usermenu-dropdown">
109	60	<a href="javascript:void(0);" class="gnb-dropdown-toggle dropdwon-box-btn" data-toggle="dropdown">
110	61	<i class="yobicon-plus"></i>

...	...	@@ -35,7 +35,6 @@
35	35	<a href="https://github.com/nforge/yobi/issues?state=open" target="_blank">@Messages("title.yobi.feedback")</a>
36	36	</li>
37	37	</ul>
38		- @common.usermenu()
39	38	</div>
40	39	</header>
41	40	<div class="page-wrap-outer">

...	...	@@ -12,10 +12,10 @@
12	12	<div class="org-list project-flex-container all-orgs">
13	13	<div class="project-item project-item-container">
14	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>
	15	+ <i class="yobicon-angle-right"></i>
16	16	</div>
17	17	<div class="projectName-owner all-org-names flex-item">
18		- <div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" target="_blank">@organization.name</a></div>
	18	+ <div class="project-name org-name flex-item">@organization.name</div>
19	19	<div class="project-owner flex-item sub-project-counter"></div>
20	20	</div>
21	21	</div>

...	...	@@ -12,7 +12,7 @@
12	12
13	13	@if(AccessControl.isAllowed(UserApp.currentUser(), project.asResource(), Operation.READ)){
14	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">
	15	+ <div class="project-list project-flex-container" data-toggle='popover' data-trigger="hover" data-placement="right" data-content="@project.overview">
16	16	<div class="project-item project-item-container">
17	17	<div class="flex-item site-logo all-project-names">
18	18	<i class="project-avatar">@if(hasProjectLogo(project)){<img class="logo" src="@urlToProjectLogo(project)">}else{<span class="dummy-25px"> </span>}</i>

...	...	@@ -17,7 +17,7 @@
17	17	<div class="org-list project-flex-container all-orgs">
18	18	<div class="project-item project-item-container">
19	19	<div class="flex-item site-logo">
20		- <i class="project-avatar"></i>
	20	+ <i class="yobicon-angle-right"></i>
21	21	</div>
22	22	<div class="projectName-owner all-org-names flex-item">
23	23	<div class="project-name org-name flex-item">@currentUser.loginId</div>

...	...	@@ -16,10 +16,10 @@
16	16	<div class="org-list project-flex-container all-orgs">
17	17	<div class="project-item project-item-container">
18	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>
	19	+ <i class="yobicon-angle-right"></i>
20	20	</div>
21	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>
	22	+ <div class="project-name org-name flex-item">@organization.name</div>
23	23	<div class="project-owner flex-item">@if(isAllowShowCount){@organization.projects.size()}</div>
24	24	</div>
25	25	</div>

...	...	@@ -10,7 +10,7 @@
10	10	@import utils.JodaDateUtil
11	11	@import utils.MenuType._
12	12
13		-@siteLayout(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
	13	+@siteLayout_framed(utils.Config.getSiteName, utils.MenuType.SITE_HOME) {
14	14	@if(currentUser == User.anonymous){
15	15	@partial_intro()
16	16	} else {

...	...	@@ -6,6 +6,10 @@
6	6	**@
7	7	@(title: String)(theme:String)(content: Html)
8	8	@titleArray = @{title.split(" \\\|:\\\| ")}
	9	+@currentUser = @{
	10	+ UserApp.currentUser()
	11	+}
	12	+
9	13	<!DOCTYPE html>
10	14	<html lang="@UserApp.currentUser().getPreferredLanguage">
11	15	<head>
...	...	@@ -36,7 +40,7 @@
36	40	</head>
37	41
38	42	<body class="@theme" id="html-body">
39		- <div id="main">
	43	+ <div id="main" class="main">
40	44	@if(UserApp.isSiteAdminLoggedInSession){
41	45	<div class="admin-logged-in-affix" data-spy="affix" data-offset-top="30">@Messages("user.siteAdminLoggedInAffix") <span class="small-font">@Messages("user.siteAdminLoggedInAffix.maxim")</span></div>
42	46	}

...	...	@@ -1,14 +1,5 @@
1	1	$(function() {
2		- if($(".gnb-usermenu-dropdown").length !== 0) {
3		- $.get(UsermenuUrl)
4		- .done(function (data) {
5		- $("#usermenu-tab-content-list").html(data);
6		- afterUsermenuLoaded();
7		- })
8		- .fail(function (data) {
9		- console.log("Usermenu loading failed: " + data);
10		- });
11		- }
	2	+ afterUsermenuLoaded();
12	3
13	4	function afterUsermenuLoaded(){
14	5	/* Set side navigation */
...	...	@@ -177,7 +168,7 @@
177	168	if(e.metaKey \|\| e.ctrlKey \|\| e.shiftKey) {
178	169	window.location = location;
179	170	} else {
180		- window.open(location, '_blank');
	171	+ window.open(location, 'mainFrame');
181	172	}
182	173	});
183	174

Delete comment