glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated files to use amazon assets

Browse source
This commit is contained in:
Connor Turland 2015-10-27 21:44:38 -07:00
parent 12c6765f8b
commit 6e79b58e16
5 changed files with 53 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -24,4 +24,6 @@ log/*.log
tmp tmp
.DS_Store .DS_Store
*/.DS_Store
.DS_Store?
.vagrant .vagrant

2
app/models/map.rb
View file

@ -12,7 +12,7 @@ class Map < ActiveRecord::Base
:thumb => ['188x126#', :png] :thumb => ['188x126#', :png]
#:full => ['940x630#', :png] #:full => ['940x630#', :png]
}, },
:default_url => ActionController::Base.helpers.asset_path('missing-map.png') :default_url => 'https://s3.amazonaws.com/metamaps-assets/site/missing-map.png'
# Validate the attached image is image/jpg, image/png, etc # Validate the attached image is image/jpg, image/png, etc
validates_attachment_content_type :screenshot, :content_type => /\Aimage\/.*\Z/ validates_attachment_content_type :screenshot, :content_type => /\Aimage\/.*\Z/

2
app/models/user.rb
View file

@ -35,7 +35,7 @@ class User < ActiveRecord::Base
:ninetysix => ['96x96#', :png], :ninetysix => ['96x96#', :png],
:onetwentyeight => ['128x128#', :png] :onetwentyeight => ['128x128#', :png]
}, },
:default_url => ActionController::Base.helpers.asset_path('user.png') :default_url => 'https://s3.amazonaws.com/metamaps-assets/site/user.png'
# Validate the attached image is image/jpg, image/png, etc # Validate the attached image is image/jpg, image/png, etc
validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/ validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/

4
public/404.html
View file

