Commit @2e96636e8ddfd72f9f9f758aec90002ba79d1c8c

Jihan Kim 2013-05-03

HIVE UI CSS (HIVE-188)

@2e96636e8ddfd72f9f9f758aec90002ba79d1c8c

3186cb8

2e96636

app/assets/stylesheets/less/_buttons.less

--- app/assets/stylesheets/less/_buttons.less

+++ app/assets/stylesheets/less/_buttons.less

...	...	@@ -56,7 +56,6 @@
56	56	background-color : #000; /666;/
57	57	}
58	58	}
59		-
60	59
61	60	&.med {
62	61	font-size: 11px;
...	...	@@ -68,10 +67,16 @@
68	67	}
69	68	.border-radius(2px); /5px/
70	69	}
	70	+
71	71	&.small {
72		- font-size: 11px;
	72	+ font-size: 10px;
73	73	padding: 3px 10px;
74	74	.border-radius(2px);
	75	+
	76	+ &.btn-transparent {
	77	+ height:24px;
	78	+ padding:1px 10px;
	79	+ }
75	80	}
76	81	}
77	82

3186cb8

2e96636

app/assets/stylesheets/less/_common.less

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

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


 }
 
 
-/** override bootstrap **/
-.dropdown-toggle.d-label {
-    .border-radius(4px 0 0 4px) !important;
-    min-width: 100px;
-    text-align: left;
-}
 /*
 .btn {
     margin-right:5px;

     margin-right:5px; -webkit-transition-duration:0.25s;
     &:last-of-type { margin:0; }
     
-    .del-link { margin-left:8px; padding:8px 4px; }
+    .del-link { 
+        margin-left:8px; padding:8px 4px;
+        -webkit-transition-duration:inherit;
+        &:hover { background:rgba(0,0,0,.2); } 
+    }
     
     &.active {
         .border-radius(2px);

2e96636

app/assets/stylesheets/less/_hiveUI.less (added)

+++ app/assets/stylesheets/less/_hiveUI.less

...	...	@@ -0,0 +1,255 @@
	1	+form { margin:0 0 2px; }
	2	+textarea, input[type="text"], input[type="password"], input[type="datetime"],
	3	+input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"],
	4	+input[type="week"], input[type="number"], input[type="email"], input[type="url"],
	5	+input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
	6	+ .box-shadow(none);
	7	+ .border-radius(2px);
	8	+}
	9	+
	10	+/ ui.Dropdown /
	11	+.dropdown-toggle {
	12	+ background:@white; text-align:left;
	13	+ padding:0; padding-left:12px;
	14	+ .border-radius(2px);
	15	+
	16	+ .d-label {
	17	+ float:left; margin:0;
	18	+ padding:4px 0; padding-right:9px;
	19	+ width:116px; overflow:hidden;
	20	+ .inline-block;
	21	+ }
	22	+ &.small .d-label { width: 29px; }
	23	+ &.medium .d-label { width: 58px; }
	24	+ &.large .d-label { width: 116px; }
	25	+ &.auto .d-label { width: inherit; }
	26	+
	27	+ .d-caret {
	28	+ float:right; margin:0;
	29	+ padding:4px 9px;
	30	+ border-left:1px solid #d9d9d9;
	31	+ }
	32	+}
	33	+.btn-group.open .btn.dropdown-toggle {
	34	+ background:darken(@white, 10%);
	35	+}
	36	+.btn .caret {
	37	+ border-top-color:@blue;
	38	+}
	39	+.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a {
	40	+ background-color:@darkgray !important;
	41	+ .linear-gradient(@darkgray, darken(@darkgray, 10%));
	42	+}
	43	+.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
	44	+ color:#fff;
	45	+ background-color:@darkgray !important;
	46	+ .linear-gradient(@darkgray, darken(@darkgray, 10%));
	47	+}
	48	+
	49	+/ buttons /
	50	+.nbtn {
	51	+ text-align :center;
	52	+ font-weight:bold;
	53	+ font-size: 11px;
	54	+ line-height: 18px;
	55	+ height: 18px;
	56	+ border:0; padding:0;
	57	+
	58	+ .border-radius(2px);
	59	+ .box-shadow(0 1px 2px rgba(0, 0, 0, .25));
	60	+ .inline-block;
	61	+ > i.ico { margin-right: 5px; }
	62	+
	63	+ color: @white;
	64	+ background-color: #707070;
	65	+ &:hover {
	66	+ background-color: darken(#707070, 10%);
	67	+ text-decoration: none;
	68	+ }
	69	+
	70	+ &.blue {
	71	+ background-color: @blue; /#56B5D9/
	72	+ &:hover { background-color: darken(@blue, 10%); }
	73	+ }
	74	+
	75	+ &.orange {
	76	+ background-color: @orange;
	77	+ &:hover { background-color: darken(@orange, 10%); }
	78	+ }
	79	+
	80	+ &.black {
	81	+ background-color: #222;
	82	+ &:hover { background-color : #000; }
	83	+ }
	84	+
	85	+ &.white {
	86	+ color: #222;
	87	+ background-color: @white;
	88	+ &:hover { background-color: darken(@white, 10%); }
	89	+ }
	90	+}
	91	+a.nbtn, div.nbtn, span.nbtn, p.nbtn {
	92	+ &.small { padding: 3px 10px; }
	93	+ &.medium { padding: 6px 20px; }
	94	+ &.large { padding: 9px 30px; font-size:15px; }
	95	+}
	96	+button.nbtn {
	97	+ &.small { padding:1px 10px; height:24px; line-height:1; }
	98	+ &.medium { padding:4px 20px; height:30px; line-height:1; }
	99	+ &.large { padding:8px 30px; height:36px; line-height:1; font-size:15px; }
	100	+}
	101	+
	102	+/* fileUpload button **/
	103	+.fake-file-wrap {
	104	+ position: relative; display:block; clear:both;
	105	+ overflow: hidden; cursor:pointer;
	106	+ width:70px; margin-top:10px;
	107	+ &:hover {
	108	+ background:darken(@white, 10%);
	109	+ }
	110	+
	111	+ .file {
	112	+ position: absolute; z-index:2; cursor:pointer;
	113	+ top:0; left: -15px; width:100px;
	114	+ .opacity(0);
	115	+ }
	116	+}
	117	+
	118	+/ issue label /
	119	+.issue-label {
	120	+ border:none; padding:2px 4px; margin-right:5px;
	121	+ font-size:11px; font-weight:bold;
	122	+ box-shadow: inset 0px -1px 1px rgba(0,0,0,0.3);
	123	+ -webkit-transition-duration:0.25s;
	124	+ &:last-of-type { margin:0; }
	125	+
	126	+ .delete {
	127	+ margin-left:8px; padding:8px 4px;
	128	+ -webkit-transition-duration:inherit;
	129	+ &:hover { background:rgba(0,0,0,.2); }
	130	+ }
	131	+
	132	+ &.active {
	133	+ .border-radius(2px);
	134	+ &.active-white { color:#fff; }
	135	+ &.active-dimgray { color:#696969; }
	136	+ }
	137	+}
	138	+
	139	+/ input /
	140	+/ 화면 중앙의 프로젝트 내 검색 폼 /
	141	+.form-search {
	142	+ .text {
	143	+ width: 360px;
	144	+ margin: 5px 0 0;
	145	+ background-color: #fff;
	146	+ border: 1px solid #ccc;
	147	+ border-right: 0 none;
	148	+ .box-shadow(none);
	149	+ .border-radius(2px 0 0 2px);
	150	+ &:focus { .box-shadow(none); }
	151	+ }
	152	+
	153	+ .btn {
	154	+ width : 88px;
	155	+ margin : 5px 0 0;
	156	+ padding: 4px 0;
	157	+ border : 1px solid #a9a9a9;
	158	+ color : @black;
	159	+ text-align : center;
	160	+ font-weight: bold;
	161	+ font-size : 11px;
	162	+ .border-radius(0 2px 2px 0);
	163	+
	164	+ &:hover { color:@link-hover-color; }
	165	+ }
	166	+}
	167	+
	168	+/ 화면 상단의 전체 검색 폼 /
	169	+.form-searchbar {
	170	+ width: 146px; height: 19px;
	171	+ margin: 0; padding: 0 6px;
	172	+ background-color: @search-bar-bg-color;
	173	+ border:1px solid @search-bar-border-color;
	174	+
	175	+ .border-radius(2px);
	176	+ .box-shadow(inset 0px 2px 3px rgba(0,0,0,0.12));
	177	+
	178	+ .text {
	179	+ width: 128px; height: 13px;
	180	+ margin: 0; margin-right:3px;
	181	+ padding:4px 0px;
	182	+ border: 0 none;
	183	+
	184	+ font-size: 11px;
	185	+ color: @search-input-color;
	186	+ background-color: transparent;
	187	+
	188	+ .box-shadow(none);
	189	+ &:focus { .box-shadow(none); }
	190	+ }
	191	+
	192	+ .ico-search {
	193	+ border:0; padding:0;
	194	+ background-color:transparent;
	195	+ margin-bottom:2px;
	196	+ }
	197	+}
	198	+
	199	+/ Avatar Wraps /
	200	+.avatar-wrap {
	201	+ width:32px; height:32px; /* default size: medium */
	202	+ display:inline-block;
	203	+ vertical-align:middle;
	204	+ overflow:hidden;
	205	+ border: 1px solid #ccc;
	206	+ .border-radius(3px) !important;
	207	+
	208	+ &.small { width:24px; height:24px; }
	209	+ &.medium { width:32px; height:32px; }
	210	+ &.large { width:64px; height:64px; }
	211	+ &.xlarge { width:128px; height:128px; }
	212	+}
	213	+
	214	+/ tab UI /
	215	+.nav-tabs {
	216	+ li {
	217	+ a {
	218	+ padding-left:30px; padding-right:30px;
	219	+ background:#ececec;
	220	+ border:1px solid #d3d3d3;
	221	+ .box-shadow(inset 0px 1px 1px #fff);
	222	+ }
	223	+ &.active a {
	224	+ font-weight:bold;
	225	+ letter-spacing:-1pt;
	226	+ }
	227	+ }
	228	+}
	229	+
	230	+/ alert /
	231	+.hiveDialog {
	232	+ .border-radius(none);
	233	+ border:10px solid #bebebe;
	234	+ padding:16px 20px; width:500px;
	235	+
	236	+ .btn-dismiss {
	237	+ padding:0; margin:0; width:100%; text-align: right;
	238	+ display:block; clear:both;
	239	+
	240	+ button {
	241	+ font-size:24px; font-weight:bold; color:#898989;
	242	+ border:none; background:transparent;
	243	+ }
	244	+ }
	245	+
	246	+ .message {
	247	+ .msg {
	248	+ text-align:center;
	249	+ font-weight:bold; font-size:18px;
	250	+ margin-bottom:20px; line-height:1.5em;
	251	+ }
	252	+ }
	253	+}
	254	+.alert { display:none; } / use .hiveDialog /
	255	+

3186cb8

2e96636

app/assets/stylesheets/less/_page.less

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

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


 //--- common
+.gnb-logo {
+    display: block;
+    width: 123px; height: 55px;
+    text-indent: -250px; overflow:hidden;
+    background-size:123px 55px;
+    background-image: url("@{base-image-path}/logo-white.png");
+    
+    &.orange {
+        background-image: url("@{base-image-path}/logo-orange.png");
+    }
+}
+
 .gnb-outer {
     width: 100%;
     border-bottom:@gnb-border-bottom;

             
             .logo {
                 float: left;
-                width: 123px;
-                height: 55px;
-                line-height:55px;
+                width: 123px; height: 55px; line-height:55px;
                 text-align:center; font-size:2em; overflow:hidden;
                 color:#fff; background-color: @gnb-logo-bg-color;
                
                 span {
-                    width: 123px;
-                    height: 55px;
-                    display: block;
-                    text-indent: -250px;
-                    background-size:123px 55px;
-                    background-image: url("@{base-image-path}/logo-white.png");
+                    .gnb-logo;
                 }
             }
             

                     }
                     
                     .search-bar {
-                        margin: 3px 0 0 5px;
-                        padding: 0 6px;
-                        width: 146px;
-                        height: 19px;
-                        background-color: @search-bar-bg-color;
-                        border:1px solid @search-bar-border-color;
-                        .border-radius(2px);
-                        .box-shadow(inset 0px 2px 3px rgba(0,0,0,0.12));
-                        
-                        form {
-                            margin: 0;
-                            line-height: 0;
-                        }
-                        .query {
-                            border: 0 none;
-                            margin: 0; margin-right:3px;
-                            padding:4px 0px; 
-                            width: 128px; height: 13px;
-                            
-                            font-size: 11px;
-                            color: @search-input-color;
-                            background-color: transparent;
-                           
-                           .box-shadow(none);
-                        }
-                        .ico-search {
-                            margin-bottom:2px;
-                        }
-                        .ico-search-14 {
-                            margin-top: -1px;
-                            margin-right: 10px;
-                        }
+                        padding:3px 0 0 5px;
                     } /*.search-bar */
                 } // .right
             }// gnb-menu

             .page-title { 
                 float:left; overflow:hidden; margin:0;
                 line-height:56px; color:#fff; font-weight:normal;
+                
+                a { vertical-align:top; }
             }
 
             .gnb-menus {

                     .sp-line { 
                         color:#626262 !important; 
                         opacity:1 !important; 
-                    }
-                    .search-bar {
-                        border:1px solid #2e2e2e;
                     }
                 }
             }

                     background: #F6F6F6;
                     /*box-shadow: inset 0px 1px #fff;*/
                    
