Commit @6aab0d88add73e1b878ea045cfc2887ae4c67190

6b90a46

6aab0d8

app/assets/stylesheets/less/_common.less

--- app/assets/stylesheets/less/_common.less

+++ app/assets/stylesheets/less/_common.less


 }
 
 body {
-    /*
-    background-repeat: no-repeat;
-    background-color: #8cc8ce;
-    background-position: center bottom, center top;
-    background-image: url("@{base-image-path}/bg_day_objects.png"), url("@{base-image-path}/bg_day.png");
-    &.night {
-        background-color: #22262c;
-        background-image: url("/images/bg_night.png");
-    }
-    */
    background      : @base-background;
-   background-color: @base-background-color;
-   
+   background-color: @base-background-color;  
    font-family: @base-font-family;
 }
 input, button, select, textarea { font-family: @base-font-family !important; }

     color: inherit;
     text-decoration: none;
     outline: none;
-    &:hover {
-        outline: none !important;
-        color: @link-hover-color;
-        text-decoration: underline;
-    }
-    &:focus {
-        outline: none !important;
-    }
+    &:hover { outline: none !important; color: @link-hover-color; text-decoration: underline; }
+    &:focus { outline: none !important; }
 }
 
-.btn-transparent {
-    border: 0;
-    background: transparent;
-    padding: 0;
-}
+.btn-transparent { border: 0; padding: 0; background: transparent; }
 
