Skip to content

Commit

Permalink
added new surfer: kyuss king
Browse files Browse the repository at this point in the history
  • Loading branch information
evashek committed Oct 9, 2013
1 parent 0d0a379 commit 3e8a312
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 0 deletions.
11 changes: 11 additions & 0 deletions app/controllers/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import views.html.Ivarra;
import views.html.kalanid;
import views.html.John;
import views.html.kyuss;


/**
* Implements the controllers for this application.
Expand Down Expand Up @@ -76,4 +78,13 @@ public static Result john() {
return ok(John.render("Welcome to Page1."));

}

/**
* Returns Kyuss' bio page.
* @return The Kyuss page.
*/
public static Result kyuss() {
return ok(kyuss.render("Welcome to Page1."));

}
}
8 changes: 8 additions & 0 deletions app/views/Index.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<li data-target="#carousel-example-generic" data-slide-to="2"></li>
<li data-target="#carousel-example-generic" data-slide-to="3"></li>
<li data-target="#carousel-example-generic" data-slide-to="4"></li>
<li data-target="#carousel-example-generic" data-slide-to="5"></li>
</ol>

<!-- Wrapper for slides -->
Expand Down Expand Up @@ -50,6 +51,13 @@ <h3>John Mel</h3>
</div>
</div>

<div class="item">
<div class="kyuss-image"></div>
<div class="carousel-caption">
<h3>Kyuss King</h3>
</div>
</div>

</div>


Expand Down
1 change: 1 addition & 0 deletions app/views/Main.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
<ul class="dropdown-menu" role="menu">
<li><a href="@routes.Application.ivarra()">Elliot Ivarra</a></li>
<li><a href="@routes.Application.john()">John Mel</a></li>
<li><a href="@routes.Application.kyuss()">Kyuss King</a></li>
</ul>
</li>
</ul>
Expand Down
23 changes: 23 additions & 0 deletions app/views/kyuss.scala.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@(message: String)

@Main("Kyuss King") {
<div class="container">
<div class="row">
<div class="col-md-4">
<div class="well">
<div class="kyuss-image"></div>
</div>
</div>
<div class="col-md-8">
<div class="well">
<h1>Kyuss King</h1>
<p>Kyuss King born and lives in Byron Bay NSW Australia with his younger brother Rasmus, dad Kingie and mum Eva.
Kyuss lives in a farm house on the country side of Byron Bay.</p><br>
<p>Kyuss King was named after the legendary Rock Band “Kyuss� An underground desert rock group originating from Palm Desert California and the pioneers of the “Stoner Rock� genera. The Kyuss music was played on high rotation during
Kingie’s youth growing up in Avalon and continues today in the Kings lives. When Kingies first son came along in 2000,
Kyuss King was born.</p>
</div>
</div>
</div>
</div>
}
1 change: 1 addition & 0 deletions conf/routes
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ GET /brooke controllers.Application.brooke()
GET /ivarra controllers.Application.ivarra()
GET /kalanid controllers.Application.kalanid()
GET /john controllers.Application.john()
GET /kyuss controllers.Application.kyuss()

# Map static resources from the /public folder to the /assets URL path
GET /assets/*file controllers.Assets.at(path="/public", file)
Binary file added public/images/kyuss.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/stylesheets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,11 @@ body {
background-size: cover;
background-position: center;
height: 500px;
}

.kyuss-image {
background: url('../images/kyuss.jpg');
background-size: cover;
background-position: center;
height: 500px;
}

0 comments on commit 3e8a312

Please sign in to comment.