-                   .issue-label {
+                   /*.issue-label {
                        border:none;
                        &.active {
                             box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.25);   
                        }
-                   }
+                   }*/
                    
                    /*.labels { background:#D7D7D7; }*/
                    

         }
     }
 }
-
+/*
 .fake-file-wrap {
     margin-top: 10px;
     position: relative;

         display:block !important;
     }
 }
-
+*/
 .cu-label {
     width: 80px;
     padding-right: 45px;

         }
     }
     .btn-wrap {
-        width: 138px; /*80px*/
+        width: 118px; /*138px; /*80px*/
         text-align: right;
     }
 }

         color:#898989; margin-top:18px;
     }
 }
-
+/*
 .hive-tabs {
     li {
         a { 

         }
     }
 }
+*/
 .code-tab, .plugin-tab {
     margin: 15px 0 20px;
 }

 }
 
 /** alertUI.scala.html **/
+/*
 .hiveDialog {
     .border-radius(none);
     border:10px solid #bebebe;

         }
     }
 }
-
+*/
 /** Bootstrap **/
+    /*
 .dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a {
     background-color:#878787 !important;
     .linear-gradient(#878787, darken(#878787, 10%));

     .box-shadow(none);
     .border-radius(2px);
 }
+*/
 /*
 hr.dark-gray { border-top:1px solid #d4d4d4; }
 */
