Commit @23840a636abb5be9d819f1b860de17937ec16c0f

b42987a

23840a6

app/assets/stylesheets/less/_usermenu.less

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

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


   margin-left: 50px;
 }
 
+.shortcut-message {
+  color: white;
+  background-color: #87c98a;
+  padding: 3px 6px;
+  border-radius: 2px;
+}
 
 

b42987a

23840a6

app/views/common/scripts.scala.html

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

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


         }
         @requestHeader.session.get("loginId") match {
             case Some(v) => { yobi.ShortcutKey.setKeymapLink({
-                "P": "@routes.UserApp.userInfo(v)"
+                "U": "@routes.UserApp.userInfo(v)"
             }); }
             case None => { }
         }

b42987a

23840a6

app/views/common/usermenu.scala.html

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

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


         <li class="divider"></li>
         }
         <li class="gnb-usermenu-dropdown" id="sidebar-open-btn">
-            <a href="javascript:void(0);" class="gnb-dropdown-toggle">
+            <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>

b42987a

23840a6

app/views/help/keymap.scala.html

--- app/views/help/keymap.scala.html

+++ app/views/help/keymap.scala.html


 @**
-* Yobi, Project Hosting SW
+* Yona, 21st Century Project Hosting SW
 *
-* Copyright 2013 NAVER Corp.
-* http://yobi.io
-*
-* @author JiHan Kim
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
+* Copyright Yona & Yobi Authors & NAVER Corp & NAVER LABS Corp
+* https://yona.io
 **@
 @(section:String, project:Project)(implicit request: play.api.mvc.RequestHeader)
 

 
                 @if(project != null ) {
                     @if(project.vcs.equals("GIT")){
-                        <span class="ybtn ybtn-small">F</span>
+                        <span class="ybtn ybtn-small">P</span>
                         <span class="help-inline">@Messages("menu.pullRequest")</span><br>
                     }
                 }

                     <div class="span7">
                         <h5>@Messages("site")</h5>
 
-                        <span class="ybtn ybtn-small">P</span>
+                        <span class="ybtn ybtn-small">U</span>
                         <span class="help-inline">@Messages("userinfo.profile")</span><br>
 
+                        <span class="ybtn ybtn-small">F</span>
+                        <span class="help-inline">@Messages("user.menu")</span><br>
+
                         @if(isMac){
                         <span class="ybtn ybtn-small">CTRL</span> +
                         }

b42987a

23840a6

app/views/projectMenu.scala.html

--- app/views/projectMenu.scala.html

