Commit @a4381a8c8a15d0857da8a8d3276087d5f1141166

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

Jihan Kim 2013-05-07

fix topmenu style as same with navbar

@a4381a8c8a15d0857da8a8d3276087d5f1141166

c676c08

a4381a8

app/assets/stylesheets/less/_page.less

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

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


         }
     }
 }
-.d-link {
-    color:#111;
-    &:hover { color:@primary; }
-    
-    &.signin {
-        i { 
-           margin: 0; padding: 0;
-           border:1px solid #868686;
-           width:22px; height:22px; border-radius:2px;
-           margin-right:5px; .inline-block;
-           vertical-align: top;
-           
-           img { vertical-align: top; }
-        }
-    }
-    &.signin:hover {
-        .icon {
-            background-position: -150px -2px;
-        }
-    }
-    &.signup {
-        padding-right:2px;
-    }  
-}
 
 // project-setting, project-home ...
 .prj {

         background:none;
         border:none;
     }
+    
     .gnb-inner {
-        height:56px; line-height:56px;
+        height:56px; /*line-height:56px;*/
         border-top: 1px solid #6e6e6e;
         border-bottom: 1px solid #6e6e6e;
         .linear-gradient(#5c5c5c, #464646);

 
             .gnb-menus {
                 margin: 15px 10px 17px 34px;
+                
                 &.right {
+                    margin-top:9px;
+                    .dropdown-toggle { background:#fff !important; }
                     .sp-line { 
                         color:#626262 !important; 
                         opacity:1 !important; 
                     }
+                    .lnk-group {
+                        a { 
+                            color:#fff;
+                            &:hover { color:@primary; } 
+                        }
+                    }
                 }
-            }
-        }
-    }
-    
-    .d-link { 
-        color:#fff;
-        &:hover { color:@orange; } 
-    }
+            } /* gnb-menus */
+        } /* gnb-menu-wrap */
+    } /* gnb-inner */
     
     .page { padding:40px 39px 60px 39px; }
 }

         }
     }
 }