-.alert { position:absolute; width:830px; top:0px; /*top:76px;*/ margin-left:auto; z-index:999; display:none; }
-form { margin:0 0 2px; }
+/*
+.alert { position:absolute; width:830px; top:0px; margin-left:auto; z-index:999; display:none; }
+form { margin:0 0 2px; }
+*/

3186cb8

2e96636

app/assets/stylesheets/less/_variables.less

--- app/assets/stylesheets/less/_variables.less

+++ app/assets/stylesheets/less/_variables.less


 @orange : #F36C22;
 @blue   : #5DBBE0;
 @blue2  : #51AACC;
+@darkgray: #878787;
+
 @gray-d4: #D4D4D4;
 @gray-ec: #ECECEC;
 @gray-f7: #F7F7F7;

3186cb8

2e96636

app/assets/stylesheets/nforge.less

--- app/assets/stylesheets/nforge.less

+++ app/assets/stylesheets/nforge.less

...	...	@@ -4,3 +4,4 @@
4	4	@import "less/_sprites.less";
5	5	@import "less/_page.less";
6	6	@import "less/_buttons.less";
	7	+@import "less/_hiveUI.less";

3186cb8

2e96636

app/controllers/Application.java

--- app/controllers/Application.java

+++ app/controllers/Application.java


 import playRepository.RepositoryService;
 //import views.html.code.codeNavi;
 import views.html.index;
+import views.html.hiveUI;
 
 import java.io.File;
 import java.util.List;

     	return ok(index.render(null, null));
     }
 
+    public static Result hiveUI(){
+    	return ok(views.html.hiveUI.render());
+    }
 }

2e96636

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

+++ app/views/hiveUI.scala.html

