Adding resource category edit abilities

This commit is contained in:
2014-02-14 00:02:11 -07:00
parent 3f5a7012bd
commit 3d97e92eb7
19 changed files with 173 additions and 37 deletions

View File

@@ -12,8 +12,8 @@
<% end %>
<p>
<%= f.label :category_id %><br />
<%= select(:resource, :category_id, options_from_collection_for_select(ResourceCategory.all.sort_by(&:name), :id, :name, @resource.category_id ) ) %>
<%= f.label :resource_category_id, "Category" %><br />
<%= select(:resource, :resource_category_id, options_from_collection_for_select(ResourceCategory.all.sort_by(&:name), :id, :name, @resource.resource_category_id ) ) %>
</p>
<p>
<%= f.label :name %><br />

View File

@@ -1,27 +1,6 @@
<link href="/bootstrap/css/bootstrap-theme.min.css" type="text/css" />
<link href="/bootstrap/css/bootstrap.min.css" type="text/css" />
<script src="/bootstrap/js/bootstrap.min.js" type="text/javascript" ></script>
<style>
.thumbnail { height: 150px; position: relative; }
.thumbnail .ownership,
.thumbnail .disposed
{ position: absolute; top: 1px;
text-shadow:
-1px -1px 0 #fff,
1px -1px 0 #fff,
-1px 1px 0 #fff,
1px 1px 0 #fff;
font-weight: bold; left: 10px; }
.thumbnail .disposed { color: red; }
.thumbnail h4 { position: absolute; bottom: 1px; margin-bottom: 1px; }
</style>
<h1 class="col-sm-4">Lab Resources
<%= link_to 'Add Resource', new_resource_path, :class => "btn btn-success" if can? :create, Resource %>
<%= link_to 'Categories', resource_categories_path, :class => "btn btn-primary" if can? :read, ResourceCategory %>
</h1>
<h3 class="col-sm-2">Featured item:</h3>
@@ -30,14 +9,14 @@
<div class="row">
<% unless @resources.blank? %>
<div class="panel-group col-sm-8" id="accordion">
<% @resources.sort_by{|r| [r.category_name,r.name] }.group_by(&:category).each do |category,resources| %>
<% @resources.sort_by{|r| [r.resource_category_name,r.name] }.group_by(&:resource_category).each do |resource_category,resources| %>
<div class="panel panel-default">
<div class="panel-heading" data-toggle="collapse" data-parent="#accordion" href="#collapse_cat_<%= category.id %>">
<div class="panel-heading" data-toggle="collapse" data-parent="#accordion" href="#collapse_cat_<%= resource_category.id %>">
<h4 class="panel-title">
<%= category.name %>
<%= resource_category.name %>
</h4>
</div>
<div id="collapse_cat_<%= category.id %>" class="panel-collapse collapse">
<div id="collapse_cat_<%= resource_category.id %>" class="panel-collapse collapse">
<div class="panel-body">
<%= render resources %>
</div>

View File

@@ -12,7 +12,7 @@
<% end %>
<p>
<b>Category:</b>
<%=h @resource.category.name if !@resource.category.blank? %>
<%=h @resource.resource_category.name if @resource.resource_category %>
</p>
<p>