-/*
-.fake-file-wrap {
-    margin-top: 10px;
-    position: relative;
-    overflow: hidden;
-    
-    height:40px; display:block; clear:both;
-    
-    .file {
-        position: absolute; z-index:2;
-        cursor:pointer;
-        left: -15px;
-        .opacity(0);
-    }
-    
-    .ns-btn {
-        position:absolute; z-index:1;
-        display:block !important;
-    }
-}
-*/
+
 .cu-label {
     width: 80px;
     padding-right: 45px;

     ul { margin:0 !important; }
     li { line-height:40px; padding:0; .inline-block; }
 
-    .project-menu-wrap { padding:0px 0px; position:relative; height:40px; }
+    .project-menu-wrap { 
+        position:relative; height:40px; padding:0px 0px; 
+    }
+    
     .main { 
         background:#f9f9f9; text-align:center;
-        a { font-weight:bold; color:#777; padding:0 45px; position:relative; }
+        a { 
+            position:relative; padding:0 45px;
+            font-weight:bold; color:#777;
+            &:hover { color:@primary; text-decoration:underline; }
+        }
+        
         .highlight a { 
-            color:@orange !important;            
+            color:@primary !important;            
             &:after {
                 content:'';
                 position:absolute; z-index:199;
                 width:6px; height:6px; left:48%; top:22px;
                 .ico; .ico-arrow-up-gray;
-            } 
+            }
         }
     }
-    .sub  {
+    
+    .sub {
         border-top:1px solid #d4d5d7; z-index:100;
         background:#fff;
+        
         ul { 
             position:absolute; 
             &.on-home  { left:70px;  }

         a { font-weight:bold; color:#959595; padding:0 25px; font-size:11px; }
         .highlight a { color:#000 !important; }
     }
+    
     .sp-line { 
         width:1px; color:#d7d8d9; 
         padding:0; margin:0;

     &.board, &.user-setting {
         margin: 15px 0 10px;
         padding-right: 20px;
-        .filter {
-            /*
-             .opacity(70);
-            &.active {
-                .opacity(100);
-            }
-            */
-        }
     }    
 }
 

         border-left: 1px solid #ccc;
         background: #e8e8e8;
         background: -webkit-gradient(linear, left top, right top, color-stop(0%,#f5f5f5), color-stop(100%,#e9e9e9));
-    }
-    
-    /*
-    &.expandDirectory {
-        .directory-wrap {
-            width:860px;
-        }
-        .sp-wrap { display:none !important; }
-        .file-wrap { display:none !important; }
-    }
-    */
+    }    
 }
 
 .code-view-table {

         color:#898989; margin-top:18px;
     }
 }
-/*
-.hive-tabs {
-    li {
-        a { 
-            padding-left:30px; padding-right:30px;
-            background:#ececec;
-            border:1px solid #D3D3D3;
-            .box-shadow(inset 0px 1px 1px #fff);
-        }
-        &.active a {
-            font-weight:bold;
-            letter-spacing:-1pt;
-        }
-    }
-}
-*/
 .code-tab, .plugin-tab {
     margin: 15px 0 20px;
 }

     &:last-child {
         margin-right:0;
     }
-}
-
-/** alertUI.scala.html **/
-/*
-.hiveDialog {
-    .border-radius(none);
-    border:10px solid #bebebe;
-    padding:16px 20px; width:500px;
-    
-    .btn-dismiss {
-        padding:0; margin:0; width:100%; text-align: right;
-        display:block; clear:both;
-        
-        button {
-            font-size:24px; font-weight:bold; color:#898989;
-            border:none; background:transparent;
-        }
-    }
-    
-    .message {
-        .msg {
-            text-align:center;
-            font-weight:bold; font-size:18px; 
-            margin-bottom:20px; line-height:1.5em;
-        }
-    }
-}
-*/
-/** 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%));
-}
-.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-    color:#fff;
-    background-color:#878787 !important;
-    .linear-gradient(#878787, darken(#878787, 10%));    
-}
-textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
-    .box-shadow(none);
-    .border-radius(2px);
-}
-*/
-/*
-hr.dark-gray { border-top:1px solid #d4d4d4; }
-*/
-/*
-.alert { position:absolute; width:830px; top:0px; margin-left:auto; z-index:999; display:none; }
-form { margin:0 0 2px; }
-*/
+}

c676c08

a4381a8

app/views/navbar.scala.html

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

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


 						<li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
 						<li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
 						<li class="divider"></li>
-						<li><a href="@routes.UserApp.logout()" class="d-link signup">@Messages("title.logout")</a></li>
+						<li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
 					</ul>
 				</div>
 				} else {

c676c08

a4381a8

app/views/topmenu.scala.html

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

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


 				 --><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name</a>
 			</h1>
 
-			<ul class="gnb-menus right unstyled">
-            	@if(session.contains("loginId")){
-                <li class="d-link-wrap d-link-l">
-                	<a href="@routes.UserApp.userInfo(session.get("loginId"))" class="d-link signin">
-                		<i><img src="@User.findByLoginId(session.get("loginId")).avatarUrl" width="22" height="22"></i>
-                		@session.get("loginId")
-                	</a>
-                </li>
-                <li class="sp-line">|</li>
-                <li class="d-link-wrap d-link-r">
-                	<a href="@routes.UserApp.logout()" class="d-link signup">@Messages("title.logout")</a>
-                </li>
-            	} else {
-                <li class="d-link-wrap d-link-l">
-                	<a href="@routes.UserApp.loginForm()" class="d-link signin">
-                		<i><img src="@routes.Assets.at("images/default-avatar-34.png")" width="22" height="22"></i>
+			<div class="gnb-menus right">
+				@if(session.contains("loginId")){
+                <div class="usermenu btn-group">
+					<button class="btn dropdown-toggle large" data-toggle="dropdown">
+						<div class="d-label">
+							<span class="avatar-wrap smaller">
+								<img src="@User.findByLoginId(session.get("loginId")).avatarUrl" width="20" height="20">
+							</span>
+							<span class="text">@session.get("loginId")</span>
+						</div>
+						<span class="d-caret"><span class="caret"></span></span>
+					</button>
+					<ul class="dropdown-menu">
+						<li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
+						<li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
+						<li class="divider"></li>
+						<li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
+					</ul>
+				</div>
+				} else {
+				<div class="usermenu lnk-group">
+                	<a href="@routes.UserApp.loginForm()">
+                		<span class="avatar-wrap smaller">
+                			<img src="@routes.Assets.at("images/default-avatar-34.png")" width="20" height="20">
+                		</span>
                 		@Messages("title.login")
-                	</a>
-                </li>
-                <li class="sp-line">|</li>
-                <li class="d-link-wrap d-link-r">
-                	<a href="@routes.UserApp.signupForm()" class="d-link signup">@Messages("title.signup")</a>
-                </li>
-            	}
-                <li class="search-bar">
-                	<form action="@routes.ProjectApp.projects()" class="form-searchbar">
+                	</a><!-- 
+                 --><a href="@routes.UserApp.signupForm()">@Messages("title.signup")</a>
+				</div>
+				}
+			
+				<div 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>
+					 --><button type="submit" class="ico ico-search"></button>
 					</form>
-                </li>
-            </ul>
+				</div>
+			</div>
         </div>
     </div>

c676c08

a4381a8

app/views/user/info.scala.html

--- app/views/user/info.scala.html

+++ app/views/user/info.scala.html


 @import utils.TemplateHelper._
 
 @home(user.loginId, utils.MenuType.USER) {
-    @if(user != null && session != null && user.loginId == session.get("loginId")){
-		<div class="side-menu-wrap">
-		    <ul class="side-menus unstyled bg">
-		        <li class="side-menu"><a href="@routes.UserApp.editUserInfoForm()"><i class="ico ico-setting on"></i></a></li>
-		    </ul>
-		</div>
-    }
-
 
 <div class="page-wrap container">
 	<div class="page">

 				<div class="user-location info-box">
 					<p class="u-location">
 						<i class="ico ico-location"></i>@user.email
-						<!-- Seoul, Korea, South -->
 					</p>
 				</div>
 				

 				
 				<hr />
 				<div class="user-other-info info-box">
-					<!-- 
-			        <p><strong>FOCUS</strong></p>
-			        <p class="focuses">C#, JAVA, SQL, JAVASCRIPT</p>
-			         -->
 					<p class="since">
 						<strong>MEMBER SINCE</strong>
 					</p>

 			</div>
 
 			<div class="user-stream-box">
-				<!-- 
+				@**<!-- 
 				    <ul class="nav nav-tabs user-stream-tab hive-tabs">
 				        <li class="active"><a href="#">Repositories</a></li>
 				        <li><a href="#">Activities</a></li>
 				    </ul>
-     			-->
+     			-->**@
 				<div class="user-stream-wrap">
 					<div class="header-wrap" style="margin-top: 0;">
 						<div class="search-wrap user-setting">

 							<div class="header">
 								<a href="@routes.UserApp.userInfo(project.owner)">@project.owner</a> / <a href="@routes.ProjectApp.project(project.owner, project.name)" class="project-name">@project.name</a>
 								@if(!project.share_option){ <i class="ico ico-lock"></i> }
+								
+								@if(user != null && session != null && user.loginId == session.get("loginId")){
+								<!-- <a href="@routes.UserApp.leave(project.owner, project.name)" class="nbtn black small">탈퇴</a> -->
+								}
 							</div>
 							<div class="desc">@project.overview</div>
 							<p class="name-tag">

Add a comment

Open 0
Closed 0

List

...	...	@@ -150,30 +150,6 @@
150	150	}
151	151	}
152	152	}
153		-.d-link {
154		- color:#111;
155		- &:hover { color:@primary; }
156		-
157		- &.signin {
158		- i {
159		- margin: 0; padding: 0;
160		- border:1px solid #868686;
161		- width:22px; height:22px; border-radius:2px;
162		- margin-right:5px; .inline-block;
163		- vertical-align: top;
164		-
165		- img { vertical-align: top; }
166		- }
167		- }
168		- &.signin:hover {
169		- .icon {
170		- background-position: -150px -2px;
171		- }
172		- }
173		- &.signup {
174		- padding-right:2px;
175		- }
176		-}
177	153
178	154	// project-setting, project-home ...
179	155	.prj {
...	...	@@ -181,8 +157,9 @@
181	157	background:none;
182	158	border:none;
183	159	}
	160	+