-.d-link {
-    color: @blue;
-}
-
-.nm {
-    margin: 0 !important;
-}
+.d-link { color: @blue; }
+.nm { margin: 0 !important; }
 
 .n-alert {
     display:none;

 .vmiddle {
     vertical-align:middle !important
 }
-
+/*
 .mandatory-text-wrap {
     overflow:hidden; position:relative;
 }

     background:#f00;
     -webkit-transform:rotate(45deg);
 }
+*/
 .bold { font-weight:bold; }

6b90a46

6aab0d8

app/assets/stylesheets/less/_page.less

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

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


                 float: right;
                 font-size: 28px;
                 line-height: 1;
-                &.all {
-                    color: @orange;
-                }
-                &.open {
-                    color: #5DBBE0;
-                    /*color: #51AACC;*/
-                }
-                &.public {
-                    color: #5DBBE0;
-                }
+                
+                &.all  { color: @orange; }
+                &.open { color: #5DBBE0; /*color: #51AACC;*/ }
+                &.public { color: #5DBBE0; }
             }
         }
         .stat-issue {
             width:240px;
+            border-bottom:1px solid #c5c5c5;
+            
+            &.active {
+                box-shadow:inset 0px 2px 2px rgba(0,0,0,0.25);
+                border-bottom:none;
+                
+                .desc {
+                    &.all  { color: @orange; }
+                    &.open { color: #5DBBE0; /*color: #51AACC;*/ }
+                    &.public { color: #5DBBE0; }                    
+                }
+            }
         }
     }
     .search-wrap {

                        }
                    }
                    
-                   .labels { background:#D7D7D7; }
+                   /*.labels { background:#D7D7D7; }*/
                    
                    .custom-label-category:before {
                         content:'|'; margin-right:5px;

                     i { .ico-arrow-up-blue; }
                 }
                 
-                // bootstrap
-                .form-horizontal {                    
+                // override bootstrap
+                .form-horizontal {
                     .control-group {
                         margin: 0; padding: 6px 10px;
                         border-bottom: 1px solid #e3e3e3;

     &.issue {
         .title { width:650px; }
         .badge {
+            font-size:11px;
             text-shadow:none;
             .border-radius(2px);
         }

         display: table-cell;
         vertical-align: top;
     }
-    .avatar-wrap { margin-right:12px; }
+    .avatar-wrap { 
+        margin-right:12px;
+        display:inline-block !important;
+        float:left;
+    }
     /*.thumb-wrap {
         width: 45px;
     }*/

6b90a46

6aab0d8

app/views/board/editPost.scala.html

--- app/views/board/editPost.scala.html

+++ app/views/board/editPost.scala.html


 
 	<div class="content-footer">
 		<div class="attach-wrap">
-			<div class="thumb-wrap">
+			<div class="avatar-wrap">
 				<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" class="img-rounded" width="32" height="32" alt="avatar">
 			</div>
 			<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.BOARD_POST">

6b90a46

6aab0d8

app/views/board/newPost.scala.html

--- app/views/board/newPost.scala.html

+++ app/views/board/newPost.scala.html


 
 	<div class="content-footer">
 		<div class="attach-wrap">
-			<div class="thumb-wrap">
+			<div class="avatar-wrap">
 				<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" class="img-rounded" width="32" height="32" alt="avatar">
 			</div>
 			<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.BOARD_POST">

6b90a46

6aab0d8

app/views/board/post.scala.html

--- app/views/board/post.scala.html

+++ app/views/board/post.scala.html


 @import models.enumeration._
 @implicitField = @{ helper.FieldConstructor(simpleForm) }
 
-@getTitle(postTitle:String, projectName:String) = {
-	@postTitle (@projectName) 
-}
-
-@main(getTitle(post.title, project.name).toString(), project, utils.MenuType.BOARD){
+@main(post.title, project, utils.MenuType.BOARD){
 
 <div class="page board-view">
   @prjmenu(project, utils.MenuType.BOARD, "main-menu-only")

6b90a46

6aab0d8

app/views/board/postList.scala.html

--- app/views/board/postList.scala.html

+++ app/views/board/postList.scala.html


 
 @main(title, project, utils.MenuType.BOARD) {
 <div class="page">
-  @views.html.prjmenu(project, utils.MenuType.BOARD, "main-menu-only")
+  @prjmenu(project, utils.MenuType.BOARD, "main-menu-only")
   
   <div class="header-wrap">
     <div class="search-wrap board">

6b90a46

6aab0d8

app/views/code/codeView.scala.html

--- app/views/code/codeView.scala.html

+++ app/views/code/codeView.scala.html


 @main(Messages("menu.code"), project, utils.MenuType.CODE){
 <div class="page">
 
-	@views.html.prjmenu(project, utils.MenuType.CODE, "main-menu-only")
+	@prjmenu(project, utils.MenuType.CODE, "main-menu-only")
 
 	<ul class="nav nav-tabs hive-tabs">
 		<li class="active">

6b90a46

6aab0d8

app/views/code/history.scala.html

--- app/views/code/history.scala.html

+++ app/views/code/history.scala.html


 
 @main(Messages("title.commitHistory"), project, utils.MenuType.CODE) {
 <div class="page">
-	@views.html.prjmenu(project, utils.MenuType.CODE, "main-menu-only")
+	@prjmenu(project, utils.MenuType.CODE, "main-menu-only")
 
 	@defining(
 		if(selectedBranch) {

6b90a46

6aab0d8

app/views/code/nohead.scala.html

--- app/views/code/nohead.scala.html

+++ app/views/code/nohead.scala.html


 @(project: Project)
 
-@main(Messages("Commit History"), project, utils.MenuType.CODE) {
+@main(Messages("title.commitHistory"), project, utils.MenuType.CODE) {
 <div class="page">
-
-	@views.html.prjmenu(project, utils.MenuType.CODE, "main-menu-only")
-	
-    <div id="codeError" class="row-fluid">
-        <div class="well span12">
-            <p>HEAD커밋이 존재하지 않습니다. 다음과 같은 방법을 시도해 보세요</p>
-            <pre><code>git clone @CodeApp.getURL(project.owner, project.name)
+	@prjmenu(project, utils.MenuType.CODE, "main-menu-only")
+		
+	<div class="row-fluid">
+		<div class="well span12">
+			<p>HEAD커밋이 존재하지 않습니다. 다음과 같은 방법을 시도해 보세요</p>
+			<pre><code>git clone @CodeApp.getURL(project.owner, project.name)
 touch readme.md
 git add readme.md
 git commit -m "init"
 git push origin master</code></pre>
-        </div>
-    </div>
+		</div>
+	</div>
+
 </div>
 }

6b90a46

6aab0d8

app/views/main.scala.html

--- app/views/main.scala.html

+++ app/views/main.scala.html


 
 @import utils._
 
-@layout(Messages(title))("prj") {
+@layout(Messages(title) + " (" + project.name + ")")("prj") {
   <header class="gnb-outer">
     @topmenu(project)
 	@sidemenu(project)

6b90a46

6aab0d8

app/views/project/projectMngMain.scala.html

--- app/views/project/projectMngMain.scala.html

+++ app/views/project/projectMngMain.scala.html


 @(title: String, project:Project)(content: Html)
 
-@layout(Messages(title))("prj") {
+@layout(Messages(title) + " (" + project.name + ")")("prj") {
     <header class="gnb-outer">
       @topmenu(project)
       @sidemenu(project)

     
     <div class="container page-wrap">
       <div class="page">
-        @views.html.alert()
+		@alert()
         @content
       </div>
     </div>

6b90a46

6aab0d8

app/views/project/setting.scala.html

--- app/views/project/setting.scala.html

+++ app/views/project/setting.scala.html


 @implicitField = @{ helper.FieldConstructor(simpleForm) }
 
 @projectMngMain(message, project) {
-    @views.html.prjmenu(project, utils.MenuType.PROJECT_SETTING, "")
+    @prjmenu(project, utils.MenuType.PROJECT_SETTING, "")
 
     <div class="bubble-wrap gray">
         @form(action=routes.ProjectApp.settingProject(project.owner, project.name), 'id->"saveSetting" , 'enctype->"multipart/form-data", 'class->"nm"){

6b90a46

6aab0d8

conf/messages.en

--- conf/messages.en

+++ conf/messages.en


 label.category = Category
 label.name = Name
 label.add = Add
+label.manage = Manage Label
 
 order.all = All
 order.date = Date

 assignee = Assignee
 milestone = Milestone
 none = None
+comment = Comment
 
 #validation
 validation.tooShortPassword = The password field must be at least 4 characters in length.

6b90a46

6aab0d8

conf/messages.ko

--- conf/messages.ko

+++ conf/messages.ko


 menu.code = 코드
 menu.issue = 이슈
 menu.wiki = 위키
-menu.admin = 프로젝트 관리
+menu.admin = 프로젝트 설정
 menu.siteAdmin = 사이트 관리
 menu.task = 작업
 

 label.category = 분류
 label.name = 이름
 label.add = 추가
+label.manage = 라벨관리
 
 order.all = 전체
 order.date = 날짜순

 project.member.delete = 프로젝트 유저 삭제
 project.member.notExist = 존재하지 않는 유저입니다.
 project.member.ownerCannotLeave = 프로젝트 소유자는 탈퇴할 수 없습니다.
-project.sidebar = 프로젝트 관리
+project.sidebar = 프로젝트 설정
 project.setting = 설정
 project.member = 멤버
 project.milestone = 마일스톤

 site.sidebar = 사이트 관리
 site.sidebar.setting = 설정
 site.sidebar.userList = 유저 관리
-site.sidebar.projectList = 프로젝트 관리
+site.sidebar.projectList = 프로젝트 설정
 site.sidebar.softwareMap = 소프트웨어 맵
 site.sidebar.mailSend = 메일 발송
 site.project.filter = 찾으려는 프로젝트 이름을 입력하세요

 assignee = 담당자
 milestone = 마일스톤
 none = 없음
+comment = 댓글
 
 #validation
 validation.tooShortPassword = 비밀번호를 4자 이상으로 만들어 주세요!

...	...	@@ -1038,20 +1038,26 @@
1038	1038	float: right;
1039	1039	font-size: 28px;
1040	1040	line-height: 1;
1041		- &.all {
1042		- color: @orange;
1043		- }
1044		- &.open {
1045		- color: #5DBBE0;
1046		- /color: #51AACC;/
1047		- }
1048		- &.public {
1049		- color: #5DBBE0;
1050		- }
	1041	+
	1042	+ &.all { color: @orange; }
	1043	+ &.open { color: #5DBBE0; /color: #51AACC;/ }
	1044	+ &.public { color: #5DBBE0; }
1051	1045	}
1052	1046	}
1053	1047	.stat-issue {
1054	1048	width:240px;
	1049	+ border-bottom:1px solid #c5c5c5;
	1050	+
	1051	+ &.active {
	1052	+ box-shadow:inset 0px 2px 2px rgba(0,0,0,0.25);
	1053	+ border-bottom:none;
	1054	+
	1055	+ .desc {
	1056	+ &.all { color: @orange; }
	1057	+ &.open { color: #5DBBE0; /color: #51AACC;/ }
	1058	+ &.public { color: #5DBBE0; }
	1059	+ }
	1060	+ }
1055	1061	}
1056	1062	}
1057	1063	.search-wrap {
...	...	@@ -1197,7 +1203,7 @@
1197	1203	}
1198	1204	}
1199	1205
1200		- .labels { background:#D7D7D7; }
	1206	+ /.labels { background:#D7D7D7; }/
1201	1207
1202	1208	.custom-label-category:before {
1203	1209	content:'\|'; margin-right:5px;
...	...	@@ -1208,8 +1214,8 @@
1208	1214	i { .ico-arrow-up-blue; }
1209	1215	}
1210	1216
1211		- // bootstrap
1212		- .form-horizontal {
	1217	+ // override bootstrap
	1218	+ .form-horizontal {
1213	1219	.control-group {
1214	1220	margin: 0; padding: 6px 10px;
1215	1221	border-bottom: 1px solid #e3e3e3;
...	...	@@ -2039,6 +2045,7 @@
2039	2045	&.issue {
2040	2046	.title { width:650px; }
2041	2047	.badge {
	2048	+ font-size:11px;
2042	2049	text-shadow:none;
2043	2050	.border-radius(2px);
2044	2051	}
...	...	@@ -2205,7 +2212,11 @@
2205	2212	display: table-cell;
2206	2213	vertical-align: top;
2207	2214	}
2208		- .avatar-wrap { margin-right:12px; }
	2215	+ .avatar-wrap {
	2216	+ margin-right:12px;
	2217	+ display:inline-block !important;
	2218	+ float:left;
	2219	+ }
2209	2220	/*.thumb-wrap {
2210	2221	width: 45px;
2211	2222	}*/

...	...	@@ -34,7 +34,7 @@
34	34
35	35	<div class="content-footer">
36	36	<div class="attach-wrap">
37		- <div class="thumb-wrap">
	37	+ <div class="avatar-wrap">
38	38	<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" class="img-rounded" width="32" height="32" alt="avatar">
39	39	</div>
40	40	<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.BOARD_POST">

...	...	@@ -34,7 +34,7 @@
34	34
35	35	<div class="content-footer">
36	36	<div class="attach-wrap">
37		- <div class="thumb-wrap">
	37	+ <div class="avatar-wrap">
38	38	<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" class="img-rounded" width="32" height="32" alt="avatar">
39	39	</div>
40	40	<div id="upload" class="attach-info-wrap" resourceType="@ResourceType.BOARD_POST">

...	...	@@ -57,6 +57,7 @@
57	57	label.category = Category
58	58	label.name = Name
59	59	label.add = Add
	60	+label.manage = Manage Label
60	61
61	62	order.all = All
62	63	order.date = Date
...	...	@@ -360,6 +361,7 @@
360	361	assignee = Assignee
361	362	milestone = Milestone
362	363	none = None
	364	+comment = Comment
363	365
364	366	#validation
365	367	validation.tooShortPassword = The password field must be at least 4 characters in length.

...	...	@@ -38,7 +38,7 @@
38	38	menu.code = 코드
39	39	menu.issue = 이슈
40	40	menu.wiki = 위키
41		-menu.admin = 프로젝트 관리
	41	+menu.admin = 프로젝트 설정
42	42	menu.siteAdmin = 사이트 관리
43	43	menu.task = 작업
44	44
...	...	@@ -58,6 +58,7 @@
58	58	label.category = 분류
59	59	label.name = 이름
60	60	label.add = 추가
	61	+label.manage = 라벨관리
61	62
62	63	order.all = 전체
63	64	order.date = 날짜순
...	...	@@ -230,7 +231,7 @@
230	231	project.member.delete = 프로젝트 유저 삭제
231	232	project.member.notExist = 존재하지 않는 유저입니다.
232	233	project.member.ownerCannotLeave = 프로젝트 소유자는 탈퇴할 수 없습니다.
233		-project.sidebar = 프로젝트 관리
	234	+project.sidebar = 프로젝트 설정
234	235	project.setting = 설정
235	236	project.member = 멤버
236	237	project.milestone = 마일스톤
...	...	@@ -264,7 +265,7 @@
264	265	site.sidebar = 사이트 관리
265	266	site.sidebar.setting = 설정
266	267	site.sidebar.userList = 유저 관리
267		-site.sidebar.projectList = 프로젝트 관리
	268	+site.sidebar.projectList = 프로젝트 설정
268	269	site.sidebar.softwareMap = 소프트웨어 맵
269	270	site.sidebar.mailSend = 메일 발송
270	271	site.project.filter = 찾으려는 프로젝트 이름을 입력하세요
...	...	@@ -367,6 +368,7 @@
367	368	assignee = 담당자
368	369	milestone = 마일스톤
369	370	none = 없음
	371	+comment = 댓글
370	372
371	373	#validation
372	374	validation.tooShortPassword = 비밀번호를 4자 이상으로 만들어 주세요!

...	...	@@ -3,19 +3,8 @@
3	3	}
4	4
5	5	body {
6		- /*
7		- background-repeat: no-repeat;
8		- background-color: #8cc8ce;
9		- background-position: center bottom, center top;
10		- background-image: url("@{base-image-path}/bg_day_objects.png"), url("@{base-image-path}/bg_day.png");
11		- &.night {
12		- background-color: #22262c;
13		- background-image: url("/images/bg_night.png");
14		- }
15		- */
16	6	background : @base-background;
17		- background-color: @base-background-color;
18		-
	7	+ background-color: @base-background-color;
19	8	font-family: @base-font-family;
20	9	}
21	10	input, button, select, textarea { font-family: @base-font-family !important; }
...	...	@@ -24,29 +13,14 @@
24	13	color: inherit;
25	14	text-decoration: none;
26	15	outline: none;
27		- &:hover {
28		- outline: none !important;
29		- color: @link-hover-color;
30		- text-decoration: underline;
31		- }
32		- &:focus {
33		- outline: none !important;
34		- }
	16	+ &:hover { outline: none !important; color: @link-hover-color; text-decoration: underline; }
	17	+ &:focus { outline: none !important; }
35	18	}
36	19
37		-.btn-transparent {
38		- border: 0;
39		- background: transparent;
40		- padding: 0;
41		-}
	20	+.btn-transparent { border: 0; padding: 0; background: transparent; }
42	21
43		-.d-link {
44		- color: @blue;
45		-}
46		-
47		-.nm {
48		- margin: 0 !important;
49		-}
	22	+.d-link { color: @blue; }
	23	+.nm { margin: 0 !important; }
50	24
51	25	.n-alert {
52	26	display:none;
...	...	@@ -177,7 +151,7 @@
177	151	.vmiddle {
178	152	vertical-align:middle !important
179	153	}
180		-
	154	+/*
181	155	.mandatory-text-wrap {
182	156	overflow:hidden; position:relative;
183	157	}
...	...	@@ -188,4 +162,5 @@
188	162	background:#f00;
189	163	-webkit-transform:rotate(45deg);
190	164	}
	165	+*/
191	166	.bold { font-weight:bold; } (No newline at end of file)

...	...	@@ -5,11 +5,7 @@
5	5	@import models.enumeration._
6	6	@implicitField = @{ helper.FieldConstructor(simpleForm) }
7	7
8		-@getTitle(postTitle:String, projectName:String) = {
9		- @postTitle (@projectName)
10		-}
11		-
12		-@main(getTitle(post.title, project.name).toString(), project, utils.MenuType.BOARD){
	8	+@main(post.title, project, utils.MenuType.BOARD){
13	9
14	10	<div class="page board-view">
15	11	@prjmenu(project, utils.MenuType.BOARD, "main-menu-only")

...	...	@@ -22,7 +22,7 @@
22	22
23	23	@main(title, project, utils.MenuType.BOARD) {
24	24	<div class="page">
25		- @views.html.prjmenu(project, utils.MenuType.BOARD, "main-menu-only")
	25	+ @prjmenu(project, utils.MenuType.BOARD, "main-menu-only")
26	26
27	27	<div class="header-wrap">
28	28	<div class="search-wrap board">

...	...	@@ -3,7 +3,7 @@
3	3	@main(Messages("menu.code"), project, utils.MenuType.CODE){
4	4	<div class="page">
5	5
6		- @views.html.prjmenu(project, utils.MenuType.CODE, "main-menu-only")
	6	+ @prjmenu(project, utils.MenuType.CODE, "main-menu-only")
7	7
8	8	<ul class="nav nav-tabs hive-tabs">
9	9	<li class="active">

...	...	@@ -10,7 +10,7 @@
10	10
11	11	@main(Messages("title.commitHistory"), project, utils.MenuType.CODE) {
12	12	<div class="page">
13		- @views.html.prjmenu(project, utils.MenuType.CODE, "main-menu-only")
	13	+ @prjmenu(project, utils.MenuType.CODE, "main-menu-only")
14	14
15	15	@defining(
16	16	if(selectedBranch) {

...	...	@@ -1,19 +1,19 @@
1	1	@(project: Project)
2	2
3		-@main(Messages("Commit History"), project, utils.MenuType.CODE) {
	3	+@main(Messages("title.commitHistory"), project, utils.MenuType.CODE) {
4	4	<div class="page">
5		-
6		- @views.html.prjmenu(project, utils.MenuType.CODE, "main-menu-only")
7		-
8		- <div id="codeError" class="row-fluid">
9		- <div class="well span12">
10		- <p>HEAD커밋이 존재하지 않습니다. 다음과 같은 방법을 시도해 보세요</p>
11		- <pre><code>git clone @CodeApp.getURL(project.owner, project.name)
	5	+ @prjmenu(project, utils.MenuType.CODE, "main-menu-only")
	6	+
	7	+ <div class="row-fluid">
	8	+ <div class="well span12">
	9	+ <p>HEAD커밋이 존재하지 않습니다. 다음과 같은 방법을 시도해 보세요</p>
	10	+ <pre><code>git clone @CodeApp.getURL(project.owner, project.name)
12	11	touch readme.md
13	12	git add readme.md
14	13	git commit -m "init"
15	14	git push origin master</code></pre>
16		- </div>
17		- </div>
	15	+ </div>
	16	+ </div>
	17	+
18	18	</div>
19	19	}

...	...	@@ -2,7 +2,7 @@
2	2
3	3	@import utils._
4	4
5		-@layout(Messages(title))("prj") {
	5	+@layout(Messages(title) + " (" + project.name + ")")("prj") {
6	6	<header class="gnb-outer">
7	7	@topmenu(project)
8	8	@sidemenu(project)

...	...	@@ -1,6 +1,6 @@
1	1	@(title: String, project:Project)(content: Html)
2	2
3		-@layout(Messages(title))("prj") {
	3	+@layout(Messages(title) + " (" + project.name + ")")("prj") {
4	4	<header class="gnb-outer">
5	5	@topmenu(project)
6	6	@sidemenu(project)
...	...	@@ -8,7 +8,7 @@
8	8
9	9	<div class="container page-wrap">
10	10	<div class="page">
11		- @views.html.alert()
	11	+ @alert()
12	12	@content
13	13	</div>
14	14	</div>

...	...	@@ -5,7 +5,7 @@
5	5	@implicitField = @{ helper.FieldConstructor(simpleForm) }
6	6
7	7	@projectMngMain(message, project) {
8		- @views.html.prjmenu(project, utils.MenuType.PROJECT_SETTING, "")
	8	+ @prjmenu(project, utils.MenuType.PROJECT_SETTING, "")
9	9
10	10	<div class="bubble-wrap gray">
11	11	@form(action=routes.ProjectApp.settingProject(project.owner, project.name), 'id->"saveSetting" , 'enctype->"multipart/form-data", 'class->"nm"){

Delete comment