diff options
Diffstat (limited to 'app/views/machines')
-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 |
4 files changed, 4 insertions, 24 deletions
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 %> |