...	...	@@ -0,0 +1,238 @@
	1	+<!DOCTYPE html>
	2	+<html lang="ko">
	3	+<head>
	4	+ <meta charset="utf-8">
	5	+ <title>HIVE UI</title>
	6	+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
	7	+ <link rel="shortcut icon" type="image/png" href="/assets/images/favicon.ico">
	8	+ <link rel="stylesheet" type="text/css" media="screen" href="/assets/stylesheets/bootstrap.min.css">
	9	+ <link rel="stylesheet" type="text/css" media="screen" href="/assets/stylesheets/nforge.css">
	10	+ <script type="text/javascript" src="/assets/javascripts/lib/jquery/jquery-1.9.0.js"></script>
	11	+ <script type="text/javascript" src="/assets/javascripts/common/hive.Common.js"></script>
	12	+ <script type="text/javascript" src="/assets/javascripts/lib/bootstrap.js"></script>
	13	+ <style type="text/css">
	14	+ body { color:#ccc; }
	15	+ dl { display:inline-block; margin:18px; }
	16	+ dd { margin-left:0; }
	17	+ .gnb-logo { display:inline-block !important; }
	18	+ .gnb-outer { text-align:center; }
	19	+ .subtitle { font-size:24px; font-weight:bold; height:55px; line-height:55px; vertical-align:bottom; }
	20	+ .css { display:none;font-family: Consolas; color: #222; background: #C9EBB5; padding: 3px; border-radius: 3px; border: 1px solid #4CB848; }
	21	+ </style>
	22	+</head>
	23	+<body>
	24	+
	25	+<header class="gnb-outer">
	26	+ <span class="gnb-logo orange">HIVE</span>
	27	+ <span class="subtitle">User Interface Kit</span>
	28	+</header>
	29	+
	30	+<div class="container page-wrap">
	31	+ <div class="page">
	32	+
	33	+ <h3>Buttons</h5>
	34	+ <div>
	35	+ <p class="css">.nbtn</p>
	36	+ <p>
	37	+ <a href="#" class="nbtn medium">Default Button</a><!--
	38	+ --><button type="button" class="nbtn medium orange">Primary Button</button><!--
	39	+ --><a href="#" class="nbtn medium black">Cancel Button</a><!--
	40	+ --><a href="#" class="nbtn medium white">Action Button</a>
	41	+ </p>
	42	+ <p>
	43	+ <button type="button" class="nbtn medium">Default Button</button><!--
	44	+ --><a href="#" class="nbtn medium orange">Primary Button</a><!--
	45	+ --><button type="button" class="nbtn medium black">Cancel Button</button><!--
	46	+ --><button type="button" class="nbtn medium white">Action Button</button>
	47	+ </p>
	48	+
	49	+ <p class="css">.btn-wrap > .fake-file-wrap</p>
	50	+ <div class="btn-wrap">
	51	+ <div class="nbtn medium white fake-file-wrap">
	52	+ <i class="ico ico-plus-blue"></i>Upload<!--
	53	+ --> <input type="file" class="file" name="filePath" accept="image/*">
	54	+ </div>
	55	+ </div>
	56	+
	57	+ <p class="css">.btn-wrap > .fake-file-wrap</p>
	58	+ <div class="btn-wrap">
	59	+ <div class="nbtn medium white fake-file-wrap">
	60	+ <i class="ico ico-plus-blue"></i>파일 올리기<!--
	61	+ --> <input type="file" class="file" name="filePath" accept="image/*">
	62	+ </div>
	63	+ </div>
	64	+
	65	+ <p> </p>
	66	+ <p>
	67	+ <a href="#" class="nbtn large orange">Create your project</a>
	68	+ </p>
	69	+
	70	+ <p>
	71	+ <a href="#" class="nbtn small">Small button</a>
	72	+ <button type="button" class="nbtn medium">Medium button</button>
	73	+ <a href="#" class="nbtn large">Large button</a>
	74	+ </p>
	75	+ </div>
	76	+ <!-- // buttons -->
	77	+ <hr/>
	78	+
	79	+ <h3>Select</h5>
	80	+ <div>
	81	+ <p class="css">.dropdown-toggle</p>
	82	+
	83	+ <!-- ui.dropdown -->
	84	+ <div class="btn-group" data-name="assigneeId">
	85	+ <button class="btn dropdown-toggle small" data-toggle="dropdown">
	86	+ <span class="d-label">전체</span>
	87	+ <span class="d-caret"><span class="caret"></span></span>
	88	+ </button>
	89	+ <ul class="dropdown-menu">
	90	+ <li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">전체</a></li>
	91	+ <li data-value="0"><a href="javascript:void(0)">담당자 없음</a></li>
	92	+ </ul>
	93	+ </div>
	94	+ <!-- // ui.dropdown -->
	95	+
	96	+ <!-- ui.dropdown -->
	97	+ <div class="btn-group" data-name="assigneeId">
	98	+ <button class="btn dropdown-toggle medium" data-toggle="dropdown">
	99	+ <span class="d-label">전체</span>
	100	+ <span class="d-caret"><span class="caret"></span></span>
	101	+ </button>
	102	+ <ul class="dropdown-menu">
	103	+ <li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">전체</a></li>
	104	+ <li data-value="0"><a href="javascript:void(0)">담당자 없음</a></li>
	105	+ </ul>
	106	+ </div>
	107	+ <!-- // ui.dropdown -->
	108	+
	109	+ <!-- ui.dropdown -->
	110	+ <div class="btn-group" data-name="assigneeId">
	111	+ <button class="btn dropdown-toggle large" data-toggle="dropdown">
	112	+ <span class="d-label">전체</span>
	113	+ <span class="d-caret"><span class="caret"></span></span>
	114	+ </button>
	115	+ <ul class="dropdown-menu">
	116	+ <li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">전체</a></li>
	117	+ <li data-value="0"><a href="javascript:void(0)">담당자 없음</a></li>
	118	+ </ul>
	119	+ </div>
	120	+ <!-- // ui.dropdown -->
	121	+
	122	+ </div>
	123	+ <!-- // select -->
	124	+ <hr/>
	125	+
	126	+ <h3>Form</h3>
	127	+ <div>
	128	+ <p class="css">.form-search</p>
	129	+ <form class="form-search">
	130	+ <input type="text" class="text" name="filter" placeholder="현재 프로젝트에서 검색"><!--
	131	+ --><button type="button" class="btn">검색</button>
	132	+ </form>
	133	+
	134	+ <p class="css">.form-searchbar</p>
	135	+ <form class="form-searchbar">
	136	+ <input type="text" class="text" name="filter"><!--
	137	+ --><button type="button" class="ico ico-search"></button>
	138	+ </form>
	139	+ </div>
	140	+ <hr/>
	141	+ <!-- // input -->
	142	+
	143	+ <h3>Labels</h3>
	144	+ <div>
	145	+ <p class="css">.issue-label</p>
	146	+ <p>
	147	+ <button class="issue-label">Clean</button>
	148	+ <button class="issue-label">Fresh</button>
	149	+ <button class="issue-label">Modern</button>
	150	+ <button class="issue-label">Unique</button>
	151	+ </p>
	152	+ <p class="css">.issue-label .active</p>
	153	+ <p>
	154	+ <button class="issue-label active" style="background-color:#da5454; color:#fff;">Clean<span class="delete">×</span></button>
	155	+ <button class="issue-label active" style="background-color:#ff9933; color:#fff;">Fresh<span class="delete">×</span></button>
	156	+ <button class="issue-label active" style="background-color:#ffcc33; color:#fff;">Modern<span class="delete">×</span></button>
	157	+ <button class="issue-label active" style="background-color:#22b4b9; color:#fff;">Unique<span class="delete">×</span></button>
	158	+ </p>
	159	+ <p class="css">.issue-label .active .editable</p>
	160	+ <p>
	161	+ <button class="issue-label active editable" style="background-color:#da5454; color:#fff;">Clean<span class="delete">×</span></button>
	162	+ <button class="issue-label active editable" style="background-color:#ff9933; color:#fff;">Fresh<span class="delete">×</span></button>
	163	+ <button class="issue-label active editable" style="background-color:#ffcc33; color:#fff;">Modern<span class="delete">×</span></button>
	164	+ <button class="issue-label active editable" style="background-color:#22b4b9; color:#fff;">Unique<span class="delete">×</span></button>
	165	+ </p>
	166	+ </div>
	167	+ <!-- // labels -->
	168	+ <hr/>
	169	+
	170	+ <h3>Avatar</h3>
	171	+ <div>
	172	+ <p class="css">.avatar-wrap</p>
	173	+ <dl>
	174	+ <dt>
	175	+ <span class="css">.small</span>
	176	+ </dt>
	177	+ <dd>
	178	+ <a href="#" class="avatar-wrap small">
	179	+ <img src="/assets/images/default-avatar-128.png" width="24" height="24">
	180	+ </a>
	181	+ </dd>
	182	+ </dl>
	183	+ <dl>
	184	+ <dt>
	185	+ <span class="css">.medium</span>
	186	+ </dt>
	187	+ <dd>
	188	+ <a href="#" class="avatar-wrap medium">
	189	+ <img src="/assets/images/default-avatar-128.png" width="32" height="32">
	190	+ </a>
	191	+ </dd>
	192	+ </dl>
	193	+ <dl>
	194	+ <dt>
	195	+ <span class="css">.large</span>
	196	+ </dt>
	197	+ <dd>
	198	+ <a href="#" class="avatar-wrap large">
	199	+ <img src="/assets/images/default-avatar-128.png" width="64" height="64">
	200	+ </a>
	201	+ </dd>
	202	+ </dl>
	203	+ <dl>
	204	+ <dt>
	205	+ <span class="css">.xlarge</span>
	206	+ </dt>
	207	+ <dd>
	208	+ <a href="#" class="avatar-wrap xlarge">
	209	+ <img src="/assets/images/default-avatar-128.png" width="128" height="128">
	210	+ </a>
	211	+ </dd>
	212	+ </dl>
	213	+ </div>
	214	+ <!-- //avatar -->
	215	+ <hr/>
	216	+
	217	+ <h3>Tabs</h3>
	218	+ <div>
	219	+ <ul class="nav nav-tabs hive-tabs">
	220	+ <li class="active">
	221	+ <a href="#">파일</a>
	222	+ </li>
	223	+ <li>
	224	+ <a href="#">커밋</a>
	225	+ </li>
	226	+ </ul>
	227	+ </div>
	228	+ </div>
	229	+</div>
	230	+
	231	+<footer class="page-footer-outer">
	232	+ <div class="page-footer">
	233	+ <span class="provider">© <strong>NHN Corp.</strong></span>
	234	+ </div>
	235	+</footer>
	236	+
	237	+</body>
	238	+</html>(No newline at end of file)

3186cb8

2e96636

app/views/issue/issueList.scala.html

--- app/views/issue/issueList.scala.html

+++ app/views/issue/issueList.scala.html


 									<input type="text" name="authorLoginId" class="input-medium">
 								</div>
 							</div>
+							
 							<div class="control-group">
 								<label class="control-label">@Messages("assignee")</label>
 								<div class="controls">
 									<div class="btn-group" data-name="assigneeId">
-										<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite d-label input-medium">@Messages("order.all")</button>
-										<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
+										<button class="btn dropdown-toggle" data-toggle="dropdown">
+											<span class="d-label">@Messages("order.all")</span>
+											<span class="d-caret"><span class="caret"></span></span>
+										</button>
 										<ul class="dropdown-menu">
 											<li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">@Messages("order.all")</a></li>
 											<li data-value="0"><a href="javascript:void(0)">@Messages("noAssignee")</a></li>

 									</div>
 								</div>
 							</div>
+							
 							<div class="control-group">
 								<label class="control-label">@Messages("milestone")</label>
 								<div class="controls">
 									<div class="btn-group" data-name="milestoneId">
-										<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite d-label input-medium">@Messages("milestone.state.all")</button>
-										<button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
+										<button class="btn dropdown-toggle" data-toggle="dropdown">
+											<span class="d-label">@Messages("milestone.state.all")</span>
+											<span class="d-caret"><span class="caret"></span></span>
+										</button>
 										<ul class="dropdown-menu">
 											<li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">@Messages("milestone.state.all")</a></li>
 											<li data-value="0"><a href="javascript:void(0)">@Messages("noMilestone")</a></li>

3186cb8

2e96636

app/views/navbar.scala.html

--- app/views/navbar.scala.html

+++ app/views/navbar.scala.html


                 	<a href="@routes.UserApp.signupForm()" class="d-link signup">@Messages("title.signup")</a>
                 </li>
             	}
-                <li class="search-bar">
-                    <form action="@routes.ProjectApp.projects()">
-                        <input type="text" autocomplete="off" class="query" name="filter" accesskey="S" /><button type="submit" class="ico ico-search btn-transparent"></button>
-                    </form>
+            	<li class="search-bar">
+                	<form action="@routes.ProjectApp.projects()" class="form-searchbar">
+						<input type="text" class="text" name="filter" autocomplete="off" accesskey="S"><!-- 
+			 		 --><button type="submit" class="ico ico-search"></button>
+					</form>
                 </li>
             </ul>
         </div>

3186cb8

2e96636

app/views/topmenu.scala.html

--- app/views/topmenu.scala.html

+++ app/views/topmenu.scala.html


                 </li>
             	}
                 <li class="search-bar">
