Commit @792d2c6b2f46491894afc9ee8ad970b8c9ad13b7

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

김덕홍 2014-08-06

Merge branch 'fix/issue-1736' of dlab/hive

from pull request 1233

@792d2c6b2f46491894afc9ee8ad970b8c9ad13b7

7ea159b

792d2c6

app/assets/stylesheets/less/_page.less

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

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


     padding:20px;
     line-height:30px;
     white-space:nowrap;
+    text-align:left;
+    font-size:12px;
 
     .ybtn {
         min-width:20px;

7ea159b

792d2c6

app/views/help/keymap.scala.html

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

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


 
 <div class="pull-right" style="padding:10px 0;">
     <a href="#helpKeys" data-toggle="modal" class="ybtn ybtn-inverse ybtn-mini">
-        <i class="yobicon-info-sign"></i> @Messages("title.keymap")
+        @Messages("title.keymap")
     </a>
 
     <div id="helpKeys" class="modal hide fade keymap-help" tabindex="-1" role="dialog">
         <div class="row-fluid">
             <div class="span3">
                 <h5>@Messages("project.projects")</h5>
-	            <span class="ybtn ybtn-small">H</span>
-	            <span class="help-inline">@Messages("menu.home")</span><br>
+
+                <span class="ybtn ybtn-small">H</span>
+                <span class="help-inline">@Messages("menu.home")</span><br>
 
                 <span class="ybtn ybtn-small">B</span>
                 <span class="help-inline">@Messages("menu.board")</span><br>
 
-	            <span class="ybtn ybtn-small">I</span>
-	            <span class="help-inline">@Messages("menu.issue")</span><br>
+                <span class="ybtn ybtn-small">I</span>
+                <span class="help-inline">@Messages("menu.issue")</span><br>
 
-	            <span class="ybtn ybtn-small">C</span>
-	            <span class="help-inline">@Messages("menu.code")</span><br>
+                <span class="ybtn ybtn-small">C</span>
+                <span class="help-inline">@Messages("menu.code")</span><br>
 
-	            <span class="ybtn ybtn-small">M</span>
-	            <span class="help-inline">@Messages("milestone")</span><br>
+                <span class="ybtn ybtn-small">M</span>
+                <span class="help-inline">@Messages("milestone")</span><br>
 
                 @if(project != null ) {
                     @if(project.vcs.equals("GIT")){
-                <span class="ybtn ybtn-small">F</span>
-                <span class="help-inline">@Messages("menu.pullRequest")</span><br>
+                        <span class="ybtn ybtn-small">F</span>
+                        <span class="help-inline">@Messages("menu.pullRequest")</span><br>
                     }
                 }
 
                 @if(project != null ) {
                     @if(ProjectUser.roleOf(session.get("loginId"), project).equals("manager")){
-	            <span class="ybtn ybtn-small">Q</span>
-                <span class="help-inline">@Messages("project.setting")</span><br>
+                        <span class="ybtn ybtn-small">Q</span>
+                        <span class="help-inline">@Messages("project.setting")</span><br>
                     }
                 }
             </div>
 
-            <div class="span4">
-	            <h5>@Messages("title." + section)</h5>
+            <div class="span9">
+                <div class="row-fluid">
+                    <div class="span5">
+                        <h5>@Messages("title." + section)</h5>
 
-	            @if(section.indexOf("board") > -1){
-                <span class="ybtn ybtn-small">N</span>
-                <span class="help-inline">@Messages("post.write")</span><br>
-                }
+                        @if(section.indexOf("board") > -1){
+                            <span class="ybtn ybtn-small">N</span>
+                            <span class="help-inline">@Messages("post.write")</span><br>
+                        }
 
-                @if(section.indexOf("issue") > -1){
-                <span class="ybtn ybtn-small">N</span>
-                <span class="help-inline">@Messages("issue.menu.new")</span><br>
-                }
+                        @if(section.indexOf("issue") > -1){
+                            <span class="ybtn ybtn-small">N</span>
+                            <span class="help-inline">@Messages("issue.menu.new")</span><br>
+                        }
 
-                @if(section.indexOf("Detail") > - 1){
-                <span class="ybtn ybtn-small">L</span>
-                <span class="help-inline">@Messages("button.list")</span><br>
+                        @if(section.indexOf("Detail") > - 1){
+                            <span class="ybtn ybtn-small">L</span>
+                            <span class="help-inline">@Messages("button.list")</span><br>
 
-	            <span class="ybtn ybtn-small">E</span>
-	            <span class="help-inline">@Messages("button.edit")</span><br>
-	            }
+                            <span class="ybtn ybtn-small">E</span>
+                            <span class="help-inline">@Messages("button.edit")</span><br>
+                        }
 
-	            @if(section.indexOf("List") > -1){
-	            <span class="ybtn ybtn-small">A</span>
-	            <span class="help-inline">@Messages("button.prevPage")</span><br>
+                        @if(section.indexOf("List") > -1){
+                            <span class="ybtn ybtn-small">A</span>
+                            <span class="help-inline">@Messages("button.prevPage")</span><br>
 
-	            <span class="ybtn ybtn-small">S</span>
-	            <span class="help-inline">@Messages("button.nextPage")</span><br>
-	            }
+                            <span class="ybtn ybtn-small">S</span>
+                            <span class="help-inline">@Messages("button.nextPage")</span><br>
+                        }
 
-                @if(section == "issueList"){
-                <span class="ybtn ybtn-small">@ctrl</span>+ <span class="ybtn ybtn-small">A</span>
-                <span class="help-inline">@Messages("button.selectAll")</span><br>
-                }
-            </div>
+                        @if(section == "issueList"){
+                            <span class="ybtn ybtn-small">@ctrl</span>+ <span class="ybtn ybtn-small">A</span>
+                            <span class="help-inline">@Messages("button.selectAll")</span><br>
+                        }
+                    </div>
 
-            <div class="span5">
-	            <h5>@Messages("site")</h5>
-	            <span class="ybtn ybtn-small">P</span>
-	            <span class="help-inline">@Messages("userinfo.profile")</span><br>
+                    <div class="span7">
+                        <h5>@Messages("site")</h5>
 
-                <span class="ybtn ybtn-small">ALT</span> + <span class="ybtn ybtn-small">S</span>
-                <span class="help-inline">@Messages("site.search")</span><br>
+                        <span class="ybtn ybtn-small">P</span>
+                        <span class="help-inline">@Messages("userinfo.profile")</span><br>
 
-	            <span class="ybtn ybtn-small">@ctrl</span> + <span class="ybtn ybtn-small">ENTER</span>
-	            <span class="help-inline">@Messages("button.submitForm")</span><br>
+                        <span class="ybtn ybtn-small">ALT</span> + <span class="ybtn ybtn-small">S</span>
+                        <span class="help-inline">@Messages("site.search")</span><br>
+
+                        <span class="ybtn ybtn-small">@ctrl</span> + <span class="ybtn ybtn-small">ENTER</span>
+                        <span class="help-inline">@Messages("button.submitForm")</span><br>
+                    </div>
+                </div>
+                <div class="row-fluid mt20">
+                    <div class="span12">
+                        @if((section.indexOf("issue") > -1) && (section.indexOf("Detail") > - 1)){
+                            <h5>@Messages("search.menu.issue.comments")</h5>
+                            <span class="ybtn ybtn-small">SHIFT</span> +
+                            <span class="ybtn ybtn-small">@ctrl</span> +
+                            <span class="ybtn ybtn-small">ENTER</span>
+                            <span class="help-inline">@Messages("button.commentAndNextState.closed")</span><br>
+                        }
+                    </div>
+                </div>
             </div>
         </div>
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -4950,6 +4950,8 @@
4950	4950	padding:20px;
4951	4951	line-height:30px;
4952	4952	white-space:nowrap;
	4953	+ text-align:left;
	4954	+ font-size:12px;
4953	4955
4954	4956	.ybtn {
4955	4957	min-width:20px;

...	...	@@ -24,88 +24,105 @@
24	24
25	25	<div class="pull-right" style="padding:10px 0;">
26	26	<a href="#helpKeys" data-toggle="modal" class="ybtn ybtn-inverse ybtn-mini">
27		- <i class="yobicon-info-sign"></i> @Messages("title.keymap")
	27	+ @Messages("title.keymap")
28	28	</a>
29	29
30	30	<div id="helpKeys" class="modal hide fade keymap-help" tabindex="-1" role="dialog">
31	31	<div class="row-fluid">
32	32	<div class="span3">
33	33	<h5>@Messages("project.projects")</h5>
34		- <span class="ybtn ybtn-small">H</span>
35		- <span class="help-inline">@Messages("menu.home")</span><br>
	34	+
	35	+ <span class="ybtn ybtn-small">H</span>
	36	+ <span class="help-inline">@Messages("menu.home")</span><br>
36	37
37	38	<span class="ybtn ybtn-small">B</span>
38	39	<span class="help-inline">@Messages("menu.board")</span><br>
39	40
40		- <span class="ybtn ybtn-small">I</span>
41		- <span class="help-inline">@Messages("menu.issue")</span><br>
	41	+ <span class="ybtn ybtn-small">I</span>
	42	+ <span class="help-inline">@Messages("menu.issue")</span><br>
42	43
43		- <span class="ybtn ybtn-small">C</span>
44		- <span class="help-inline">@Messages("menu.code")</span><br>
	44	+ <span class="ybtn ybtn-small">C</span>
	45	+ <span class="help-inline">@Messages("menu.code")</span><br>
45	46
46		- <span class="ybtn ybtn-small">M</span>
47		- <span class="help-inline">@Messages("milestone")</span><br>
	47	+ <span class="ybtn ybtn-small">M</span>
	48	+ <span class="help-inline">@Messages("milestone")</span><br>
48	49
49	50	@if(project != null ) {
50	51	@if(project.vcs.equals("GIT")){
51		- <span class="ybtn ybtn-small">F</span>
52		- <span class="help-inline">@Messages("menu.pullRequest")</span><br>
	52	+ <span class="ybtn ybtn-small">F</span>
	53	+ <span class="help-inline">@Messages("menu.pullRequest")</span><br>
53	54	}
54	55	}
55	56
56	57	@if(project != null ) {
57	58	@if(ProjectUser.roleOf(session.get("loginId"), project).equals("manager")){
58		- <span class="ybtn ybtn-small">Q</span>
59		- <span class="help-inline">@Messages("project.setting")</span><br>
	59	+ <span class="ybtn ybtn-small">Q</span>
	60	+ <span class="help-inline">@Messages("project.setting")</span><br>
60	61	}
61	62	}
62	63	</div>
63	64
64		- <div class="span4">
65		- <h5>@Messages("title." + section)</h5>
	65	+ <div class="span9">
	66	+ <div class="row-fluid">
	67	+ <div class="span5">
	68	+ <h5>@Messages("title." + section)</h5>
66	69
67		- @if(section.indexOf("board") > -1){
68		- <span class="ybtn ybtn-small">N</span>
69		- <span class="help-inline">@Messages("post.write")</span><br>
70		- }
	70	+ @if(section.indexOf("board") > -1){
	71	+ <span class="ybtn ybtn-small">N</span>
	72	+ <span class="help-inline">@Messages("post.write")</span><br>
	73	+ }
71	74
72		- @if(section.indexOf("issue") > -1){
73		- <span class="ybtn ybtn-small">N</span>
74		- <span class="help-inline">@Messages("issue.menu.new")</span><br>
75		- }
	75	+ @if(section.indexOf("issue") > -1){
	76	+ <span class="ybtn ybtn-small">N</span>
	77	+ <span class="help-inline">@Messages("issue.menu.new")</span><br>
	78	+ }
76	79
77		- @if(section.indexOf("Detail") > - 1){
78		- <span class="ybtn ybtn-small">L</span>
79		- <span class="help-inline">@Messages("button.list")</span><br>
	80	+ @if(section.indexOf("Detail") > - 1){
	81	+ <span class="ybtn ybtn-small">L</span>
	82	+ <span class="help-inline">@Messages("button.list")</span><br>
80	83
81		- <span class="ybtn ybtn-small">E</span>
82		- <span class="help-inline">@Messages("button.edit")</span><br>
83		- }
	84	+ <span class="ybtn ybtn-small">E</span>
	85	+ <span class="help-inline">@Messages("button.edit")</span><br>
	86	+ }
84	87
85		- @if(section.indexOf("List") > -1){
86		- <span class="ybtn ybtn-small">A</span>
87		- <span class="help-inline">@Messages("button.prevPage")</span><br>
	88	+ @if(section.indexOf("List") > -1){
	89	+ <span class="ybtn ybtn-small">A</span>
	90	+ <span class="help-inline">@Messages("button.prevPage")</span><br>
88	91
89		- <span class="ybtn ybtn-small">S</span>
90		- <span class="help-inline">@Messages("button.nextPage")</span><br>
91		- }
	92	+ <span class="ybtn ybtn-small">S</span>
	93	+ <span class="help-inline">@Messages("button.nextPage")</span><br>
	94	+ }
92	95
93		- @if(section == "issueList"){
94		- <span class="ybtn ybtn-small">@ctrl</span>+ <span class="ybtn ybtn-small">A</span>
95		- <span class="help-inline">@Messages("button.selectAll")</span><br>
96		- }
97		- </div>
	96	+ @if(section == "issueList"){
	97	+ <span class="ybtn ybtn-small">@ctrl</span>+ <span class="ybtn ybtn-small">A</span>
	98	+ <span class="help-inline">@Messages("button.selectAll")</span><br>
	99	+ }
	100	+ </div>
98	101
99		- <div class="span5">
100		- <h5>@Messages("site")</h5>
101		- <span class="ybtn ybtn-small">P</span>
102		- <span class="help-inline">@Messages("userinfo.profile")</span><br>
	102	+ <div class="span7">
	103	+ <h5>@Messages("site")</h5>
103	104
104		- <span class="ybtn ybtn-small">ALT</span> + <span class="ybtn ybtn-small">S</span>
105		- <span class="help-inline">@Messages("site.search")</span><br>
	105	+ <span class="ybtn ybtn-small">P</span>
	106	+ <span class="help-inline">@Messages("userinfo.profile")</span><br>
106	107
107		- <span class="ybtn ybtn-small">@ctrl</span> + <span class="ybtn ybtn-small">ENTER</span>
108		- <span class="help-inline">@Messages("button.submitForm")</span><br>
	108	+ <span class="ybtn ybtn-small">ALT</span> + <span class="ybtn ybtn-small">S</span>
	109	+ <span class="help-inline">@Messages("site.search")</span><br>
	110	+
	111	+ <span class="ybtn ybtn-small">@ctrl</span> + <span class="ybtn ybtn-small">ENTER</span>
	112	+ <span class="help-inline">@Messages("button.submitForm")</span><br>
	113	+ </div>
	114	+ </div>
	115	+ <div class="row-fluid mt20">
	116	+ <div class="span12">
	117	+ @if((section.indexOf("issue") > -1) && (section.indexOf("Detail") > - 1)){
	118	+ <h5>@Messages("search.menu.issue.comments")</h5>
	119	+ <span class="ybtn ybtn-small">SHIFT</span> +
	120	+ <span class="ybtn ybtn-small">@ctrl</span> +
	121	+ <span class="ybtn ybtn-small">ENTER</span>
	122	+ <span class="help-inline">@Messages("button.commentAndNextState.closed")</span><br>
	123	+ }
	124	+ </div>
	125	+ </div>
109	126	</div>
110	127	</div>
111	128

Delete comment