Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

- Updated readme for howto on the vidli_config.yml

- Added new vidli_config.yml example
  • Loading branch information...
commit f4f37eddae83e58516c0bf119585ce00b18ada44 1 parent 22107ef
nshbrown nshbrown authored
4 README
View
@@ -15,5 +15,5 @@
5. Signup at PayPal for a developer account
http://developer.paypal.com
-5. Configure ActiveMerchant for payments
- cp config/active_merchant.yml.example config/active_merchant.yml
+5. Setup your Vidli app config and ActiveMerchant for PayPal payments
+ cp config/vidli_config.yml.example config/vidli_config.yml
4 app/views/admin/videos/show.html.erb
View
@@ -2,10 +2,12 @@
<%= redcloth @video.description %>
+<% if @video.screenshot.exists? -%>
<b>Screenshot:</b>
<p>
- <%= image_tag @video.screenshot.url(:thumb) if @video.screenshot.exists? %>
+ <%= image_tag @video.screenshot.url(:thumb) %>
</p>
+<% end -%>
<% if @video.s3_path %>
<p>
21 config/vidli_config.yml.example
View
@@ -0,0 +1,21 @@
+base: &base
+ site_name: Vidli, The Official Video Licensor
+ email_support: support@vidli.com
+ s3_expires_in: 600
+ paypal:
+ login:
+ password:
+ signature:
+
+development: &development
+ <<: *base
+
+test: &test
+ <<: *base
+
+production: &production
+ <<: *base
+ paypal:
+ login:
+ password:
+ signature:
Please sign in to comment.
Something went wrong with that request. Please try again.