@ -26,7 +26,7 @@
} }
body { body {
background: #d8d9da url(/assets/shattered_@2X.png); background: #d8d9da url(https://s3.amazonaws.com/metamaps-assets/site/shattered_%402X.png);
font-family: 'din-regular', helvetica, sans-serif; font-family: 'din-regular', helvetica, sans-serif;
color: #424242; color: #424242;
text-align: justify; text-align: justify;
@ -61,7 +61,7 @@
border-radius: 225px; border-radius: 225px;
-webkit-border-radius: 225px; -webkit-border-radius: 225px;
-moz-border-radius: 225px; -moz-border-radius: 225px;
background: url(/assets/monkeyselfie.jpg) no-repeat; background: url(https://s3.amazonaws.com/metamaps-assets/site/monkeyselfie.jpg) no-repeat;
float: left; float: left;
background-position:50% 20%; background-position:50% 20%;
background-size: 100%; background-size: 100%;

94
test/fixtures/metacodes.yml vendored
View file

@ -6,235 +6,235 @@
# #
one: one:
name: Action name: Action
icon: /assets/icons/blueprint_96px/bp_action.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_action.png
color: #BD6C85 color: #BD6C85
two: two:
name: Activity name: Activity
icon: /assets/icons/blueprint_96px/bp_activity.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_activity.png
color: #6EBF65 color: #6EBF65
three: three:
name: Catalyst name: Catalyst
icon: /assets/icons/blueprint_96px/bp_catalyst.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_catalyst.png
color: #EF8964 color: #EF8964
four: four:
name: Closed name: Closed
icon: /assets/icons/blueprint_96px/bp_closedissue.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_closedissue.png
color: #ABB49F color: #ABB49F
five: five:
name: Process name: Process
icon: /assets/icons/blueprint_96px/bp_process.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_process.png
color: #BDB25E color: #BDB25E
six: six:
name: Future Dev name: Future Dev
icon: /assets/icons/blueprint_96px/bp_futuredev.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_futuredev.png
color: #25A17F color: #25A17F
seven: seven:
name: Group name: Group
icon: /assets/icons/blueprint_96px/bp_group.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_group.png
color: #7076BC color: #7076BC
eight: eight:
name: Implication name: Implication
icon: /assets/icons/blueprint_96px/bp_implication.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_implication.png
color: #83DECA color: #83DECA
nine: nine:
name: Insight name: Insight
icon: /assets/icons/blueprint_96px/bp_insight.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_insight.png
color: #B074AD color: #B074AD
ten: ten:
name: Intention name: Intention
icon: /assets/icons/blueprint_96px/bp_intention.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_intention.png
color: #BAEAFF color: #BAEAFF
eleven: eleven:
name: Knowledge name: Knowledge
icon: /assets/icons/blueprint_96px/bp_knowledge.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_knowledge.png
color: #60ACF7 color: #60ACF7
twelve: twelve:
name: Location name: Location
icon: /assets/icons/blueprint_96px/bp_location.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_location.png
color: #ABD9A7 color: #ABD9A7
thirteen: thirteen:
name: Need name: Need
icon: /assets/icons/blueprint_96px/bp_need.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_need.png
color: #D2A7D4 color: #D2A7D4
fourteen: fourteen:
name: Open Issue name: Open Issue
icon: /assets/icons/blueprint_96px/bp_openissue.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_openissue.png
color: #9BBF71 color: #9BBF71
fifteen: fifteen:
name: Opportunity name: Opportunity
icon: /assets/icons/blueprint_96px/bp_opportunity.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_opportunity.png
color: #889F64 color: #889F64
sixteen: sixteen:
name: Person name: Person
icon: /assets/icons/blueprint_96px/bp_person.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_person.png
color: #DE925F color: #DE925F
seventeen: seventeen:
name: Platform name: Platform
icon: /assets/icons/blueprint_96px/bp_platform.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_platform.png
color: #21C8FE color: #21C8FE
eighteen: eighteen:
name: Problem name: Problem
icon: /assets/icons/blueprint_96px/bp_problem.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_problem.png
color: #99CFC4 color: #99CFC4
nineteen: nineteen:
name: Resource name: Resource
icon: /assets/icons/blueprint_96px/bp_resource.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_resource.png
color: #C98C63 color: #C98C63
twenty: twenty:
name: Role name: Role
icon: /assets/icons/blueprint_96px/bp_role.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_role.png
color: #A8595D color: #A8595D
twenty-one: twenty-one:
name: Task name: Task
icon: /assets/icons/blueprint_96px/bp_task.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_task.png
color: #3397C4 color: #3397C4
twenty-two: twenty-two:
name: Trajectory name: Trajectory
icon: /assets/icons/blueprint_96px/bp_trajectory.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_trajectory.png
color: #D3AA4C color: #D3AA4C
twenty-three: twenty-three:
name: Argument name: Argument
icon: /assets/icons/generics_96px/gen_argument.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_argument.png
color: #7FAEFD color: #7FAEFD
twenty-four: twenty-four:
name: Con name: Con
icon: /assets/icons/generics_96px/gen_con.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_con.png
color: #CF7C74 color: #CF7C74
twenty-five: twenty-five:
name: Subject name: Subject
icon: /assets/icons/generics_96px/gen_subject.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_subject.png
color: #8293D8 color: #8293D8
twenty-six: twenty-six:
name: Decision name: Decision
icon: /assets/icons/generics_96px/gen_decision.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_decision.png
color: #CCA866 color: #CCA866
twenty-seven: twenty-seven:
name: Event name: Event
icon: /assets/icons/generics_96px/gen_event.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_event.png
color: #F5854B color: #F5854B
twenty-eight: twenty-eight:
name: Example name: Example
icon: /assets/icons/generics_96px/gen_example.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_example.png
color: #618C61 color: #618C61
twenty-nine: twenty-nine:
name: Experience name: Experience
icon: /assets/icons/generics_96px/gen_experience.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_experience.png
color: #BE995F color: #BE995F
thirty: thirty:
name: Feedback name: Feedback
icon: /assets/icons/generics_96px/gen_feedback.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_feedback.png
color: #54A19D color: #54A19D
thirty-one: thirty-one:
name: Aim name: Aim
icon: /assets/icons/generics_96px/gen_aim.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_aim.png
color: #B0B0B0 color: #B0B0B0
thirty-two: thirty-two:
name: Good Practice name: Good Practice
icon: /assets/icons/generics_96px/gen_goodpractice.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_goodpractice.png
color: #BD9E86 color: #BD9E86
thirty-three: thirty-three:
name: Idea name: Idea
icon: /assets/icons/generics_96px/gen_idea.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_idea.png
color: #C4BC5E color: #C4BC5E
thirty-four: thirty-four:
name: List name: List
icon: /assets/icons/generics_96px/gen_list.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_list.png
color: #B7A499 color: #B7A499
thirty-five: thirty-five:
name: Media name: Media
icon: /assets/icons/generics_96px/gen_media.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_media.png
color: #6D94CC color: #6D94CC
thirty-six: thirty-six:
name: Metamap name: Metamap
icon: /assets/icons/generics_96px/gen_metamap.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_metamap.png
color: #AEA9FD color: #AEA9FD
thirty-seven: thirty-seven:
name: Model name: Model
icon: /assets/icons/generics_96px/gen_model.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_model.png
color: #B385BA color: #B385BA
thirty-eight: thirty-eight:
name: Note name: Note
icon: /assets/icons/generics_96px/gen_note.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_note.png
color: #A389A1 color: #A389A1
thirty-nine: thirty-nine:
name: Perspective name: Perspective
icon: /assets/icons/generics_96px/gen_perspective.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_perspective.png
color: #2EB6CC color: #2EB6CC
forty: forty:
name: Pro name: Pro
icon: /assets/icons/generics_96px/gen_pro.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_pro.png
color: #89B879 color: #89B879
forty-one: forty-one:
name: Project name: Project
icon: /assets/icons/generics_96px/gen_project.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_project.png
color: #85A050 color: #85A050
forty-two: forty-two:
name: Question name: Question
icon: /assets/icons/generics_96px/gen_question.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_question.png
color: #5CB3B3 color: #5CB3B3
forty-three: forty-three:
name: Reference name: Reference
icon: /assets/icons/generics_96px/gen_reference.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_reference.png
color: #A7A7A7 color: #A7A7A7
forty-four: forty-four:
name: Research name: Research
icon: /assets/icons/generics_96px/gen_research.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_research.png
color: #CD8E89 color: #CD8E89
forty-five: forty-five:
name: Status update name: Status update
icon: /assets/icons/generics_96px/gen_status.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_status.png
color: #EFA7C0 color: #EFA7C0
forty-six: forty-six:
name: Tool name: Tool
icon: /assets/icons/generics_96px/gen_tool.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_tool.png
color: #828282 color: #828282
forty-seven: forty-seven:
name: Wildcard name: Wildcard
icon: /assets/icons/generics_96px/gen_wildcard.png icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_wildcard.png
color: #73C7DE color: #73C7DE