Skip to content

Commit

Permalink
fixed some missing dependencies required to get the dummy app working
Browse files Browse the repository at this point in the history
  • Loading branch information
drobin03 committed Apr 23, 2015
1 parent dff3186 commit 9d622fa
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
18 changes: 9 additions & 9 deletions app/views/smithy/assets/_asset.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="col-xs-6 col-md-3">
<div class="thumbnail clearfix">
<tr>
<td class="thumbnail">
<%= link_to asset.file.remote_url do %>
<% if asset.file_type == :image %>
<%= image_tag asset.file.thumb("340x226#").url, width: 170, height: 114, alt: '' %>
Expand All @@ -9,10 +9,10 @@
<div style="width:170px;height:78px;padding-top:36px;text-align:center;"><%= image_tag file_type_icon(asset), alt: '' %></div>
<% end %>
<% end %>
<p class="name"><strong><%= asset.name %></strong></p>
<div class="pull-right">
<%= link_to "Edit", [:edit, asset], class: "btn btn-primary btn-xs" %>
<%= link_to "Delete", asset, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: "Are you sure?" } %>
</div>
</div>
</div>
</td>
<tdclass="name"><strong><%= asset.name %></strong></td>
<td class="actions">
<%= link_to "Edit", [:edit, asset], class: "btn btn-primary btn-xs" %>
<%= link_to "Delete", asset, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: "Are you sure?" } %>
</td>
</tr>
4 changes: 3 additions & 1 deletion app/views/smithy/assets/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
<p>If you are using Firefox, Safari or Chrome, you can just drag and drop some files onto this page</p>
</div>

<%= paginate @assets %>
<table id="assets">
<%= paginate @assets %>
</table>

<div class="thumbnails row" id="asset-thumbnails">
<%= render @assets %>
Expand Down
2 changes: 2 additions & 0 deletions smithycms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Gem::Specification.new do |s|
s.add_dependency 'autoprefixer-rails' # for bootstrap-sass
s.add_dependency 'awesome_nested_set', '~> 3.0.1'
s.add_dependency 'bootstrap-sass', '~> 3.2.0'
s.add_dependency 'coffee-script'
s.add_dependency 'dragonfly', '~> 1.0.7'
s.add_dependency 'dragonfly-s3_data_store', '~> 1.0.4'
s.add_dependency 'font-awesome-sass', '~> 4.2'
Expand All @@ -45,6 +46,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'capybara'
s.add_development_dependency 'coveralls'
s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'dotenv-rails'
s.add_development_dependency 'factory_girl_rails'
s.add_development_dependency 'fakeweb'
s.add_development_dependency 'ffaker'
Expand Down

0 comments on commit 9d622fa

Please sign in to comment.