Commit @0e166e464f08657e743c13236ec398b1484d6116

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

DeokHong Kim (a.k.a insanehong) 2014-03-14

Remove duplication code and files for site layout

@0e166e464f08657e743c13236ec398b1484d6116

0e166e4

app/views/common/footer.scala.html (added)

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

...	...	@@ -0,0 +1,5 @@
	1	+<footer class="page-footer-outer">
	2	+ <div class="page-footer">
	3	+ <span class="provider">Copyright © <a href="http://navercorp.com/" target="_blank">NAVER Corp.</a> Supported by <a href="http://developer.naver.com/wiki/pages/techSupport" target="_blank" class="d2-program"><span class="d2">D2</span><span class="program"> Program</span></a></span>
	4	+ </div>
	5	+</footer>

704f0bc

0e166e4

app/views/common/navbar.scala.html (Renamed from app/views/project/navbar.scala.html)

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

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


-@(project:Project)
+@(menuType:utils.MenuType)
+
+@import utils._
+
+@isActiveMenu(m_type:MenuType) = @{
+    if(m_type == menuType){ "active" }
+}
+
 @appFeedbackUrl() = @{
     play.Configuration.root().getString("application.feedback.url")
 }
+
 <div class="unsupported">
     <div class="unsupported-inner">
         <p id="unsupported-content">

     <div class="gnb-inner">
         <a href="@routes.Application.index()" class="logo"><h1 class="blind">@utils.Config.getSiteName</h1></a>
         <ul class="gnb-nav">
-            <li>
+            <li class="@isActiveMenu(MenuType.PROJECTS)">
                 <a href="@routes.ProjectApp.projects()">@Messages("title.projectList")</a>
             </li>
-            <li>
+            <li class="@isActiveMenu(MenuType.HELP)">
                 <a href="@routes.HelpApp.help()">@Messages("title.help")</a>
             </li>
             @if(appFeedbackUrl){
-                <li>
-                    <a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
-                </li>
+            <li>
+                <a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
+            </li>
             }
         </ul>
         @common.usermenu(null)

704f0bc

0e166e4

app/views/projectLayout.scala.html

--- app/views/projectLayout.scala.html

+++ app/views/projectLayout.scala.html


 @import utils._
 
 @layout(Messages(title) + " (" + project.name + ")")("prj") {
-    @views.html.project.navbar(project)
+    @common.navbar(menuType)
+    
     @views.html.project.header(project)
 
     @content
 
-    <footer class="page-footer-outer">
-        <div class="page-footer">
-            <span class="provider">Copyright © <a href="http://navercorp.com/" target="_blank">NAVER Corp.</a> Supported by <a href="http://developer.naver.com/wiki/pages/techSupport" target="_blank" class="d2-program"><span class="d2">D2</span><span class="program"> Program</span></a></span>
-        </div>
-    </footer>
+    @common.footer()
 }

704f0bc

0e166e4

app/views/siteLayout.scala.html

--- app/views/siteLayout.scala.html

+++ app/views/siteLayout.scala.html


 
 @import utils._
 
-@isActiveMenu(m_type:MenuType) = @{
-    if(m_type == menuType){ "active" }
-}
-
-@appFeedbackUrl() = @{
-    play.Configuration.root().getString("application.feedback.url")
-}
-
 @layout(Messages(title))(""){
-    <div class="unsupported">
-        <div class="unsupported-inner">
-            <p id="unsupported-content">
-                <i class="yobicon-alert"></i>
-                @Html(Messages("error.unsupported.ie"))
-            </p>
-        </div>
-    </div>
-    <header class="gnb-outer">
-        <div class="gnb-inner">
-            <a href="@routes.Application.index()" class="logo"><h1 class="blind">@utils.Config.getSiteName</h1></a>
-            <ul class="gnb-nav">
-                <li class="@isActiveMenu(MenuType.PROJECTS)">
-                    <a href="@routes.ProjectApp.projects()">@Messages("title.projectList")</a>
-                </li>
-                <li class="@isActiveMenu(MenuType.HELP)">
-                    <a href="@routes.HelpApp.help()">@Messages("title.help")</a>
-                </li>
-                @if(appFeedbackUrl){
-                <li>
-                    <a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
-                </li>
-                }
-            </ul>
-            @common.usermenu(null)
-        </div>
-    </header>
+    @common.navbar(menuType)
 
     @if(menuType == utils.MenuType.SITE_HOME && UserApp.currentUser.isAnonymous){
         @index.partial_intro()

         @content
     }
 
-    <footer class="page-footer-outer">
-        <div class="page-footer">
-            <span class="provider">Copyright © <a href="http://navercorp.com/" target="_blank">NAVER Corp.</a> Supported by <a href="http://developer.naver.com/wiki/pages/techSupport" target="_blank" class="d2-program"><span class="d2">D2</span><span class="program"> Program</span></a></span>
-        </div>
-    </footer>
+    @common.footer()
 }