-                    <form action="@routes.ProjectApp.projects()">
-                        <input type="text" autocomplete="off" class="query" name="filter" /><button type="submit" class="ico ico-search btn-transparent"></button>
-                    </form>
+                	<form action="@routes.ProjectApp.projects()" class="form-searchbar">
+						<input type="text" class="text" name="filter" autocomplete="off" accesskey="S"><!-- 
+			 		 --><button type="submit" class="ico ico-search"></button>
+					</form>
                 </li>
             </ul>
         </div>

3186cb8

2e96636

conf/routes

--- conf/routes

+++ conf/routes


 # This file defines all application routes (Higher priority routes first)
 # ~~~~
 
-GET     /navitest                                      controllers.Application.navi()
+GET     /navitest                                       controllers.Application.navi()
 
 # Home page
 GET     /                                               controllers.Application.index()

 
 # Bootstrapping for test
 GET     /init                                           controllers.Application.init()
+GET		/hiveUI											controllers.Application.hiveUI()
 
 # User
 GET     /users                                          controllers.UserApp.users(query: String ?= "")

2e96636

docs/technical/hive-ui.html (added)

+++ docs/technical/hive-ui.html

...	...	@@ -0,0 +1,239 @@
	1	+<!DOCTYPE html>
	2	+<html lang="ko">
	3	+<head>
	4	+ <meta charset="utf-8">
	5	+ <title>HIVE UI</title>
	6	+ <base href="http://localhost:9000">
	7	+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
	8	+ <link rel="shortcut icon" type="image/png" href="/assets/images/favicon.ico">
	9	+ <link rel="stylesheet" type="text/css" media="screen" href="/assets/stylesheets/bootstrap.min.css">
	10	+ <link rel="stylesheet" type="text/css" media="screen" href="/assets/stylesheets/nforge.css">
	11	+ <script type="text/javascript" src="/assets/javascripts/lib/jquery/jquery-1.9.0.js"></script>
	12	+ <script type="text/javascript" src="/assets/javascripts/common/hive.Common.js"></script>
	13	+ <script type="text/javascript" src="/assets/javascripts/lib/bootstrap.js"></script>
	14	+ <style type="text/css">
	15	+ body { color:#ccc; }
	16	+ dl { display:inline-block; margin:18px; }
	17	+ dd { margin-left:0; }
	18	+ .gnb-logo { display:inline-block !important; }
	19	+ .gnb-outer { text-align:center; }
	20	+ .subtitle { font-size:24px; font-weight:bold; height:55px; line-height:55px; vertical-align:bottom; }
	21	+ .css { display:none;font-family: Consolas; color: #222; background: #C9EBB5; padding: 3px; border-radius: 3px; border: 1px solid #4CB848; }
	22	+ </style>
	23	+</head>
	24	+<body>
	25	+
	26	+<header class="gnb-outer">
	27	+ <span class="gnb-logo orange">HIVE</span>
	28	+ <span class="subtitle">User Interface Kit</span>
	29	+</header>
	30	+
	31	+<div class="container page-wrap">
	32	+ <div class="page">
	33	+
	34	+ <h3>Buttons</h5>
	35	+ <div>
	36	+ <p class="css">.nbtn</p>
	37	+ <p>
	38	+ <a href="#" class="nbtn medium">Default Button</a><!--
	39	+ --><button type="button" class="nbtn medium orange">Primary Button</button><!--
	40	+ --><a href="#" class="nbtn medium black">Cancel Button</a><!--
	41	+ --><a href="#" class="nbtn medium white">Action Button</a>
	42	+ </p>
	43	+ <p>
	44	+ <button type="button" class="nbtn medium">Default Button</button><!--
	45	+ --><a href="#" class="nbtn medium orange">Primary Button</a><!--
	46	+ --><button type="button" class="nbtn medium black">Cancel Button</button><!--
	47	+ --><button type="button" class="nbtn medium white">Action Button</button>
	48	+ </p>
	49	+
	50	+ <p class="css">.btn-wrap > .fake-file-wrap</p>
	51	+ <div class="btn-wrap">
	52	+ <div class="nbtn medium white fake-file-wrap">
	53	+ <i class="ico ico-plus-blue"></i>Upload<!--
	54	+ --> <input type="file" class="file" name="filePath" accept="image/*">
	55	+ </div>
	56	+ </div>
	57	+
	58	+ <p class="css">.btn-wrap > .fake-file-wrap</p>
	59	+ <div class="btn-wrap">
	60	+ <div class="nbtn medium white fake-file-wrap">
	61	+ <i class="ico ico-plus-blue"></i>파일 올리기<!--
	62	+ --> <input type="file" class="file" name="filePath" accept="image/*">
	63	+ </div>
	64	+ </div>
	65	+
	66	+ <p> </p>
	67	+ <p>
	68	+ <a href="#" class="nbtn large orange">Create your project</a>
	69	+ </p>
	70	+
	71	+ <p>
	72	+ <a href="#" class="nbtn small">Small button</a>
	73	+ <button type="button" class="nbtn medium">Medium button</button>
	74	+ <a href="#" class="nbtn large">Large button</a>
	75	+ </p>
	76	+ </div>
	77	+ <!-- // buttons -->
	78	+ <hr/>
	79	+
	80	+ <h3>Select</h5>
	81	+ <div>
	82	+ <p class="css">.dropdown-toggle</p>
	83	+
	84	+ <!-- ui.dropdown -->
	85	+ <div class="btn-group" data-name="assigneeId">
	86	+ <button class="btn dropdown-toggle small" data-toggle="dropdown">
	87	+ <span class="d-label">전체</span>
	88	+ <span class="d-caret"><span class="caret"></span></span>
	89	+ </button>
	90	+ <ul class="dropdown-menu">
	91	+ <li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">전체</a></li>
	92	+ <li data-value="0"><a href="javascript:void(0)">담당자 없음</a></li>
	93	+ </ul>
	94	+ </div>
	95	+ <!-- // ui.dropdown -->
	96	+
	97	+ <!-- ui.dropdown -->
	98	+ <div class="btn-group" data-name="assigneeId">
	99	+ <button class="btn dropdown-toggle medium" data-toggle="dropdown">
	100	+ <span class="d-label">전체</span>
	101	+ <span class="d-caret"><span class="caret"></span></span>
	102	+ </button>
	103	+ <ul class="dropdown-menu">
	104	+ <li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">전체</a></li>
	105	+ <li data-value="0"><a href="javascript:void(0)">담당자 없음</a></li>
	106	+ </ul>
	107	+ </div>
	108	+ <!-- // ui.dropdown -->
	109	+
	110	+ <!-- ui.dropdown -->
	111	+ <div class="btn-group" data-name="assigneeId">
	112	+ <button class="btn dropdown-toggle large" data-toggle="dropdown">
	113	+ <span class="d-label">전체</span>
	114	+ <span class="d-caret"><span class="caret"></span></span>
	115	+ </button>
	116	+ <ul class="dropdown-menu">
	117	+ <li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">전체</a></li>
	118	+ <li data-value="0"><a href="javascript:void(0)">담당자 없음</a></li>
	119	+ </ul>
	120	+ </div>
	121	+ <!-- // ui.dropdown -->
	122	+
	123	+ </div>
	124	+ <!-- // select -->
	125	+ <hr/>
	126	+
	127	+ <h3>Form</h3>
	128	+ <div>
	129	+ <p class="css">.form-search</p>
	130	+ <form class="form-search">
	131	+ <input type="text" class="text" name="filter" placeholder="현재 프로젝트에서 검색"><!--
	132	+ --><button type="button" class="btn">검색</button>
	133	+ </form>
	134	+
	135	+ <p class="css">.form-searchbar</p>
	136	+ <form class="form-searchbar">
	137	+ <input type="text" class="text" name="filter"><!--
	138	+ --><button type="button" class="ico ico-search"></button>
	139	+ </form>
	140	+ </div>
	141	+ <hr/>
	142	+ <!-- // input -->
	143	+
	144	+ <h3>Labels</h3>
	145	+ <div>
	146	+ <p class="css">.issue-label</p>
	147	+ <p>
	148	+ <button class="issue-label">Clean</button>
	149	+ <button class="issue-label">Fresh</button>
	150	+ <button class="issue-label">Modern</button>
	151	+ <button class="issue-label">Unique</button>
	152	+ </p>
	153	+ <p class="css">.issue-label .active</p>
	154	+ <p>
	155	+ <button class="issue-label active" style="background-color:#da5454; color:#fff;">Clean<span class="delete">×</span></button>
	156	+ <button class="issue-label active" style="background-color:#ff9933; color:#fff;">Fresh<span class="delete">×</span></button>
	157	+ <button class="issue-label active" style="background-color:#ffcc33; color:#fff;">Modern<span class="delete">×</span></button>
	158	+ <button class="issue-label active" style="background-color:#22b4b9; color:#fff;">Unique<span class="delete">×</span></button>
	159	+ </p>
	160	+ <p class="css">.issue-label .active .editable</p>
	161	+ <p>
	162	+ <button class="issue-label active editable" style="background-color:#da5454; color:#fff;">Clean<span class="delete">×</span></button>
	163	+ <button class="issue-label active editable" style="background-color:#ff9933; color:#fff;">Fresh<span class="delete">×</span></button>
	164	+ <button class="issue-label active editable" style="background-color:#ffcc33; color:#fff;">Modern<span class="delete">×</span></button>
	165	+ <button class="issue-label active editable" style="background-color:#22b4b9; color:#fff;">Unique<span class="delete">×</span></button>
	166	+ </p>
	167	+ </div>
	168	+ <!-- // labels -->
	169	+ <hr/>
	170	+
	171	+ <h3>Avatar</h3>
	172	+ <div>
	173	+ <p class="css">.avatar-wrap</p>
	174	+ <dl>
	175	+ <dt>
	176	+ <span class="css">.small</span>
	177	+ </dt>
	178	+ <dd>
	179	+ <a href="#" class="avatar-wrap small">
	180	+ <img src="/assets/images/default-avatar-128.png" width="24" height="24">
	181	+ </a>
	182	+ </dd>
	183	+ </dl>
	184	+ <dl>
	185	+ <dt>
	186	+ <span class="css">.medium</span>
	187	+ </dt>
	188	+ <dd>
	189	+ <a href="#" class="avatar-wrap medium">
	190	+ <img src="/assets/images/default-avatar-128.png" width="32" height="32">
	191	+ </a>
	192	+ </dd>
	193	+ </dl>
	194	+ <dl>
	195	+ <dt>
	196	+ <span class="css">.large</span>
	197	+ </dt>
	198	+ <dd>
	199	+ <a href="#" class="avatar-wrap large">
	200	+ <img src="/assets/images/default-avatar-128.png" width="64" height="64">
	201	+ </a>
	202	+ </dd>
	203	+ </dl>
	204	+ <dl>
	205	+ <dt>
	206	+ <span class="css">.xlarge</span>
	207	+ </dt>
	208	+ <dd>
	209	+ <a href="#" class="avatar-wrap xlarge">
	210	+ <img src="/assets/images/default-avatar-128.png" width="128" height="128">
	211	+ </a>
	212	+ </dd>
	213	+ </dl>
	214	+ </div>
	215	+ <!-- //avatar -->
	216	+ <hr/>
	217	+
	218	+ <h3>Tabs</h3>
	219	+ <div>
	220	+ <ul class="nav nav-tabs hive-tabs">
	221	+ <li class="active">
	222	+ <a href="#">파일</a>
	223	+ </li>
	224	+ <li>
	225	+ <a href="#">커밋</a>
	226	+ </li>
	227	+ </ul>
	228	+ </div>
	229	+ </div>
	230	+</div>
	231	+
	232	+<footer class="page-footer-outer">
	233	+ <div class="page-footer">
	234	+ <span class="provider">© <strong>NHN Corp.</strong></span>
	235	+ </div>
	236	+</footer>
	237	+
	238	+</body>
	239	+</html>(No newline at end of file)

3186cb8

2e96636

docs/technical/javascript-module-guide.md (Renamed from public/javascripts/template/ModuleGuide.md)

--- public/javascripts/template/ModuleGuide.md

+++ docs/technical/javascript-module-guide.md

No changes

Add a comment

Open 0
Closed 0

List

...	...	@@ -31,12 +31,6 @@
31	31	}
32	32
33	33
34		-/ override bootstrap /
35		-.dropdown-toggle.d-label {
36		- .border-radius(4px 0 0 4px) !important;
37		- min-width: 100px;
38		- text-align: left;
39		-}
40	34	/*
41	35	.btn {
42	36	margin-right:5px;
...	...	@@ -134,7 +128,11 @@
134	128	margin-right:5px; -webkit-transition-duration:0.25s;
135	129	&:last-of-type { margin:0; }
136	130
137		- .del-link { margin-left:8px; padding:8px 4px; }
	131	+ .del-link {
	132	+ margin-left:8px; padding:8px 4px;
	133	+ -webkit-transition-duration:inherit;
	134	+ &:hover { background:rgba(0,0,0,.2); }
	135	+ }
138	136
139	137	&.active {
140	138	.border-radius(2px);

...	...	@@ -1,4 +1,16 @@
1	1	//--- common
	2	+.gnb-logo {
	3	+ display: block;
	4	+ width: 123px; height: 55px;
	5	+ text-indent: -250px; overflow:hidden;
	6	+ background-size:123px 55px;
	7	+ background-image: url("@{base-image-path}/logo-white.png");
	8	+
	9	+ &.orange {
	10	+ background-image: url("@{base-image-path}/logo-orange.png");
	11	+ }
	12	+}
	13	+
2	14	.gnb-outer {
3	15	width: 100%;
4	16	border-bottom:@gnb-border-bottom;
...	...	@@ -15,19 +27,12 @@
15	27
16	28	.logo {
17	29	float: left;
18		- width: 123px;
19		- height: 55px;
20		- line-height:55px;
	30	+ width: 123px; height: 55px; line-height:55px;
21	31	text-align:center; font-size:2em; overflow:hidden;
22	32	color:#fff; background-color: @gnb-logo-bg-color;
23	33
24	34	span {
25		- width: 123px;
26		- height: 55px;
27		- display: block;
28		- text-indent: -250px;
29		- background-size:123px 55px;
30		- background-image: url("@{base-image-path}/logo-white.png");
	35	+ .gnb-logo;
31	36	}
32	37	}
33	38
...	...	@@ -89,38 +94,7 @@
89	94	}
90	95
91	96	.search-bar {
92		- margin: 3px 0 0 5px;
93		- padding: 0 6px;
94		- width: 146px;
95		- height: 19px;
96		- background-color: @search-bar-bg-color;
97		- border:1px solid @search-bar-border-color;
98		- .border-radius(2px);
99		- .box-shadow(inset 0px 2px 3px rgba(0,0,0,0.12));
100		-
101		- form {
102		- margin: 0;
103		- line-height: 0;
104		- }
105		- .query {
106		- border: 0 none;
107		- margin: 0; margin-right:3px;
108		- padding:4px 0px;
109		- width: 128px; height: 13px;
110		-
111		- font-size: 11px;
112		- color: @search-input-color;
113		- background-color: transparent;
114		-
115		- .box-shadow(none);
116		- }
117		- .ico-search {
118		- margin-bottom:2px;
119		- }
120		- .ico-search-14 {
121		- margin-top: -1px;
122		- margin-right: 10px;
123		- }
	97	+ padding:3px 0 0 5px;
124	98	} /.search-bar /
125	99	} // .right
126	100	}// gnb-menu
...	...	@@ -225,6 +199,8 @@
225	199	.page-title {
226	200	float:left; overflow:hidden; margin:0;
227	201	line-height:56px; color:#fff; font-weight:normal;
	202	+
	203	+ a { vertical-align:top; }
228	204	}
229	205
230	206	.gnb-menus {
...	...	@@ -233,9 +209,6 @@
233	209	.sp-line {
234	210	color:#626262 !important;
235	211	opacity:1 !important;
236		- }
237		- .search-bar {
238		- border:1px solid #2e2e2e;
239	212	}
240	213	}
241	214	}
...	...	@@ -1207,12 +1180,12 @@
1207	1180	background: #F6F6F6;
1208	1181	/box-shadow: inset 0px 1px #fff;/
1209	1182
1210		- .issue-label {
	1183	+ /*.issue-label {
1211	1184	border:none;
1212	1185	&.active {
1213	1186	box-shadow: inset 0px 2px 2px rgba(0, 0, 0, 0.25);
1214	1187	}
1215		- }
	1188	+ }*/
1216	1189
1217	1190	/.labels { background:#D7D7D7; }/
1218	1191
...	...	@@ -1488,7 +1461,7 @@
1488	1461	}
1489	1462	}
1490	1463	}
1491		-
	1464	+/*
1492	1465	.fake-file-wrap {
1493	1466	margin-top: 10px;
1494	1467	position: relative;
...	...	@@ -1508,7 +1481,7 @@
1508	1481	display:block !important;
1509	1482	}
1510	1483	}
1511		-
	1484	+*/
