diff options
Diffstat (limited to 'mavigator-server/src/main/twirl')
3 files changed, 11 insertions, 11 deletions
diff --git a/mavigator-server/src/main/twirl/mavigator/views/app.scala.html b/mavigator-server/src/main/twirl/mavigator/views/app.scala.html index 34d1fde..34359f8 100644 --- a/mavigator-server/src/main/twirl/mavigator/views/app.scala.html +++ b/mavigator-server/src/main/twirl/mavigator/views/app.scala.html @@ -13,9 +13,9 @@ <p>The error was: "<span id="scalajs-error-message"></span>"</p> </div> -<div id="@appId"> +<div id="@appId" class="app"> <div class="loader"> - <i class="fa fa-spinner fa-spin"></i> + <i class="fa fa-cog fa-spin"></i> </div> </div> @@ -30,10 +30,12 @@ root0.removeChild(root0.firstChild); } - //run ScalaJS application + //run ScalaJS application + console.info("[@appId] Starting ScalaJS application...") @{appId}().start({ root: root0, - assetsBase: "/assets", + styleRoot: document.getElementById("app-styles"), + baseUrl: "/assets", args: {@args.map{ case (key, value) => @key: "@value", }} @@ -48,6 +50,6 @@ }); </script> -<script type="text/javascript" src="/assets/js/mavigator-dashboard-opt.js"></script> +<script type="text/javascript" src="/assets/js/mavigator-cockpit-fastopt.js"></script> } diff --git a/mavigator-server/src/main/twirl/mavigator/views/index.scala.html b/mavigator-server/src/main/twirl/mavigator/views/index.scala.html deleted file mode 100644 index 1bf892b..0000000 --- a/mavigator-server/src/main/twirl/mavigator/views/index.scala.html +++ /dev/null @@ -1,5 +0,0 @@ -@() - -@main("Index"){ -<h1>Hello world!</h1> -} diff --git a/mavigator-server/src/main/twirl/mavigator/views/main.scala.html b/mavigator-server/src/main/twirl/mavigator/views/main.scala.html index e3e83b8..1e21b1b 100644 --- a/mavigator-server/src/main/twirl/mavigator/views/main.scala.html +++ b/mavigator-server/src/main/twirl/mavigator/views/main.scala.html @@ -5,15 +5,18 @@ <html lang="en"> <head> <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> + + <!-- Become fullscreen on mobile --> <meta name="mobile-web-app-capable" content="yes"> + <title>Mavigator - @title</title> <link rel="shortcut icon" href="/assets/images/logo.svg"> <link rel="stylesheet" media="screen" href="/assets/lib/bootstrap-3.3.6-dist/css/bootstrap.min.css"> <link rel="stylesheet" media="screen" href="/assets/lib/font-awesome-4.5.0/css/font-awesome.min.css"> <link rel="stylesheet" media="screen" href="/assets/stylesheets/main.css"> + <style id="app-styles"></style> </head> <body> |