Add a comment

Open 0
Closed 0

List

...	...	@@ -1,7 +1,15 @@
1		-@(project:Project)
	1	+@(menuType:utils.MenuType)
	2	+
	3	+@import utils._
	4	+
	5	+@isActiveMenu(m_type:MenuType) = @{
	6	+ if(m_type == menuType){ "active" }
	7	+}
	8	+
2	9	@appFeedbackUrl() = @{
3	10	play.Configuration.root().getString("application.feedback.url")
4	11	}
	12	+
5	13	<div class="unsupported">
6	14	<div class="unsupported-inner">
7	15	<p id="unsupported-content">
...	...	@@ -14,16 +22,16 @@
14	22	<div class="gnb-inner">
15	23	<a href="@routes.Application.index()" class="logo"><h1 class="blind">@utils.Config.getSiteName</h1></a>
16	24	<ul class="gnb-nav">
17		- <li>
	25	+ <li class="@isActiveMenu(MenuType.PROJECTS)">
18	26	<a href="@routes.ProjectApp.projects()">@Messages("title.projectList")</a>
19	27	</li>
20		- <li>
	28	+ <li class="@isActiveMenu(MenuType.HELP)">
21	29	<a href="@routes.HelpApp.help()">@Messages("title.help")</a>
22	30	</li>
23	31	@if(appFeedbackUrl){
24		- <li>
25		- <a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
26		- </li>
	32	+ <li>
	33	+ <a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
	34	+ </li>
27	35	}
28	36	</ul>
29	37	@common.usermenu(null)

...	...	@@ -3,14 +3,11 @@
3	3	@import utils._
4	4
5	5	@layout(Messages(title) + " (" + project.name + ")")("prj") {
6		- @views.html.project.navbar(project)
	6	+ @common.navbar(menuType)
	7	+
7	8	@views.html.project.header(project)
8	9
9	10	@content
10	11
11		- <footer class="page-footer-outer">
12		- <div class="page-footer">
13		- <span class="provider">Copyright © <a href="http://navercorp.com/" target="_blank">NAVER Corp.</a> Supported by <a href="http://developer.naver.com/wiki/pages/techSupport" target="_blank" class="d2-program"><span class="d2">D2</span><span class="program"> Program</span></a></span>
14		- </div>
15		- </footer>
	12	+ @common.footer()
16	13	}

...	...	@@ -2,42 +2,8 @@
2	2
3	3	@import utils._
4	4
5		-@isActiveMenu(m_type:MenuType) = @{
6		- if(m_type == menuType){ "active" }
7		-}
8		-
9		-@appFeedbackUrl() = @{
10		- play.Configuration.root().getString("application.feedback.url")
11		-}
12		-
13	5	@layout(Messages(title))(""){
14		- <div class="unsupported">
15		- <div class="unsupported-inner">
16		- <p id="unsupported-content">
17		- <i class="yobicon-alert"></i>
18		- @Html(Messages("error.unsupported.ie"))
19		- </p>
20		- </div>
21		- </div>
22		- <header class="gnb-outer">
23		- <div class="gnb-inner">
24		- <a href="@routes.Application.index()" class="logo"><h1 class="blind">@utils.Config.getSiteName</h1></a>
25		- <ul class="gnb-nav">
26		- <li class="@isActiveMenu(MenuType.PROJECTS)">
27		- <a href="@routes.ProjectApp.projects()">@Messages("title.projectList")</a>
28		- </li>
29		- <li class="@isActiveMenu(MenuType.HELP)">
30		- <a href="@routes.HelpApp.help()">@Messages("title.help")</a>
31		- </li>
32		- @if(appFeedbackUrl){
33		- <li>
34		- <a href="@appFeedbackUrl" target="_blank">@Messages("title.yobi.feedback")</a>
35		- </li>
36		- }
37		- </ul>
38		- @common.usermenu(null)
39		- </div>
40		- </header>
	6	+ @common.navbar(menuType)
41	7
42	8	@if(menuType == utils.MenuType.SITE_HOME && UserApp.currentUser.isAnonymous){
43	9	@index.partial_intro()
...	...	@@ -45,9 +11,5 @@
45	11	@content
46	12	}
47	13
48		- <footer class="page-footer-outer">
49		- <div class="page-footer">
50		- <span class="provider">Copyright © <a href="http://navercorp.com/" target="_blank">NAVER Corp.</a> Supported by <a href="http://developer.naver.com/wiki/pages/techSupport" target="_blank" class="d2-program"><span class="d2">D2</span><span class="program"> Program</span></a></span>
51		- </div>
52		- </footer>
	14	+ @common.footer()
53	15	}

Delete comment