Skip to content

Commit

Permalink
Moved topic skeletons images to app/media and added them to .gitignor…
Browse files Browse the repository at this point in the history
…e (as except rule)
  • Loading branch information
pbellon committed Aug 25, 2014
1 parent 1d597c0 commit c8c1342
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 7 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ Thumbs.db
fabfile.py
# Users media
app/media/*

# Topic Skeleton images exception rules
!app/media/topics-skeletons/body-count.jpg
!app/media/topics-skeletons/corporate-nets.jpg
!app/media/topics-skeletons/family-affairs-schema.jpg
!app/media/topics-skeletons/family-affairs.jpg
!app/media/topics-skeletons/political-influence.jpg
!app/media/topics-skeletons/supply-chain.jpg
# Binary files and database
*.db

Expand Down
12 changes: 6 additions & 6 deletions app/detective/fixtures/default_skeletons.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"model": "detective.TopicSkeleton",
"fields": {
"title": "Body Count",
"picture": "data/topics-images/body-count.jpg",
"picture": "topics-skeletons/body-count.jpg",
"schema_picture": null,
"target_plans": "['low', 'medium', 'high','enterprise']",
"ontology": null,
Expand All @@ -17,8 +17,8 @@
"fields": {
"title": "Family Affairs",
"target_plans": "['low', 'medium', 'high','enterprise']",
"picture": "data/topics-images/family-affairs.jpg",
"schema_picture": "data/topics-images/family-affairs-schema.jpg",
"picture": "topics-skeletons/family-affairs.jpg",
"schema_picture": "topics-skeletons/family-affairs-schema.jpg",
"ontology": null,
"picture_credits": "A family tree in Biarritz, France. Photo by Shakko on Wikimedia Commons, in the public domain."
}
Expand All @@ -28,7 +28,7 @@
"model": "detective.TopicSkeleton",
"fields": {
"title": "Political influence",
"picture": "data/topics-images/political-influence.jpg",
"picture": "topics-skeletons/political-influence.jpg",
"schema_picture": null,
"ontology": null,
"target_plans": "['low', 'medium', 'high','enterprise']",
Expand All @@ -40,7 +40,7 @@
"model": "detective.TopicSkeleton",
"fields": {
"title": "Supply Chain mapping",
"picture": "data/topics-images/supply-chain.jpg",
"picture": "topics-skeletons/supply-chain.jpg",
"schema_picture": null,
"ontology": null,
"target_plans": "['low', 'medium', 'high', 'enterprise' ]",
Expand All @@ -52,7 +52,7 @@
"model": "detective.TopicSkeleton",
"fields": {
"title": "Corporate Networks",
"picture": "data/topics-images/corporate-nets.jpg",
"picture": "topics-skeletons/corporate-nets.jpg",
"schema_picture": null,
"ontology": null,
"target_plans": "['low', 'medium', 'high', 'enterprise' ]",
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit c8c1342

Please sign in to comment.