Clears up View.elm.

1 files changed, 8 insertions, 61 deletions

diff --git a/client/elm/battlemap/src/View.elm b/client/elm/battlemap/src/View.elm
index 168223a..ce869cd 100644
--- a/client/elm/battlemap/src/View.elm
+++ b/client/elm/battlemap/src/View.elm
@@ -1,13 +1,12 @@
 module View exposing (view)
 
-import Dict
-
 import Html
-import Html.Events
 
-import Battlemap.Direction
 import Battlemap.Html
 
+import View.Controls
+import View.Status
+
 import Update
 import Model
 
@@ -16,69 +15,17 @@ view model =
    (Html.div
       []
       [
-         (Html.button
-            [
-               (Html.Events.onClick
-                  (Update.DirectionRequest Battlemap.Direction.Left)
-               )
-            ]
-            [ (Html.text "Left") ]
-         ),
-         (Html.button
-            [
-               (Html.Events.onClick
-                  (Update.DirectionRequest Battlemap.Direction.Down)
-               )
-            ]
-            [ (Html.text "Down") ]
-         ),
-         (Html.button
-            [
-               (Html.Events.onClick
-                  (Update.DirectionRequest Battlemap.Direction.Up)
-               )
-            ]
-            [ (Html.text "Up") ]
-         ),
-         (Html.button
-            [
-               (Html.Events.onClick
-                  (Update.DirectionRequest Battlemap.Direction.Right)
-               )
-            ]
-            [ (Html.text "Right") ]
-         ),
-         (Html.button
-            [ (Html.Events.onClick Update.EndTurn) ]
-            [ (Html.text "Apply") ]
+         (Html.div
+            []
+            (View.Controls.view)
          ),
          (Html.div
             []
-            [(Battlemap.Html.view model.battlemap)]
+            [ (Battlemap.Html.view model.battlemap) ]
          ),
          (Html.div
             []
-            [
-               (Html.text
-                  (case (model.selection, model.navigator) of
-                     (Nothing, _) -> ""
-                     (_, Nothing) -> ""
-                     ((Just char_id), (Just nav)) ->
-                        case (Dict.get char_id model.characters) of
-                           Nothing -> ""
-                           (Just char) ->
-                              (
-                                 "Controlling "
-                                 ++ char.name
-                                 ++ ": "
-                                 ++ (toString nav.remaining_points)
-                                 ++ "/"
-                                 ++ (toString char.movement_points)
-                                 ++ " movement points remaining."
-                              )
-                  )
-               )
-            ]
+            [ (View.Status.view model) ]
          )
       ]
    )