summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-09-10 12:29:33 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-09-10 12:29:33 +0200
commit04e4ce4137fe3ffb0ccc6dc8635db3e202517945 (patch)
tree9fdcccfc3916526662a53ce50c0f04c23fe5428e
parent78862729e6c52ac5bf919079e2a81c5f318cf522 (diff)
Adds missing navigation.js, error on MM.
-rw-r--r--src/character/www/index.html2
-rw-r--r--src/main-menu/src/ElmModule/View.elm15
-rw-r--r--src/main-menu/www/index.html2
3 files changed, 19 insertions, 0 deletions
diff --git a/src/character/www/index.html b/src/character/www/index.html
index 7954e54..65f0d02 100644
--- a/src/character/www/index.html
+++ b/src/character/www/index.html
@@ -11,6 +11,7 @@
<script src="script/main.js"></script>
<script src="../global/script/session.js"></script>
<script src="../global/script/urlparams.js"></script>
+ <script src="../global/script/navigation.js"></script>
<script>
tacticians_online.session.load();
@@ -25,6 +26,7 @@
);
tacticians_online.session.attach_to(tacticians_online.app);
+ tacticians_online.navigation.attach_to(tacticians_online.app);
</script>
</body>
</html>
diff --git a/src/main-menu/src/ElmModule/View.elm b/src/main-menu/src/ElmModule/View.elm
index 3ccb5aa..7e7d114 100644
--- a/src/main-menu/src/ElmModule/View.elm
+++ b/src/main-menu/src/ElmModule/View.elm
@@ -4,7 +4,11 @@ module ElmModule.View exposing (view)
import Html
import Html.Attributes
+-- Shared ----------------------------------------------------------------------
+import Util.Html
+
-- Main Menu -------------------------------------------------------------------
+import Struct.Error
import Struct.Event
import Struct.Model
import Struct.Player
@@ -49,6 +53,17 @@ view model =
),
(View.MapListing.get_html (Struct.Player.get_maps model.player))
]
+ ),
+ (
+ case model.error of
+ Nothing -> (Util.Html.nothing)
+ (Just err) ->
+ (Html.div
+ []
+ [
+ (Html.text (Struct.Error.to_string err))
+ ]
+ )
)
]
)
diff --git a/src/main-menu/www/index.html b/src/main-menu/www/index.html
index b6a77e9..6b87f22 100644
--- a/src/main-menu/www/index.html
+++ b/src/main-menu/www/index.html
@@ -9,6 +9,7 @@
<script src="script/main.js"></script>
<script src="../global/script/session.js"></script>
<script src="../global/script/urlparams.js"></script>
+ <script src="../global/script/navigation.js"></script>
<script>
tacticians_online.session.load();
@@ -23,6 +24,7 @@
);
tacticians_online.session.attach_to(tacticians_online.app);
+ tacticians_online.navigation.attach_to(tacticians_online.app);
</script>
</body>
</html>