will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

Browse Source
This commit is contained in:
Will Bradley 2014-04-10 23:21:40 -07:00
commit 7e8c8e1bb6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/resource.rb
View File

@ -14,6 +14,7 @@ class Resource < ActiveRecord::Base
:thumb => "100x100>", :thumb => "100x100>",
:tiny => "50x50>"}, :tiny => "50x50>"},
:storage => :s3, :storage => :s3,
:s3_protocol => :https,
:s3_credentials => { :access_key_id => ENV['S3_KEY'], :s3_credentials => { :access_key_id => ENV['S3_KEY'],
:secret_access_key => ENV['S3_SECRET'] }, :secret_access_key => ENV['S3_SECRET'] },
:path => ":attachment/:id/:style.:extension", :path => ":attachment/:id/:style.:extension",

2
app/views/home/index.html.erb
View File

@ -45,6 +45,6 @@
</div> </div>
<span class="col-sm-4"> <span class="col-sm-4">
<h3>Featured item:</h3> <h3>Featured tool:</h3>
<%= render @featured_resource unless @featured_resource.blank? %> <%= render @featured_resource unless @featured_resource.blank? %>
</span> </span>