184	161	.gnb-inner {
185		- height:56px; line-height:56px;
	162	+ height:56px; /line-height:56px;/
186	163	border-top: 1px solid #6e6e6e;
187	164	border-bottom: 1px solid #6e6e6e;
188	165	.linear-gradient(#5c5c5c, #464646);
...	...	@@ -214,20 +191,24 @@
214	191
215	192	.gnb-menus {
216	193	margin: 15px 10px 17px 34px;
	194	+
217	195	&.right {
	196	+ margin-top:9px;
	197	+ .dropdown-toggle { background:#fff !important; }
218	198	.sp-line {
219	199	color:#626262 !important;
220	200	opacity:1 !important;
221	201	}
	202	+ .lnk-group {
	203	+ a {
	204	+ color:#fff;
	205	+ &:hover { color:@primary; }
	206	+ }
	207	+ }
222	208	}
223		- }
224		- }
225		- }
226		-
227		- .d-link {
228		- color:#fff;
229		- &:hover { color:@orange; }
230		- }
	209	+ } /* gnb-menus */
	210	+ } /* gnb-menu-wrap */
	211	+ } /* gnb-inner */
231	212
232	213	.page { padding:40px 39px 60px 39px; }
233	214	}
...	...	@@ -1471,27 +1452,7 @@
1471	1452	}
1472	1453	}
1473	1454	}
1474		-/*
1475		-.fake-file-wrap {
1476		- margin-top: 10px;
1477		- position: relative;
1478		- overflow: hidden;
1479		-
1480		- height:40px; display:block; clear:both;
1481		-
1482		- .file {
1483		- position: absolute; z-index:2;
1484		- cursor:pointer;
1485		- left: -15px;
1486		- .opacity(0);
1487		- }
1488		-
1489		- .ns-btn {
1490		- position:absolute; z-index:1;
1491		- display:block !important;
1492		- }
1493		-}
1494		-*/
	1455	+
