Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
1  app/controllers/api/api_controller.rb
@@ -41,6 +41,7 @@ def event_for_art(art)
if event = art.event
hash = clean(event.attributes.dup, event_fields)
hash[:icon_thumbnail_url] = event.icon :thumbnail
+ hash[:icon_thumbnail_retina_url] = event.icon :thumbnail_retina
hash[:icon_small_url] = event.icon :small
hash
end
View
2  app/models/art.rb
@@ -31,7 +31,7 @@ class Art
field :location, :type => Array
# pointers to photos on Flickr (will be deleted soon)
- field :flickr_ids, :type => Array
+ field :flickr_ids, :type => Array, :default => []
# Address (optional, will geocode to lat/long eventually)
field :address
View
6 app/models/event.rb
@@ -16,7 +16,11 @@ class Event
field :ends_at, :type => DateTime
has_mongoid_attached_file :icon,
- :styles => {:thumbnail => "20x20", :small => "100x100"},
+ :styles => {
+ :thumbnail => "30x30",
+ :thumbnail_retina => "60x60",
+ :small => "100x100"
+ },
:path => ':rails_root/public/system/events/:attachment/:id/:style.:extension',
:url => '/system/events/:attachment/:id/:style.:extension'
View
BIN  public/images/5x5.png
Deleted file not rendered

No commit comments for this range

Something went wrong with that request. Please try again.