10 files changed, 16 insertions, 130 deletions
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Characters.elm b/src/battlemap/src/View/SubMenu/Characters.elm
index 2eaca27..a34cf4a 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Characters.elm
+++ b/src/battlemap/src/View/SubMenu/Characters.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Characters exposing (get_html)
+module View.SubMenu.Characters exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Dict
diff --git a/src/battlemap/src/View/SubMenu/ManualControls.elm b/src/battlemap/src/View/SubMenu/ManualControls.elm
deleted file mode 100644
index f2e900c..0000000
--- a/src/battlemap/src/View/SubMenu/ManualControls.elm
+++ /dev/null
@@ -1,45 +0,0 @@
-module View.SideBar.ManualControls exposing (get_html)
-
--- Elm -------------------------------------------------------------------------
-import Html
-import Html.Attributes
-import Html.Events
-
--- Battlemap -------------------------------------------------------------------
-import Struct.Direction
-import Struct.Event
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-direction_button : (
-      Struct.Direction.Type ->
-      String ->
-      (Html.Html Struct.Event.Type)
-   )
-direction_button dir label =
-   (Html.button
-      [
-         (Html.Events.onClick
-            (Struct.Event.DirectionRequested dir)
-         )
-      ]
-      [ (Html.text label) ]
-   )
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-get_html : (Html.Html Struct.Event.Type)
-get_html =
-   (Html.div
-      [
-         (Html.Attributes.class "battlemap-manual-controls")
-      ]
-      [
-         (direction_button Struct.Direction.Left "Left"),
-         (direction_button Struct.Direction.Down "Down"),
-         (direction_button Struct.Direction.Up "Up"),
-         (direction_button Struct.Direction.Right "Right")
-      ]
-   )
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Settings.elm b/src/battlemap/src/View/SubMenu/Settings.elm
index 3f42739..3bd64ff 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Settings.elm
+++ b/src/battlemap/src/View/SubMenu/Settings.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Settings exposing (get_html)
+module View.SubMenu.Settings exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Html
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Status.elm b/src/battlemap/src/View/SubMenu/Status.elm
index 1eb3e5e..2ff5bf4 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Status.elm
+++ b/src/battlemap/src/View/SubMenu/Status.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Status exposing (get_html)
+module View.SubMenu.Status exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Dict
@@ -17,7 +17,7 @@ import Struct.Statistics
 import Struct.Tile
 import Struct.UI
 
-import View.SideBar.TabMenu.Status.CharacterInfo
+import View.SubMenu.Status.CharacterInfo
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ get_html model =
             (Just (Struct.UI.SelectedCharacter target_char)) ->
                case (Dict.get target_char model.characters) of
                   (Just char) ->