+++ app/views/projectMenu.scala.html


             ,"M": "@routes.MilestoneApp.milestones(project.owner, project.name)"
         }
         @if(menuSetting.pullRequest && project.vcs.equals("GIT")){
-           ,"F": "@getPullRequestURL(project)"
+           ,"P": "@getPullRequestURL(project)"
         }
         @requestHeader.session.get("loginId") match {
             case Some(role) if role.equals("manager") => { "Q": "@routes.ProjectApp.settingForm(project.owner, project.name)" }

b42987a

23840a6

conf/messages

--- conf/messages

+++ conf/messages


 title.search = Search
 title.searchByKeyword = Search by keyword
 title.sendMail = Send email
+title.shortcut = Shortcut
 title.signup = Sign up
 title.signupFor = Sign up for <span class="highlight">{0}</span>
 title.signupConfirmDesc = It is required admission of admin for activation.

 user.loginId.duplicate = Same log in ID already exists.
 user.loginWithNewPassword = Please log in with new password!
 user.logout.success = You have logged out successfully
+user.menu = User menu
 user.name = Name
 user.newPassword = New password
 user.notExists.name = User not exists

b42987a

23840a6

conf/messages.ko-KR

--- conf/messages.ko-KR

+++ conf/messages.ko-KR


 title.search = 검색
 title.searchByKeyword = 키워드로 검색
 title.sendMail = 메일 발송
+title.shortcut = 단축키
 title.signup = 멤버 가입
 title.signupFor = <span class="highlight">{0}</span> 멤버 가입
 title.signupConfirmDesc = 가입 후 사용을 위해서는 관리자의 승인이 필요합니다

 user.loginId.duplicate = 이미 존재하는 아이디입니다.
 user.loginWithNewPassword = 새로 설정한 비밀번호로 로그인 하세요
 user.logout.success = 로그아웃했습니다
+user.menu = 사용자 메뉴
 user.name = 이름
 user.newPassword = 신규 비밀번호
 user.notExists.name = 존재하지 않는 사용자입니다.

b42987a

23840a6

public/javascripts/common/yona.Usermenu.js

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

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


         var PIXEL_CRITERIA_FOR_SMALL_DEVICE = 720;  // Criteria to distinguish small devices
         var SIDE_BAR_DEFAULT_WIDTH = "420px";
 
+      $(document).on("keypress", function openFavoriteMenuWithShortcutKey(event) {
+        if (isShortcutKeyPressed(event)) {
+          event.preventDefault();
+          openSidebar($sidebar);
+          updateStar();
+        }
+      });
+
+      function isShortcutKeyPressed(event) {
+        return (event.which === 102 || event.which === 12601)     // keycode => 102: f, 12623: ㄹ
+            && $(':focus').length === 0;                        // avoid already somewhere focused state
+      }
+
         $("#main").on("click", function(event){
             if( $sidebar.width() !== 0 && $(event.target).parents("#mySidenav").length == 0) {
                 closeSidebar($sidebar);

         }).on("keydown.moveCursorFromInputform", function(e) {
             switch (e.keyCode) {
                 case 27:   // ESC
+                    $('.project-search').blur();
                     closeSidebar($sidebar);
                     break;
                 default:

...	...	@@ -776,5 +776,11 @@
776	776	margin-left: 50px;
777	777	}
778	778
	779	+.shortcut-message {
	780	+ color: white;
	781	+ background-color: #87c98a;
	782	+ padding: 3px 6px;
	783	+ border-radius: 2px;
	784	+}
779	785
780	786

...	...	@@ -85,7 +85,7 @@
85	85	}
86	86	@requestHeader.session.get("loginId") match {
87	87	case Some(v) => { yobi.ShortcutKey.setKeymapLink({
88		- "P": "@routes.UserApp.userInfo(v)"
	88	+ "U": "@routes.UserApp.userInfo(v)"
89	89	}); }
90	90	case None => { }
91	91	}

...	...	@@ -88,7 +88,7 @@
88	88	<li class="divider"></li>
89	89	}
90	90	<li class="gnb-usermenu-dropdown" id="sidebar-open-btn">
91		- <a href="javascript:void(0);" class="gnb-dropdown-toggle">
	91	+ <a href="javascript:void(0);" class="gnb-dropdown-toggle" data-toggle="tooltip" data-placement="bottom" title="@Messages("user.menu"), @Messages("title.shortcut") (F)">
92	92	<span class="avatar-wrap smaller">
93	93	<img src="@currentUser.avatarUrl(32)" />
94	94	</span>

...	...	@@ -143,7 +143,7 @@
143	143	,"M": "@routes.MilestoneApp.milestones(project.owner, project.name)"
144	144	}
145	145	@if(menuSetting.pullRequest && project.vcs.equals("GIT")){
146		- ,"F": "@getPullRequestURL(project)"
	146	+ ,"P": "@getPullRequestURL(project)"
147	147	}
148	148	@requestHeader.session.get("loginId") match {
149	149	case Some(role) if role.equals("manager") => { "Q": "@routes.ProjectApp.settingForm(project.owner, project.name)" }

...	...	@@ -934,6 +934,7 @@
934	934	title.search = Search
935	935	title.searchByKeyword = Search by keyword
936	936	title.sendMail = Send email
	937	+title.shortcut = Shortcut
937	938	title.signup = Sign up
938	939	title.signupFor = Sign up for <span class="highlight">{0}</span>
939	940	title.signupConfirmDesc = It is required admission of admin for activation.
...	...	@@ -982,6 +983,7 @@
982	983	user.loginId.duplicate = Same log in ID already exists.
983	984	user.loginWithNewPassword = Please log in with new password!
984	985	user.logout.success = You have logged out successfully
	986	+user.menu = User menu
985	987	user.name = Name
986	988	user.newPassword = New password
987	989	user.notExists.name = User not exists

...	...	@@ -1,22 +1,8 @@
1	1	@**
2		-* Yobi, Project Hosting SW
	2	+* Yona, 21st Century Project Hosting SW
3	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.
	4	+* Copyright Yona & Yobi Authors & NAVER Corp & NAVER LABS Corp
	5	+* https://yona.io
20	6	**@
21	7	@(section:String, project:Project)(implicit request: play.api.mvc.RequestHeader)
22	8
...	...	@@ -50,7 +36,7 @@
50	36
51	37	@if(project != null ) {
52	38	@if(project.vcs.equals("GIT")){
53		- <span class="ybtn ybtn-small">F</span>
	39	+ <span class="ybtn ybtn-small">P</span>
54	40	<span class="help-inline">@Messages("menu.pullRequest")</span><br>
55	41	}
56	42	}
...	...	@@ -103,9 +89,12 @@
103	89	<div class="span7">
104	90	<h5>@Messages("site")</h5>
105	91
106		- <span class="ybtn ybtn-small">P</span>
	92	+ <span class="ybtn ybtn-small">U</span>
107	93	<span class="help-inline">@Messages("userinfo.profile")</span><br>
108	94
	95	+ <span class="ybtn ybtn-small">F</span>
	96	+ <span class="help-inline">@Messages("user.menu")</span><br>
	97	+
109	98	@if(isMac){
110	99	<span class="ybtn ybtn-small">CTRL</span> +
111	100	}

...	...	@@ -926,6 +926,7 @@
926	926	title.search = 검색
927	927	title.searchByKeyword = 키워드로 검색
928	928	title.sendMail = 메일 발송
	929	+title.shortcut = 단축키
929	930	title.signup = 멤버 가입
930	931	title.signupFor = <span class="highlight">{0}</span> 멤버 가입
931	932	title.signupConfirmDesc = 가입 후 사용을 위해서는 관리자의 승인이 필요합니다
...	...	@@ -974,6 +975,7 @@
974	975	user.loginId.duplicate = 이미 존재하는 아이디입니다.
975	976	user.loginWithNewPassword = 새로 설정한 비밀번호로 로그인 하세요
976	977	user.logout.success = 로그아웃했습니다
	978	+user.menu = 사용자 메뉴
977	979	user.name = 이름
978	980	user.newPassword = 신규 비밀번호
979	981	user.notExists.name = 존재하지 않는 사용자입니다.

...	...	@@ -16,6 +16,19 @@
16	16	var PIXEL_CRITERIA_FOR_SMALL_DEVICE = 720; // Criteria to distinguish small devices
17	17	var SIDE_BAR_DEFAULT_WIDTH = "420px";
18	18
	19	+ $(document).on("keypress", function openFavoriteMenuWithShortcutKey(event) {
	20	+ if (isShortcutKeyPressed(event)) {
	21	+ event.preventDefault();
	22	+ openSidebar($sidebar);
	23	+ updateStar();
	24	+ }
	25	+ });
	26	+
	27	+ function isShortcutKeyPressed(event) {
	28	+ return (event.which === 102 \|\| event.which === 12601) // keycode => 102: f, 12623: ㄹ
	29	+ && $(':focus').length === 0; // avoid already somewhere focused state
	30	+ }
	31	+
19	32	$("#main").on("click", function(event){
20	33	if( $sidebar.width() !== 0 && $(event.target).parents("#mySidenav").length == 0) {
21	34	closeSidebar($sidebar);
...	...	@@ -86,6 +99,7 @@
86	99	}).on("keydown.moveCursorFromInputform", function(e) {
87	100	switch (e.keyCode) {
88	101	case 27: // ESC
	102	+ $('.project-search').blur();
89	103	closeSidebar($sidebar);
90	104	break;
91	105	default:

Delete comment