1512	1485	.cu-label {
1513	1486	width: 80px;
1514	1487	padding-right: 45px;
...	...	@@ -2294,7 +2267,7 @@
2294	2267	}
2295	2268	}
2296	2269	.btn-wrap {
2297		- width: 138px; /80px/
	2270	+ width: 118px; /138px; /80px*/
2298	2271	text-align: right;
2299	2272	}
2300	2273	}
...	...	@@ -3226,7 +3199,7 @@
3226	3199	color:#898989; margin-top:18px;
3227	3200	}
3228	3201	}
3229		-
	3202	+/*
3230	3203	.hive-tabs {
3231	3204	li {
3232	3205	a {
...	...	@@ -3241,6 +3214,7 @@
3241	3214	}
3242	3215	}
3243	3216	}
	3217	+*/
3244	3218	.code-tab, .plugin-tab {
3245	3219	margin: 15px 0 20px;
3246	3220	}
...	...	@@ -3256,6 +3230,7 @@
3256	3230	}
3257	3231
3258	3232	/ alertUI.scala.html /
	3233	+/*
3259	3234	.hiveDialog {
3260	3235	.border-radius(none);
3261	3236	border:10px solid #bebebe;
...	...	@@ -3279,8 +3254,9 @@
3279	3254	}
3280	3255	}
3281	3256	}
3282		-
	3257	+*/
