Skip to content

Commit 2e8910c

Browse files
AlexJoomAlexJoom
committed
DW-668 hide blog and about
1 parent bb2920a commit 2e8910c

File tree

6 files changed

+61
-72
lines changed

6 files changed

+61
-72
lines changed

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

+30-49
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
@(user: Option[User])(implicit messages :Messages)
22

3+
@defining(play.Play.application().configuration().getString("application.ui.menu.baseurl")){ baseUrl =>
4+
35
<nav class="navbar navbar-default ">
46
<div class="container">
57
<div class="navbar-header ">
@@ -10,74 +12,50 @@
1012
<span class="icon-bar"></span>
1113
</button>
1214

13-
@if(play.Play.application().configuration().getString("application.state") == "development") {
14-
<a href="/" class="navbar-brand"> <img id="logo" alt="Brand" src="@routes.Assets.at("images/logo.png")"/></a>
15-
} else {
16-
<a href="http://democracit.org" class="navbar-brand"> <img id="logo" alt="Brand" src="http://[email protected]("images/logo.png")"/> </a>
17-
}
1815

19-
</div>
16+
<a href="@baseUrl" class="navbar-brand"> <img id="logo" alt="Brand" src="@[email protected]("images/logo.png")"/> </a>
17+
18+
19+
</div>
2020
<div id="navbar" class="navbar-collapse collapse" >
2121
<ul class="nav navbar-nav navbar-right">
22-
@if(play.Play.application().configuration().getString("application.state") == "development") {
23-
<li><a href="/"><i class="fa fa-home"></i> @messages("header.home")</a></li>
24-
} else {
25-
<li><a href="http://democracit.org"><i class="fa fa-home"></i> @messages("header.home")</a></li>
26-
}
27-
@if(play.Play.application().configuration().getString("application.state") == "development") {
28-
<li><a href="@routes.ConsultationController.displayAll()"><i class="fa fa-list"></i> @messages("header.consultations")</a></li>
29-
} else {
30-
<li><a href="http://[email protected]()"><i class="fa fa-list"></i> @messages("header.consultations")</a></li>
31-
}
32-
@if(play.Play.application().configuration().getString("application.state") == "development") {
33-
<li><a href="/evaluation"><i class="fa fa-bar-chart"></i> @messages("header.reports")</a></li>
34-
} else {
35-
<li><a href="http://democracit.org/evaluation"><i class="fa fa-bar-chart"></i> @messages("header.reports")</a></li>
36-
}
37-
<li><a href="http://about.democracit.org/blog/"><i class="fa fa-rss"></i> @messages("header.blog")</a></li>
38-
<li class="dropdown">
39-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-info-circle"></i> @messages("header.about") <span class="caret"></span></a>
40-
<ul class="dropdown-menu">
41-
<li><a href="http://about.democracit.org/h-anagki//">@messages("header.about.need")</a></li>
42-
<li><a href="http://about.democracit.org/to-ergo/">@messages("header.about.project")</a></li>
43-
<li><a href="http://about.democracit.org/h-omada/">@messages("header.about.team")</a></li>
44-
<li><a href="http://about.democracit.org/frequently-asked-questions"><i class="fa fa-question-circle"></i> @messages("header.about.faq")</a></li>
45-
</ul>
46-
</li>
4722

23+
<li><a href="@baseUrl"><i class="fa fa-home"></i> @messages("header.home")</a></li>
24+
<li><a href="@[email protected]()"><i class="fa fa-list"></i> @messages("header.consultations")</a></li>
25+
<li><a href="@baseUrl/evaluation"><i class="fa fa-bar-chart"></i> @messages("header.reports")</a></li>
4826

27+
@if(play.Play.application().configuration().getBoolean("application.ui.menu.displaycms")) {
28+
<li><a href="http://about.democracit.org/blog/"><i class="fa fa-rss"></i> @messages("header.blog")</a></li>
29+
<li class="dropdown">
30+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-info-circle"></i> @messages("header.about") <span class="caret"></span></a>
31+
<ul class="dropdown-menu">
32+
<li><a href="http://about.democracit.org/h-anagki//">@messages("header.about.need")</a></li>
33+
<li><a href="http://about.democracit.org/to-ergo/">@messages("header.about.project")</a></li>
34+
<li><a href="http://about.democracit.org/h-omada/">@messages("header.about.team")</a></li>
35+
<li><a href="http://about.democracit.org/frequently-asked-questions"><i class="fa fa-question-circle"></i> @messages("header.about.faq")</a></li>
36+
</ul>
37+
</li>
38+
}
4939

5040
@user.map { u =>
51-
<li class="dropdown">
41+
<li class="dropdown">
5242
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
5343
<img src="@u.avatarURL.getOrElse(routes.Assets.at("images/profile_default.jpg"))" class="avatar"/>
5444
<span class="caret"></span>
5545
</a>
5646
<ul class="dropdown-menu">
57-
@if(play.Play.application().configuration().getString("application.state") == "development") {
58-
<li><a href="/userProfile"><i class="fa fa-user"></i> @messages("header.profile")</a></li>
59-
<li><a href="@routes.AccountController.signOut"><i class="fa fa-sign-out"></i> @messages("header.logout")</a></li>
60-
} else {
61-
<li><a href="http://www.democracit.org/userProfile"><i class="fa fa-user"></i> @messages("header.profile")</a></li>
62-
<li><a href="http://[email protected]"><i class="fa fa-sign-out"></i> @messages("header.logout")</a></li>
63-
}
47+
<li><a href="@baseUrl/userProfile"><i class="fa fa-user"></i> @messages("header.profile")</a></li>
48+
<li><a href="@[email protected]"><i class="fa fa-sign-out"></i> @messages("header.logout")</a></li>
49+
6450
</ul>
6551
</li>
6652
}.getOrElse {
6753
@if(play.Play.application().configuration().getString("application.state") == "development") {
6854
<li class="dropdown">
6955
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-sign-in"></i> @messages("header.login") <span class="caret"></span></a>
7056
<ul class="dropdown-menu">
71-
<li id="register"><a href="@routes.SignUpController.signUpRequest"><i class="fa fa-user-plus"></i> @messages("header.signup")</a></li>
72-
<li id="login"><a href="@routes.AccountController.signIn(None)"><i class="fa fa-users"></i> @messages("header.haveaccount")</a></li>
73-
</ul>
74-
</li>
75-
} else {
76-
<li class="dropdown">
77-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-sign-in"></i> @messages("header.login") <span class="caret"></span></a>
78-
<ul class="dropdown-menu">
79-
<li id="register"><a href="http://[email protected]"><i class="fa fa-user-plus"></i> @messages("header.signup")</a></li>
80-
<li id="login"><a href="http://[email protected](None)"><i class="fa fa-users"></i> @messages("header.haveaccount")</a></li>
57+
<li id="register"><a href="@baseUrl @routes.SignUpController.signUpRequest"><i class="fa fa-user-plus"></i> @messages("header.signup")</a></li>
58+
<li id="login"><a href="@baseUrl @routes.AccountController.signIn(None)"><i class="fa fa-users"></i> @messages("header.haveaccount")</a></li>
8159
</ul>
8260
</li>
8361
}
@@ -88,3 +66,6 @@
8866
</nav>
8967

9068

69+
}
70+
71+

‎app/views/home/index.scala.html

+23-20
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,35 @@ <h2>@messages("index.header.2")</h2>
2121
</div>
2222
</div>
2323
</div>
24-
<div id="faq">
25-
<div class="carousel slide">
26-
<div class="carousel-inner">
27-
<div class="item active">
28-
<div class="carousel-caption">
29-
<a href="http://about.democracit.org/frequently-asked-questions#question-1" target="_blank">@messages("index.faq.1")</a>
24+
@if(play.Play.application().configuration().getBoolean("application.ui.menu.displaycms")) {
25+
<div id="faq">
26+
<div class="carousel slide">
27+
<div class="carousel-inner">
28+
<div class="item active">
29+
<div class="carousel-caption">
30+
<a href="http://about.democracit.org/frequently-asked-questions#question-1" target="_blank">@messages("index.faq.1")</a>
31+
</div>
3032
</div>
31-
</div>
32-
<div class="item">
33-
<div class="carousel-caption">
34-
<a href="http://about.democracit.org/frequently-asked-questions#question-2" target="_blank">@messages("index.faq.2")</a>
33+
<div class="item">
34+
<div class="carousel-caption">
35+
<a href="http://about.democracit.org/frequently-asked-questions#question-2" target="_blank">@messages("index.faq.2")</a>
36+
</div>
3537
</div>
36-
</div>
37-
<div class="item">
38-
<div class="carousel-caption">
39-
<a href="http://about.democracit.org/frequently-asked-questions#question-3" target="_blank">@messages("index.faq.3")</a>
38+
<div class="item">
39+
<div class="carousel-caption">
40+
<a href="http://about.democracit.org/frequently-asked-questions#question-3" target="_blank">@messages("index.faq.3")</a>
41+
</div>
4042
</div>
41-
</div>
42-
<div class="item">
43-
<div class="carousel-caption">
44-
<a href="http://about.democracit.org/frequently-asked-questions#question-4" target="_blank">@messages("index.faq.4")</a>
43+
<div class="item">
44+
<div class="carousel-caption">
45+
<a href="http://about.democracit.org/frequently-asked-questions#question-4" target="_blank">@messages("index.faq.4")</a>
46+
</div>
4547
</div>
4648
</div>
4749
</div>
48-
</div>
49-
</div>
50+
</div>
51+
}
52+
5053
<div id="platform-stats" class="container">
5154
<div class="row">
5255
<div class="total col-md-4">

‎build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ libraryDependencies ++= Seq(
3131
"com.typesafe.play" %% "play-mailer" % "3.0.1"
3232
)
3333

34-
lazy val root = (project in file(".")).enablePlugins(PlayScala)
34+
lazy val root = (project in file(".")).enablePlugins(PlayScala, PlayEbean)
3535

3636
scalacOptions in Test ++= Seq("-Yrangepos")
3737

‎conf/application.conf

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ application.secret="4_m<`J`9G;xn<iFEte_85ksEXBkKOtNTXmUh]9dh5CJ[Fh>UE3UyfmwN?TsR
1313
# ~~~~~
1414
application.langs=${democracit_lang}
1515

16+
application.ui.menu.displaycms= false
17+
application.ui.menu.baseurl="http://localhost:9000"
18+
19+
1620
# Global object class
1721
# ~~~~~
1822
# Define the Global object class for this application.

‎conf/routes

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ POST /consultation/finallaw/rate/:consultationId/:finallawid/:attitude/:u
6868
GET /consultation/finallaw/delete/:finallawid/:userId @controllers.ConsultationController.deleteFinalLaw(finallawid:Long, userId:java.util.UUID)
6969

7070
# Map static resources from the /public folder to the /assets URL path
71-
GET /assets/*file controllers.Assets.at(path="/public", file)
72-
GET /webjars/*file controllers.WebJarAssets.at(file)
71+
GET /assets/*file @controllers.Assets.at(path="/public", file)
72+
GET /webjars/*file @controllers.WebJarAssets.at(file)

‎project/plugins.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.2")
1313
// Use the Scalariform plugin to reformat the code
1414
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
1515

16+
addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "1.0.0")
1617

1718
// web plugins
1819

0 commit comments

Comments
 (0)