diff --git a/app/views/equipment/_list.html.erb b/app/views/equipment/_list.html.erb index a9a96c6f..79e801c7 100644 --- a/app/views/equipment/_list.html.erb +++ b/app/views/equipment/_list.html.erb @@ -15,7 +15,7 @@ <%= simple_format link_to equipment.name, equipment_path(equipment) %> <%= simple_format equipment.equip_type %> <%= simple_format equipment.description %> - + <% if session[:user] and session[:user] == equipment.user.id %> <%= link_to t('.view', :default => t("helpers.links.view")), equipment_path(equipment), :class => 'btn' %> diff --git a/app/views/equipment/edit.html.erb b/app/views/equipment/edit.html.erb index 30b0faa8..2d1eeb3a 100644 --- a/app/views/equipment/edit.html.erb +++ b/app/views/equipment/edit.html.erb @@ -1,5 +1,7 @@ <%- model_class = @equipment.class -%>
- <%= render :partial => 'tabs' %> - <%= render :partial => 'edit_form' %> -
\ No newline at end of file + <%= render :partial => 'tabs' %> +
+ <%= render :partial => 'edit_form' %> +
+ diff --git a/app/views/equipment/index.html.erb b/app/views/equipment/index.html.erb index 78f843bd..613a750b 100644 --- a/app/views/equipment/index.html.erb +++ b/app/views/equipment/index.html.erb @@ -18,7 +18,6 @@ A legendary sword or decrepit family shield are capable of telling a story all on their own. Before including them in your literary masterpiece, you should flesh their history out and keep their stories straight.

<%= link_to 'New Equipment', equipment_create_path, :class => 'btn btn-primary' %> - <%= link_to 'New Weapon', equipment_create_type_path(:weapon), :class => 'btn' %> <%= link_to 'New Armor', equipment_create_type_path(:armor), :class => 'btn' %> diff --git a/app/views/equipment/show.html.erb b/app/views/equipment/show.html.erb index e9e62ce6..d97f59d0 100644 --- a/app/views/equipment/show.html.erb +++ b/app/views/equipment/show.html.erb @@ -2,6 +2,7 @@
<%= render :partial => 'tabs' %> +
<% end %> + +