3283	3258	/ Bootstrap /
	3259	+ /*
3284	3260	.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a {
3285	3261	background-color:#878787 !important;
3286	3262	.linear-gradient(#878787, darken(#878787, 10%));
...	...	@@ -3294,8 +3270,11 @@
3294	3270	.box-shadow(none);
3295	3271	.border-radius(2px);
3296	3272	}
	3273	+*/
3297	3274	/*
3298	3275	hr.dark-gray { border-top:1px solid #d4d4d4; }
3299	3276	*/
3300		-.alert { position:absolute; width:830px; top:0px; /top:76px;/ margin-left:auto; z-index:999; display:none; }
3301		-form { margin:0 0 2px; } (No newline at end of file)
	3277	+/*
	3278	+.alert { position:absolute; width:830px; top:0px; margin-left:auto; z-index:999; display:none; }
	3279	+form { margin:0 0 2px; }
	3280	+*/ (No newline at end of file)

...	...	@@ -33,6 +33,8 @@
33	33	@orange : #F36C22;
34	34	@blue : #5DBBE0;
35	35	@blue2 : #51AACC;
	36	+@darkgray: #878787;
	37	+
36	38	@gray-d4: #D4D4D4;
37	39	@gray-ec: #ECECEC;
38	40	@gray-f7: #F7F7F7;

