diff options
Diffstat (limited to 'server/app/views')
-rw-r--r-- | server/app/views/chat.scala.html | 4 | ||||
-rw-r--r-- | server/app/views/index.scala.html | 4 | ||||
-rw-r--r-- | server/app/views/main.scala.html | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/server/app/views/chat.scala.html b/server/app/views/chat.scala.html index 3a1fa30..d54025f 100644 --- a/server/app/views/chat.scala.html +++ b/server/app/views/chat.scala.html @@ -1,7 +1,7 @@ @(uid: String) -@main("Welcome to Chat") { - <main id="root"> +@main("Chatterbox " + uid) { + <main id="root" width="100%" height="100%"> Loading </main> <script src="@routes.Assets.versioned("client-fastopt.js")" type="text/javascript"></script> diff --git a/server/app/views/index.scala.html b/server/app/views/index.scala.html index 05dbc0d..9de0fdf 100644 --- a/server/app/views/index.scala.html +++ b/server/app/views/index.scala.html @@ -1,5 +1,5 @@ @() -@main("Welcome to Chat") { - +@main("Chatterbox") { + <p>Go to /chat/USERNAME to join chat as USERNAME</p> } diff --git a/server/app/views/main.scala.html b/server/app/views/main.scala.html index 0e9906e..416e157 100644 --- a/server/app/views/main.scala.html +++ b/server/app/views/main.scala.html @@ -13,6 +13,8 @@ <title>@title</title> <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("stylesheets/main.css")"> <link rel="shortcut icon" type="image/png" href="@routes.Assets.versioned("images/favicon.png")"> + <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("lib/bootstrap-3.3.7-dist/css/bootstrap.min.css")"> + <link rel="stylesheet" media="screen" href="@routes.Assets.versioned("lib/bootstrap-3.3.7-dist/css/bootstrap.min.css")"> </head> <body> @* And here's where we render the `Html` object containing @@ -20,5 +22,6 @@ @content <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script> + <script src="@routes.Assets.versioned("lib/bootstrap-3.3.7-dist/js/bootstrap.min.js")" type="text/javascript"></script> </body> </html> |