1495	1456	.cu-label {
1496	1457	width: 80px;
1497	1458	padding-right: 45px;
...	...	@@ -1524,23 +1485,33 @@
1524	1485	ul { margin:0 !important; }
1525	1486	li { line-height:40px; padding:0; .inline-block; }
1526	1487
1527		- .project-menu-wrap { padding:0px 0px; position:relative; height:40px; }
	1488	+ .project-menu-wrap {
	1489	+ position:relative; height:40px; padding:0px 0px;
	1490	+ }
	1491	+
1528	1492	.main {
1529	1493	background:#f9f9f9; text-align:center;
1530		- a { font-weight:bold; color:#777; padding:0 45px; position:relative; }
	1494	+ a {
	1495	+ position:relative; padding:0 45px;
	1496	+ font-weight:bold; color:#777;
	1497	+ &:hover { color:@primary; text-decoration:underline; }
	1498	+ }
	1499	+
1531	1500	.highlight a {
1532		- color:@orange !important;
	1501	+ color:@primary !important;
1533	1502	&:after {
1534	1503	content:'';
1535	1504	position:absolute; z-index:199;
1536	1505	width:6px; height:6px; left:48%; top:22px;
1537	1506	.ico; .ico-arrow-up-gray;
1538		- }
	1507	+ }
1539	1508	}
1540	1509	}
1541		- .sub {
	1510	+
	1511	+ .sub {
1542	1512	border-top:1px solid #d4d5d7; z-index:100;
1543	1513	background:#fff;
	1514	+
1544	1515	ul {
1545	1516	position:absolute;
1546	1517	&.on-home { left:70px; }
...	...	@@ -1554,6 +1525,7 @@
1554	1525	a { font-weight:bold; color:#959595; padding:0 25px; font-size:11px; }
1555	1526	.highlight a { color:#000 !important; }
1556	1527	}
	1528	+
1557	1529	.sp-line {
1558	1530	width:1px; color:#d7d8d9;
1559	1531	padding:0; margin:0;
...	...	@@ -1685,14 +1657,6 @@
1685	1657	&.board, &.user-setting {
1686	1658	margin: 15px 0 10px;
1687	1659	padding-right: 20px;
1688		- .filter {
1689		- /*
1690		- .opacity(70);
1691		- &.active {
1692		- .opacity(100);
1693		- }
1694		- */
1695		- }
1696	1660	}
1697	1661	}
1698	1662
...	...	@@ -2776,17 +2740,7 @@
2776	2740	border-left: 1px solid #ccc;
2777	2741	background: #e8e8e8;
2778	2742	background: -webkit-gradient(linear, left top, right top, color-stop(0%,#f5f5f5), color-stop(100%,#e9e9e9));
2779		- }
2780		-
2781		- /*
2782		- &.expandDirectory {
2783		- .directory-wrap {
2784		- width:860px;
2785		- }
2786		- .sp-wrap { display:none !important; }
2787		- .file-wrap { display:none !important; }
2788		- }
2789		- */
	2743	+ }
2790	2744	}
2791	2745
2792	2746	.code-view-table {
...	...	@@ -3203,22 +3157,6 @@
3203	3157	color:#898989; margin-top:18px;
3204	3158	}
3205	3159	}
3206		-/*
3207		-.hive-tabs {
3208		- li {
3209		- a {
3210		- padding-left:30px; padding-right:30px;
3211		- background:#ececec;
3212		- border:1px solid #D3D3D3;
3213		- .box-shadow(inset 0px 1px 1px #fff);
3214		- }
3215		- &.active a {
3216		- font-weight:bold;
3217		- letter-spacing:-1pt;
3218		- }
3219		- }
3220		-}
3221		-*/
3222	3160	.code-tab, .plugin-tab {
3223	3161	margin: 15px 0 20px;
3224	3162	}
...	...	@@ -3231,54 +3169,4 @@
3231	3169	&:last-child {
3232	3170	margin-right:0;
3233	3171	}
3234		-}
3235		-
3236		-/ alertUI.scala.html /
3237		-/*
3238		-.hiveDialog {
3239		- .border-radius(none);
3240		- border:10px solid #bebebe;
3241		- padding:16px 20px; width:500px;
3242		-
3243		- .btn-dismiss {
3244		- padding:0; margin:0; width:100%; text-align: right;
3245		- display:block; clear:both;
3246		-
3247		- button {
3248		- font-size:24px; font-weight:bold; color:#898989;
3249		- border:none; background:transparent;
3250		- }
3251		- }
3252		-
3253		- .message {
3254		- .msg {
3255		- text-align:center;
3256		- font-weight:bold; font-size:18px;
3257		- margin-bottom:20px; line-height:1.5em;
3258		- }
3259		- }
3260		-}
3261		-*/
3262		-/ Bootstrap /
3263		- /*
3264		-.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a {
3265		- background-color:#878787 !important;
3266		- .linear-gradient(#878787, darken(#878787, 10%));
3267		-}
3268		-.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
3269		- color:#fff;
3270		- background-color:#878787 !important;
3271		- .linear-gradient(#878787, darken(#878787, 10%));
3272		-}
3273		-textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
3274		- .box-shadow(none);
3275		- .border-radius(2px);
3276		-}
3277		-*/
3278		-/*
3279		-hr.dark-gray { border-top:1px solid #d4d4d4; }
3280		-*/
3281		-/*
3282		-.alert { position:absolute; width:830px; top:0px; margin-left:auto; z-index:999; display:none; }
3283		-form { margin:0 0 2px; }
3284		-*/
	3172	+} (No newline at end of file)

...	...	@@ -38,7 +38,7 @@
38	38	<li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
39	39	<li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
40	40	<li class="divider"></li>
41		- <li><a href="@routes.UserApp.logout()" class="d-link signup">@Messages("title.logout")</a></li>
	41	+ <li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
42	42	</ul>
43	43	</div>
44	44	} else {

...	...	@@ -14,36 +14,43 @@
14	14	--><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name</a>
15	15	</h1>
16	16
17		- <ul class="gnb-menus right unstyled">
18		- @if(session.contains("loginId")){
19		- <li class="d-link-wrap d-link-l">
20		- <a href="@routes.UserApp.userInfo(session.get("loginId"))" class="d-link signin">
21		- <i><img src="@User.findByLoginId(session.get("loginId")).avatarUrl" width="22" height="22"></i>
22		- @session.get("loginId")
23		- </a>
24		- </li>
25		- <li class="sp-line">\|</li>
26		- <li class="d-link-wrap d-link-r">
27		- <a href="@routes.UserApp.logout()" class="d-link signup">@Messages("title.logout")</a>
28		- </li>
29		- } else {
30		- <li class="d-link-wrap d-link-l">
31		- <a href="@routes.UserApp.loginForm()" class="d-link signin">
32		- <i><img src="@routes.Assets.at("images/default-avatar-34.png")" width="22" height="22"></i>
	17	+ <div class="gnb-menus right">
	18	+ @if(session.contains("loginId")){
	19	+ <div class="usermenu btn-group">
	20	+ <button class="btn dropdown-toggle large" data-toggle="dropdown">
	21	+ <div class="d-label">
	22	+ <span class="avatar-wrap smaller">
	23	+ <img src="@User.findByLoginId(session.get("loginId")).avatarUrl" width="20" height="20">
	24	+ </span>
	25	+ <span class="text">@session.get("loginId")</span>
	26	+ </div>
	27	+ <span class="d-caret"><span class="caret"></span></span>
	28	+ </button>
	29	+ <ul class="dropdown-menu">
	30	+ <li><a href="@routes.UserApp.userInfo(session.get("loginId"))">@Messages("userinfo.profile")</a></li>
	31	+ <li><a href="@routes.UserApp.editUserInfoForm()">@Messages("userinfo.accountSetting")</a></li>
	32	+ <li class="divider"></li>
	33	+ <li><a href="@routes.UserApp.logout()">@Messages("title.logout")</a></li>
	34	+ </ul>
	35	+ </div>
	36	+ } else {
	37	+ <div class="usermenu lnk-group">
	38	+ <a href="@routes.UserApp.loginForm()">
	39	+ <span class="avatar-wrap smaller">
	40	+ <img src="@routes.Assets.at("images/default-avatar-34.png")" width="20" height="20">
	41	+ </span>
33	42	@Messages("title.login")
34		- </a>
35		- </li>
36		- <li class="sp-line">\|</li>
37		- <li class="d-link-wrap d-link-r">
38		- <a href="@routes.UserApp.signupForm()" class="d-link signup">@Messages("title.signup")</a>
39		- </li>
40		- }
41		- <li class="search-bar">
42		- <form action="@routes.ProjectApp.projects()" class="form-searchbar">
	43	+ </a><!--
	44	+ --><a href="@routes.UserApp.signupForm()">@Messages("title.signup")</a>
	45	+ </div>
	46	+ }
	47	+
	48	+ <div class="search-bar">
	49	+ <form action="@routes.ProjectApp.projects()" class="form-searchbar">
43	50	<input type="text" class="text" name="filter" autocomplete="off" accesskey="S"><!--
44		- --><button type="submit" class="ico ico-search"></button>
	51	+ --><button type="submit" class="ico ico-search"></button>
45	52	</form>
46		- </li>
47		- </ul>
	53	+ </div>
	54	+ </div>
48	55	</div>
49	56	</div> (No newline at end of file)

...	...	@@ -3,14 +3,6 @@
3	3	@import utils.TemplateHelper._
4	4
5	5	@home(user.loginId, utils.MenuType.USER) {
6		- @if(user != null && session != null && user.loginId == session.get("loginId")){
7		- <div class="side-menu-wrap">
8		- <ul class="side-menus unstyled bg">
9		- <li class="side-menu"><a href="@routes.UserApp.editUserInfoForm()"><i class="ico ico-setting on"></i></a></li>
10		- </ul>
11		- </div>
12		- }
13		-
14	6
15	7	<div class="page-wrap container">
16	8	<div class="page">
...	...	@@ -29,7 +21,6 @@
29	21	<div class="user-location info-box">
30	22	<p class="u-location">
31	23	<i class="ico ico-location"></i>@user.email
32		- <!-- Seoul, Korea, South -->
33	24	</p>
34	25	</div>
35	26
...	...	@@ -47,10 +38,6 @@
47	38
48	39	<hr />
49	40	<div class="user-other-info info-box">
50		- <!--
51		- <p><strong>FOCUS</strong></p>
52		- <p class="focuses">C#, JAVA, SQL, JAVASCRIPT</p>
53		- -->
54	41	<p class="since">
55	42	<strong>MEMBER SINCE</strong>
56	43	</p>
...	...	@@ -69,12 +56,12 @@
69	56	</div>
70	57
71	58	<div class="user-stream-box">
72		- <!--
	59	+ @**<!--
73	60	<ul class="nav nav-tabs user-stream-tab hive-tabs">
74	61	<li class="active"><a href="#">Repositories</a></li>
75	62	<li><a href="#">Activities</a></li>
76	63	</ul>
77		- -->
	64	+ -->**@
78	65	<div class="user-stream-wrap">
79	66	<div class="header-wrap" style="margin-top: 0;">
80	67	<div class="search-wrap user-setting">
...	...	@@ -95,6 +82,10 @@
95	82	<div class="header">
96	83	<a href="@routes.UserApp.userInfo(project.owner)">@project.owner</a> / <a href="@routes.ProjectApp.project(project.owner, project.name)" class="project-name">@project.name</a>
97	84	@if(!project.share_option){ <i class="ico ico-lock"></i> }
	85	+
	86	+ @if(user != null && session != null && user.loginId == session.get("loginId")){
	87	+ <!-- <a href="@routes.UserApp.leave(project.owner, project.name)" class="nbtn black small">탈퇴</a> -->
	88	+ }
98	89	</div>
99	90	<div class="desc">@project.overview</div>
100	91	<p class="name-tag">

Delete comment