...	...	@@ -8,6 +8,7 @@
8	8	import playRepository.RepositoryService;
9	9	//import views.html.code.codeNavi;
10	10	import views.html.index;
	11	+import views.html.hiveUI;
11	12
12	13	import java.io.File;
13	14	import java.util.List;
...	...	@@ -60,4 +61,7 @@
60	61	return ok(index.render(null, null));
61	62	}
62	63
	64	+ public static Result hiveUI(){
	65	+ return ok(views.html.hiveUI.render());
	66	+ }
63	67	} (No newline at end of file)

...	...	@@ -70,12 +70,15 @@
70	70	<input type="text" name="authorLoginId" class="input-medium">
71	71	</div>
72	72	</div>
	73	+
73	74	<div class="control-group">
74	75	<label class="control-label">@Messages("assignee")</label>
75	76	<div class="controls">
76	77	<div class="btn-group" data-name="assigneeId">
77		- <button data-toggle="dropdown" class="btn dropdown-toggle bgwhite d-label input-medium">@Messages("order.all")</button>
78		- <button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
	78	+ <button class="btn dropdown-toggle" data-toggle="dropdown">
	79	+ <span class="d-label">@Messages("order.all")</span>
	80	+ <span class="d-caret"><span class="caret"></span></span>
	81	+ </button>
79	82	<ul class="dropdown-menu">
80	83	<li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">@Messages("order.all")</a></li>
81	84	<li data-value="0"><a href="javascript:void(0)">@Messages("noAssignee")</a></li>
...	...	@@ -86,12 +89,15 @@
86	89	</div>
87	90	</div>
88	91	</div>
	92	+
89	93	<div class="control-group">
90	94	<label class="control-label">@Messages("milestone")</label>
91	95	<div class="controls">
92	96	<div class="btn-group" data-name="milestoneId">
93		- <button data-toggle="dropdown" class="btn dropdown-toggle bgwhite d-label input-medium">@Messages("milestone.state.all")</button>
94		- <button data-toggle="dropdown" class="btn dropdown-toggle bgwhite"><span class="caret"></span></button>
	97	+ <button class="btn dropdown-toggle" data-toggle="dropdown">
	98	+ <span class="d-label">@Messages("milestone.state.all")</span>
	99	+ <span class="d-caret"><span class="caret"></span></span>
	100	+ </button>
95	101	<ul class="dropdown-menu">
96	102	<li data-value="" data-selected="true" class="active"><a href="javascript:void(0)">@Messages("milestone.state.all")</a></li>
97	103	<li data-value="0"><a href="javascript:void(0)">@Messages("noMilestone")</a></li>

...	...	@@ -45,10 +45,11 @@
45	45	<a href="@routes.UserApp.signupForm()" class="d-link signup">@Messages("title.signup")</a>
46	46	</li>
47	47	}
48		- <li class="search-bar">
49		- <form action="@routes.ProjectApp.projects()">
50		- <input type="text" autocomplete="off" class="query" name="filter" accesskey="S" /><button type="submit" class="ico ico-search btn-transparent"></button>
51		- </form>
	48	+ <li class="search-bar">
	49	+ <form action="@routes.ProjectApp.projects()" class="form-searchbar">
	50	+ <input type="text" class="text" name="filter" autocomplete="off" accesskey="S"><!--
	51	+ --><button type="submit" class="ico ico-search"></button>
	52	+ </form>
52	53	</li>
53	54	</ul>
54	55	</div>

...	...	@@ -39,9 +39,10 @@
39	39	</li>
40	40	}
41	41	<li class="search-bar">
42		- <form action="@routes.ProjectApp.projects()">
43		- <input type="text" autocomplete="off" class="query" name="filter" /><button type="submit" class="ico ico-search btn-transparent"></button>
44		- </form>
	42	+ <form action="@routes.ProjectApp.projects()" class="form-searchbar">
	43	+ <input type="text" class="text" name="filter" autocomplete="off" accesskey="S"><!--
	44	+ --><button type="submit" class="ico ico-search"></button>
	45	+ </form>
45	46	</li>
46	47	</ul>
47	48	</div>

...	...	@@ -2,7 +2,7 @@
2	2	# This file defines all application routes (Higher priority routes first)
3	3	# ~~~~
4	4
5		-GET /navitest controllers.Application.navi()
	5	+GET /navitest controllers.Application.navi()
6	6
7	7	# Home page
8	8	GET / controllers.Application.index()
...	...	@@ -13,6 +13,7 @@
13	13
14	14	# Bootstrapping for test
15	15	GET /init controllers.Application.init()
	16	+GET /hiveUI controllers.Application.hiveUI()
16	17
17	18	# User
18	19	GET /users controllers.UserApp.users(query: String ?= "")

...	...	@@ -14,7 +14,7 @@
14	14	* 굳이 페이징 링크를 굳이 동적으로 만들어야 할까? 개선 검토 필요
15	15	*/
16	16	hive.Pagination = (function(window, document) {
17		-
	17	+
18	18	var htRegEx = {};
19	19
20	20	/**
...	...	@@ -82,7 +82,7 @@
82	82	* validateOptions
83	83	*/
84	84	function validateOptions(options) {
85		- if (!Number.isFinite(options.current)) {
	85	+ if (!$.isNumeric(options.current)) {
86	86	throw new Error("options.current is not valid: " + options.current);
87	87	}
88	88	}
...	...	@@ -105,7 +105,7 @@
105	105	var pageNumFromUrl;
106	106	var paramNameForPage = options.paramNameForPage \|\| 'pageNum';
107	107
108		- if (!Number.isFinite(options.current)) {
	108	+ if (!$.isNumeric(options.current)) {
109	109	query = getQuery(options.url);
110	110	pageNumFromUrl = parseInt(valueFromQuery(paramNameForPage, query));
111	111	options.current = pageNumFromUrl \|\| options.firstPage;

...	...	@@ -42,7 +42,7 @@
42	42	*/
43	43	function _initElement(htOptions){
44	44	htElement.welContainer = $(htOptions.elContainer);
45		- htElement.welSelectedLabel = htElement.welContainer.find("button.d-label");
	45	+ htElement.welSelectedLabel = htElement.welContainer.find(".d-label");
46	46	htElement.waItems = htElement.welContainer.find(".dropdown-menu li");
47	47	}
48	48

Delete comment