diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-29 19:29:48 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-26 15:53:31 +0100 |
| commit | c978532f9ac828a812acb6fbb12da978eb55dc28 (patch) | |
| tree | 5947d874f1e7e6c0b311075c23a49338e48bb851 /chimere/fixtures/initial_data.json | |
| parent | 8a4293f93328ad4aca63a9019f68b41e004fbf18 (diff) | |
| download | Chimère-c978532f9ac828a812acb6fbb12da978eb55dc28.tar.bz2 Chimère-c978532f9ac828a812acb6fbb12da978eb55dc28.zip | |
Manage auto-detection of multimedia type by extension - improvement on alternate multimedia widget
Conflicts:
chimere/admin.py
chimere/forms.py
chimere/models.py
chimere/templates/chimere/blocks/alternate_multimedia.html
chimere/templatetags/chimere_tags.py
Diffstat (limited to 'chimere/fixtures/initial_data.json')
| -rw-r--r-- | chimere/fixtures/initial_data.json | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/chimere/fixtures/initial_data.json b/chimere/fixtures/initial_data.json index 248349d..883e499 100644 --- a/chimere/fixtures/initial_data.json +++ b/chimere/fixtures/initial_data.json @@ -165,6 +165,97 @@ } }, { + "pk": 16, + "model": "chimere.multimediatype", + "fields": { + "available": false, + "media_type": "O", + "iframe": false, + "name": "auto", + "mime_type": "" + } + }, + { + "pk": 1, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 7, + "name": "mkv" + } + }, + { + "pk": 3, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 2, + "name": "mp3" + } + }, + { + "pk": 4, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 3, + "name": "ogg" + } + }, + { + "pk": 5, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 5, + "name": "mp4" + } + }, + { + "pk": 6, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 4, + "name": "mpg" + } + }, + { + "pk": 7, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 4, + "name": "mpeg" + } + }, + { + "pk": 8, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 8, + "name": "avi" + } + }, + { + "pk": 9, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 6, + "name": "ogm" + } + }, + { + "pk": 10, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 6, + "name": "ogv" + } + }, + { + "pk": 11, + "model": "chimere.multimediaextension", + "fields": { + "multimedia_type": 13, + "name": "webm" + } + } + { "pk": 1, "model": "chimere.layer", "fields": { |