Clears up View.elm.

3 files changed, 74 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) ]
          )
       ]
    )
diff --git a/client/elm/battlemap/src/View/Controls.elm b/client/elm/battlemap/src/View/Controls.elm
new file mode 100644
index 0000000..203fcdb
--- /dev/null
+++ b/client/elm/battlemap/src/View/Controls.elm
@@ -0,0 +1,36 @@
+module View.Controls exposing (view)
+
+import Html
+import Html.Events
+
+import Battlemap.Direction
+
+import Update
+
+direction_button : Battlemap.Direction.Type -> String -> (Html.Html Update.Type)
+direction_button dir label =
+   (Html.button
+      [
+         (Html.Events.onClick
+            (Update.DirectionRequest dir)
+         )
+      ]
+      [ (Html.text label) ]
+   )
+
+end_turn_button : (Html.Html Update.Type)
+end_turn_button =
+   (Html.button
+      [ (Html.Events.onClick Update.EndTurn) ]
+      [ (Html.text "End Turn") ]
+   )
+
+view : (List (Html.Html Update.Type))
+view =
+   [
+      (direction_button Battlemap.Direction.Left "Left"),
+      (direction_button Battlemap.Direction.Down "Down"),
+      (direction_button Battlemap.Direction.Up "Up"),
+      (direction_button Battlemap.Direction.Right "Right"),
+      (end_turn_button)
+   ]
diff --git a/client/elm/battlemap/src/View/Status.elm b/client/elm/battlemap/src/View/Status.elm
new file mode 100644
index 0000000..544aa4b
--- /dev/null
+++ b/client/elm/battlemap/src/View/Status.elm
@@ -0,0 +1,30 @@
+module View.Status exposing (view)
+
+import Dict
+
+import Html
+
+import Update
+import Model
+
+view : Model.Type -> (Html.Html Update.Type)
+view model =
+   (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."
+                  )
+      )
+   )