-                     (View.SideBar.TabMenu.Status.CharacterInfo.get_html
+                     (View.SubMenu.Status.CharacterInfo.get_html
                         model
                         char
                      )
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Status/CharacterInfo.elm b/src/battlemap/src/View/SubMenu/Status/CharacterInfo.elm
index 033426a..d5eb8b7 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Status/CharacterInfo.elm
+++ b/src/battlemap/src/View/SubMenu/Status/CharacterInfo.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Status.CharacterInfo exposing (get_html)
+module View.SubMenu.Status.CharacterInfo exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Html
diff --git a/src/battlemap/src/View/SubMenu/Targets.elm b/src/battlemap/src/View/SubMenu/Targets.elm
deleted file mode 100644
index 7bb4c36..0000000
--- a/src/battlemap/src/View/SubMenu/Targets.elm
+++ /dev/null
@@ -1,69 +0,0 @@
-module View.SideBar.Targets exposing (get_html)
-
--- Elm -------------------------------------------------------------------------
-import Dict
-
-import Html
-import Html.Attributes
-
--- Battlemap -------------------------------------------------------------------
-import Struct.Character
-import Struct.Event
-import Struct.Model
-import Struct.Statistics
-
---------------------------------------------------------------------------------
--- LOCAL -----------------------------------------------------------------------
---------------------------------------------------------------------------------
-
-get_target_info_html : (
-      Struct.Model.Type ->
-      Struct.Character.Ref ->
-      (Html.Html Struct.Event.Type)
-   )
-get_target_info_html model char_ref =
-   case (Dict.get char_ref model.characters) of
-      Nothing -> (Html.text "Error: Unknown character selected.")
-      (Just char) ->
-         (Html.text
-            (
-               "Attacking "
-               ++ char.name
-               ++ " (player "
-               ++ (Struct.Character.get_player_id char)
-               ++ "): "
-               ++
-               (toString
-                  (Struct.Statistics.get_movement_points
-                     (Struct.Character.get_statistics char)
-                  )
-               )
-               ++ " movement points; "
-               ++ "???"
-               ++ " attack range. Health: "
-               ++ (toString (Struct.Character.get_current_health char))
-               ++ "/"
-               ++
-               (toString
-                  (Struct.Statistics.get_max_health
-                     (Struct.Character.get_statistics char)
-                  )
-               )
-            )
-         )
-
---------------------------------------------------------------------------------
--- EXPORTED --------------------------------------------------------------------
---------------------------------------------------------------------------------
-get_html : (
-      Struct.Model.Type ->
-      Struct.Character.Ref ->
-      (Html.Html Struct.Event.Type)
-   )
-get_html model target_ref =
-   (Html.div
-      [
-         (Html.Attributes.class "battlemap-side-bar-targets")
-      ]
-      [(get_target_info_html model target_ref)]
-   )
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Timeline.elm b/src/battlemap/src/View/SubMenu/Timeline.elm
index 1073735..eb67085 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Timeline.elm
+++ b/src/battlemap/src/View/SubMenu/Timeline.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Timeline exposing (get_html)
+module View.SubMenu.Timeline exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Array
@@ -13,9 +13,9 @@ import Struct.Event
 import Struct.TurnResult
 import Struct.Model
 
-import View.SideBar.TabMenu.Timeline.Attack
-import View.SideBar.TabMenu.Timeline.Movement
-import View.SideBar.TabMenu.Timeline.WeaponSwitch
+import View.SubMenu.Timeline.Attack
+import View.SubMenu.Timeline.Movement
+import View.SubMenu.Timeline.WeaponSwitch
 
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
@@ -28,13 +28,13 @@ get_turn_result_html : (
 get_turn_result_html model turn_result =
    case turn_result of
       (Struct.TurnResult.Moved movement) ->
-         (View.SideBar.TabMenu.Timeline.Movement.get_html model movement)
+         (View.SubMenu.Timeline.Movement.get_html model movement)
 
       (Struct.TurnResult.Attacked attack) ->
-         (View.SideBar.TabMenu.Timeline.Attack.get_html model attack)
+         (View.SubMenu.Timeline.Attack.get_html model attack)
 
       (Struct.TurnResult.SwitchedWeapon weapon_switch) ->
-         (View.SideBar.TabMenu.Timeline.WeaponSwitch.get_html
+         (View.SubMenu.Timeline.WeaponSwitch.get_html
             model
             weapon_switch
          )
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Timeline/Attack.elm b/src/battlemap/src/View/SubMenu/Timeline/Attack.elm
index 0bd59b8..6dab423 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Timeline/Attack.elm
+++ b/src/battlemap/src/View/SubMenu/Timeline/Attack.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Timeline.Attack exposing (get_html)
+module View.SubMenu.Timeline.Attack exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Dict
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Timeline/Movement.elm b/src/battlemap/src/View/SubMenu/Timeline/Movement.elm
index 4e5579a..f561d6c 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Timeline/Movement.elm
+++ b/src/battlemap/src/View/SubMenu/Timeline/Movement.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Timeline.Movement exposing (get_html)
+module View.SubMenu.Timeline.Movement exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Dict
diff --git a/src/battlemap/src/View/SubMenu/TabMenu/Timeline/WeaponSwitch.elm b/src/battlemap/src/View/SubMenu/Timeline/WeaponSwitch.elm
index b64a293..91191c4 100644
--- a/src/battlemap/src/View/SubMenu/TabMenu/Timeline/WeaponSwitch.elm
+++ b/src/battlemap/src/View/SubMenu/Timeline/WeaponSwitch.elm
@@ -1,4 +1,4 @@
-module View.SideBar.TabMenu.Timeline.WeaponSwitch exposing (get_html)
+module View.SubMenu.Timeline.WeaponSwitch exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Dict