Merge branch 'annotation-export' of https://github.com/ecds/readux in…

…to annotation-export

.gitignore

@@ -7,7 +7,7 @@ parsetab.py
 # only ignore top-level static dir, not app-level static files
 # static/
 media/
-
+!apps/static/mirador/plugins/media
 
 ### python gitignores auto-generated by github
 
@@ -142,4 +142,4 @@ assets/upload/*
 dev_*.json
 
 # Presentation Validator
-presentation-validator/
+presentation-validator/

apps/cms/models.py

@@ -47,6 +47,8 @@ class HomePage(Page):
 
     content_panels = Page.content_panels + [
 #        AutocompletePanel('featured_volume', target_model='manifests.Manifest'),
+        FieldPanel('tagline', classname="full"),
+        FieldPanel('content_display', classname="full"),
         FieldPanel('featured_collections', widget=forms.CheckboxSelectMultiple, classname="full"),
         FieldPanel('featured_collections_sort_order', classname="full"),
         FieldPanel('featured_volumes', widget=forms.CheckboxSelectMultiple, classname="full"),

apps/iiif/serializers/manifest.py

@@ -97,13 +97,22 @@ def get_dump_object(self, obj):
                 "label": "Notes",
                 "value": obj.metadata
               }],
+              "description": obj.summary,
+              "thumbnail": {
+                "@id": "%s/%s/full/600,/0/default.jpg" % (obj.canvas_set.all().first().IIIF_IMAGE_SERVER_BASE, obj.canvas_set.all().first().pid),
+                "service": {
+                "@context": "http://iiif.io/api/image/2/context.json",
+                "@id": "%s/%s" % (obj.canvas_set.all().first().IIIF_IMAGE_SERVER_BASE, obj.canvas_set.all().first().pid),
+                "profile": "http://iiif.io/api/image/2/level1.json"
+               }
+              },
+              "viewingDirection": obj.viewingDirection,
+              "viewingHint": "paged",
               "sequences": [
                 {
                   "@id": "%s/sequence/normal" % (obj.baseurl),
                   "@type": "sc:Sequence",
                   "label": "Current Page Order",
-                  "viewingDirection": obj.viewingDirection,
-                  "viewingHint": "paged",
                   "startCanvas": obj.start_canvas,
                   "canvases": json.loads(serialize('canvas', obj.canvas_set.all(), islist=True))
                 }

apps/static/css/project.css

@@ -13,9 +13,9 @@
 }
 
 #viewer {
-  width: 75%;
-  height: calc(100% - 280px);
-  position: fixed;
+  width: 78%;
+  height: calc(100% - 250px);
+  position: absolute;
   bottom: 0;
 }
 

apps/static/mirador/plugins/media/index.js

@@ -0,0 +1,7 @@
+// Exports the "media" plugin for usage with module loaders
+// Usage:
+//   CommonJS:
+//     require('tinymce/plugins/media')
+//   ES2015:
+//     import 'tinymce/plugins/media'
+require('./plugin.js');