diff --git a/app/controllers/UnsecuredApplication.java b/app/controllers/UnsecuredApplication.java new file mode 100644 index 0000000..14452bd --- /dev/null +++ b/app/controllers/UnsecuredApplication.java @@ -0,0 +1,58 @@ +package controllers; + +import play.Configuration; +import play.Play; +import play.db.jpa.Transactional; +import play.mvc.Result; +import play.mvc.Controller; + + +public class UnsecuredApplication extends Controller { + + private static String INFO = null; + + public static String info() { + init(); + return INFO; + } + + private static void init(){ + if (INFO == null){ + final Configuration cfg = Play.application().configuration(); + String version = "Version: " + cfg.getString("app.version"); + String dbName = "Database: " + cfg.getString("db.default.url"); + INFO = "Copyright 2014-2016 - University of Pittsburgh, " + + version + ", " + dbName; + } + } + + + public Result about() { + return ok(views.html.about.render("about", info())); + } + + @Transactional + public Result index() { + return ok(views.html.search.render("location search", info())); + } + + @Transactional + public Result concept() { + return ok(views.html.concept.render("location services", info())); + } + + @Transactional + public Result browser() { + return ok(views.html.browser.render("location browser", info())); + } + + @Transactional + public Result resolver() { + return ok(views.html.resolver.render("location resolver", info())); + } + + @Transactional + public Result create() { + return ok(views.html.create.render("location creator", info())); + } +} diff --git a/app/views/about.scala.html b/app/views/about.scala.html new file mode 100644 index 0000000..e18271a --- /dev/null +++ b/app/views/about.scala.html @@ -0,0 +1,11 @@ +@(message: String, version:String) + +@imports = { + + + +} + +@main(message, imports, version) { + +} diff --git a/conf/routes b/conf/routes index efbd0aa..f97285f 100644 --- a/conf/routes +++ b/conf/routes @@ -9,6 +9,7 @@ GET /logout security.auth0.Auth0Controller GET /callback security.auth0.Auth0Controller.callback(code) # Deprecated +GET /about controllers.UnsecuredApplication.about() GET /concept controllers.Application.concept() GET /read-only controllers.Application.browser() GET /browser controllers.Application.browser() diff --git a/public/stylesheets/about.css b/public/stylesheets/about.css new file mode 100644 index 0000000..e69de29 diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 737a330..682d38b 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -1,3 +1,28 @@ +@media only screen and (min-height: 1024px) { + .full-height { + height: 800px; + } +} + +@media only screen and (max-height: 944px) { + .full-height { + height: 700px; + } +} + +@media only screen and (max-height: 700px) { + .full-height { + height: 400px; + } +} + +@media only screen and (max-height: 412px) { + .full-height { + height: 200px; + } +} + + body { background-color: rgb(237, 238, 247); } @@ -29,6 +54,10 @@ legend { text-indent: 5px; } +.full-width { + width: 100%; +} + .azure { background-color: #F0FFFF; }