Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

I changed the messages.properties #1

Open
sinapam wants to merge 17 commits into
base: master
Choose a base branch
from
Open

I changed the messages.properties #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b38afd2
change Hello World message to Hello Rangers
sinapam May 2, 2014
1247999
changed Header.Home
sinapam May 3, 2014
1171e8e
changed header.title
sinapam May 3, 2014
a79ee5a
changed header.title back to Hello World
sinapam May 3, 2014
23afcc8
Create README.md
sinapam May 3, 2014
876c6c7
changed text back to fix build
sinapam May 3, 2014
02f78f4
Merge remote-tracking branch 'origin/master'
sinapam May 3, 2014
782e033
changed header.title to test
sinapam May 3, 2014
cac17ee
this should fail the build
sinapam May 3, 2014
c11c7f5
try to config test to not write output to file
sinapam May 3, 2014
4606052
fix build
sinapam May 3, 2014
3127b09
added version for maven surefire
sinapam May 3, 2014
eaa4645
changed message to test CD
sinapam May 4, 2014
870c9bd
tried to rename war file
sinapam May 4, 2014
cab5a79
removed incorrect extra war
sinapam May 4, 2014
6f13105
Changed Hello Rangers to Hello World
sinapam May 5, 2014
67fbb1f
Fixed asset path
sinapam May 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
simple-ninja-web
================

Simple web application using Ninja framework
10 changes: 10 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@


<build>
<finalName>ninja-pam</finalName>
<plugins>

<plugin>
Expand Down Expand Up @@ -124,6 +125,15 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
<useFile>false</useFile>
</configuration>
</plugin>

</plugins>

<resources>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/conf/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

# This file is utf-8
header.title=Hello World!
header.home=BAM!
header.home=BAM! Bam!
hello.world=Hello World!
hello.world.json=There is also Json rendering you can check out!
10 changes: 5 additions & 5 deletions src/main/java/views/layout/defaultLayout.ftl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<script src="/assets/webjars/jquery/1.9.0/jquery.js"></script>
<script src="assets/webjars/jquery/1.9.0/jquery.js"></script>
<meta charset="utf-8">
<title>${title}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

<!-- Le styles -->
<link href="/assets/webjars/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
<link href="assets/webjars/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
<!-- Optional theme -->
<link rel="stylesheet" href="/assets/webjars/bootstrap/3.0.0/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="assets/webjars/bootstrap/3.0.0/css/bootstrap-theme.min.css">


<!-- Latest compiled and minified JavaScript -->
Expand Down Expand Up @@ -55,8 +55,8 @@

</div> <!-- /container -->

<script type="text/javascript" src="/assets/webjars/tinymce-jquery/3.4.9/jscripts/tiny_mce/tiny_mce.js" ></script>
<script src="/assets/webjars/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script type="text/javascript" src="assets/webjars/tinymce-jquery/3.4.9/jscripts/tiny_mce/tiny_mce.js" ></script>
<script src="assets/webjars/bootstrap/3.0.0/js/bootstrap.min.js"></script>
</body>
</html>
</#macro>