diff options
| author | Ben Harris <ben@tilde.team> | 2022-01-15 12:32:36 -0500 |
|---|---|---|
| committer | Ben Harris <ben@tilde.team> | 2022-01-15 12:32:36 -0500 |
| commit | 1d9a622303d7ef6c2f1db99d759554c268767cc4 (patch) | |
| tree | fa6cdede34fb43efe104ea531bb4c53e04f364e9 /app/views | |
| parent | 2c8c227493509175fcdbcba3e6a85f8b954a169e (diff) | |
remove edit.html.erb
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/application.html.erb | 5 | ||||
| -rw-r--r-- | app/views/machines/_machine.html.erb | 10 | ||||
| -rw-r--r-- | app/views/machines/edit.html.erb | 10 | ||||
| -rw-r--r-- | app/views/machines/index.html.erb | 5 | ||||
| -rw-r--r-- | app/views/machines/show.html.erb | 3 | ||||
| -rw-r--r-- | app/views/players/_player.html.erb | 15 | ||||
| -rw-r--r-- | app/views/players/edit.html.erb | 10 | ||||
| -rw-r--r-- | app/views/players/index.html.erb | 3 | ||||
| -rw-r--r-- | app/views/players/show.html.erb | 3 |
9 files changed, 12 insertions, 52 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 665f897..a21e612 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,6 +11,11 @@ </head> <body> + <nav> + <%= link_to "Pins", machines_url %> + <%= link_to "Players", players_url %> + </nav> + <%= yield %> </body> </html> diff --git a/app/views/machines/_machine.html.erb b/app/views/machines/_machine.html.erb index edba53e..c506363 100644 --- a/app/views/machines/_machine.html.erb +++ b/app/views/machines/_machine.html.erb @@ -1,12 +1,6 @@ <div id="<%= dom_id machine %>"> <p> - <strong>Name:</strong> - <%= machine.name %> + <%= link_to machine.name, machine %> + <small><%= machine.edition %></small> </p> - - <p> - <strong>Edition:</strong> - <%= machine.edition %> - </p> - </div> diff --git a/app/views/machines/edit.html.erb b/app/views/machines/edit.html.erb deleted file mode 100644 index a390477..0000000 --- a/app/views/machines/edit.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<h1>Editing machine</h1> - -<%= render "form", machine: @machine %> - -<br> - -<div> - <%= link_to "Show this machine", @machine %> | - <%= link_to "Back to machines", machines_path %> -</div> diff --git a/app/views/machines/index.html.erb b/app/views/machines/index.html.erb index b5e2c85..2c99524 100644 --- a/app/views/machines/index.html.erb +++ b/app/views/machines/index.html.erb @@ -1,13 +1,10 @@ <p style="color: green"><%= notice %></p> -<h1>Machines</h1> +<h1>Pins</h1> <div id="machines"> <% @machines.each do |machine| %> <%= render machine %> - <p> - <%= link_to "Show this machine", machine %> - </p> <% end %> </div> diff --git a/app/views/machines/show.html.erb b/app/views/machines/show.html.erb index 1af79f9..7870783 100644 --- a/app/views/machines/show.html.erb +++ b/app/views/machines/show.html.erb @@ -1,9 +1,8 @@ <p style="color: green"><%= notice %></p> -<%= render @machine %> +<%= render "form", machine: @machine %> <div> - <%= link_to "Edit this machine", edit_machine_path(@machine) %> | <%= link_to "Back to machines", machines_path %> <%= button_to "Destroy this machine", @machine, method: :delete %> diff --git a/app/views/players/_player.html.erb b/app/views/players/_player.html.erb index 35e7cb1..4d1abeb 100644 --- a/app/views/players/_player.html.erb +++ b/app/views/players/_player.html.erb @@ -1,17 +1,6 @@ <div id="<%= dom_id player %>"> <p> - <strong>Name:</strong> - <%= player.name %> + <% if player.paid %>✓<% else %> <% end %> + <%= link_to player.name, player %> </p> - - <p> - <strong>Paid:</strong> - <%= player.paid %> - </p> - - <p> - <strong>Strikes:</strong> - <%= player.strikes %> - </p> - </div> diff --git a/app/views/players/edit.html.erb b/app/views/players/edit.html.erb deleted file mode 100644 index a6cea2b..0000000 --- a/app/views/players/edit.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<h1>Editing player</h1> - -<%= render "form", player: @player %> - -<br> - -<div> - <%= link_to "Show this player", @player %> | - <%= link_to "Back to players", players_path %> -</div> diff --git a/app/views/players/index.html.erb b/app/views/players/index.html.erb index eac7710..5a2b9ef 100644 --- a/app/views/players/index.html.erb +++ b/app/views/players/index.html.erb @@ -5,9 +5,6 @@ <div id="players"> <% @players.each do |player| %> <%= render player %> - <p> - <%= link_to "Show this player", player %> - </p> <% end %> </div> diff --git a/app/views/players/show.html.erb b/app/views/players/show.html.erb index 19ade1d..42dce9c 100644 --- a/app/views/players/show.html.erb +++ b/app/views/players/show.html.erb @@ -1,9 +1,8 @@ <p style="color: green"><%= notice %></p> -<%= render @player %> +<%= render "form", player: @player %> <div> - <%= link_to "Edit this player", edit_player_path(@player) %> | <%= link_to "Back to players", players_path %> <%= button_to "Destroy this player", @player, method: :delete %> |