Merge branch 'feature/social' into develop

ecds · Apr 29, 2019 · b7f5c86 · b7f5c86
2 parents 7d0c63d + 25926f1
commit b7f5c86
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 79 deletions.
diff --git a/apps/iiif/serializers/manifest.py b/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))
                 }

diff --git a/apps/static/css/project.css b/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;
 }
 

diff --git a/apps/static/mirador/mirador.js b/apps/static/mirador/mirador.js
diff --git a/apps/templates/base.html b/apps/templates/base.html
@@ -13,75 +13,24 @@
     <meta property="og:image" content="https://{{ request.META.HTTP_HOST }}/media/{{ collection.thumbnail }}" />
     <meta property="og:description" content="{{ collection.summary }}" />
     <meta property="og:type" content="Collection in web database" />
-<!-- 
-    <script>
-    var link = document.createElement('meta');
-    link.setAttribute('property', 'og:url');
-    link.content = document.location;
-    document.getElementsByTagName('head')[0].appendChild(link);
-    </script>
- -->    <meta property="og:url" content="https://{{ request.META.HTTP_HOST }}/col/{{ collection.pid }}" />
+    <meta property="og:url" content="https://{{ request.META.HTTP_HOST }}/col/{{ collection.pid }}" />
     {% elif volume.label %}
     <meta property="og:title" content="{{ volume.label|safe }}" />
     <meta property="og:description" content="{{ volume.summary }}" />
     <meta property="og:type" content="Volume in web database" />
-    <!-- {% for page in volume.canvas_set.all %}{% if forloop.last %} -->
-    <meta property="og:image" id="myMeta" content="" />
-    <meta property="og:image:secure_url" id="myMeta2" content="" />
-    <meta id="myContent1" content="{{ page.IIIF_IMAGE_SERVER_BASE }}" />
-    <meta id="myContent2" content="{{ page.IIIF_IMAGE_SERVER_BASE }}" />
-<!-- 
-    <script>
-    var link = document.createElement('meta');
-    link.setAttribute('property', 'og:url');
-    link.content = window.location.href;
-    document.getElementsByTagName('head')[0].appendChild(link);
-    </script>
- -->
-<!-- 
-    <script>
-    var link = document.createElement('meta');
-    link.setAttribute('property', 'og:image');
-    thething = window.location.pathname.split('/page/');
-    linkstrip = "{{ page.social_media }}"
-    linkstrip2 = linkstrip.split('iiif/');
-    linkstrip3 = linkstrip2[0] + "iiif/" + thething[1] + "/full/full/0/default.jpg"
-    link.content = linkstrip3;
-    document.getElementsByTagName('head')[0].appendChild(link);
-    </script>
-    <script>
-    var link = document.createElement('meta');
-    link.setAttribute('property', 'og:image:secure_url');
-    thething = window.location.pathname.split('/page/');
-    linkstrip = "{{ page.social_media }}"
-    linkstrip2 = linkstrip.split('iiif/');
-    linkstrip3 = linkstrip2[0] + "iiif/" + thething[1] + "/full/full/0/default.jpg"
-    link.content = linkstrip3;
-    document.getElementsByTagName('head')[0].appendChild(link);
-    </script>
- -->
-
-    {% for col in volume.collections.all %}
-    <meta property="og:url"  id="myMeta3" content="" />
-    <meta id="myContent3" content="https://{{ request.META.HTTP_HOST }}{% url 'volume' col.pid volume.pid %}" />
-    {% endfor %}
-
-    <!-- {% endif %}{% endfor %} -->
+
+    {% for page in volume.canvas_set.all %}{% if forloop.first %}
+    <meta property="og:image" content="{{ page.social_media }}" />
+    <meta property="og:image:secure_url" content="{{ page.social_media }}" />
+    {% endif %}{% endfor %}
     {% else %}
     <meta property="og:title" content="Readux - Emory Center for Digital scholarship - Read, Annotate, Publish" />
     <meta property="og:image" content="https://{{ request.META.HTTP_HOST }}/static/images/favicons/favicon.ico" />
     <meta property="og:description" content="{{ page.tagline }}" />
     <meta property="og:type" content="website" />
-<!-- 
-    <script>
-    var link = document.createElement('meta');
-    link.setAttribute('property', 'og:url');
-    link.content = document.location;
-    document.getElementsByTagName('head')[0].appendChild(link);
-    </script>
- -->    <meta property="og:url" content="https://readux.ecds.emory.edu" />
+    <meta property="og:url" content="https://readux.ecds.emory.edu" />
     {% endif %}
-    <meta name="twitter:image:alt" content="Readux - Emory Center for Digital scholarship - Read, Annotate, Publish" />
+    <meta name="twitter:image:alt" content="Readux Logo - Emory Center for Digital scholarship - Read, Annotate, Publish" />
     <meta name="og:site_name" content="Readux - Emory Center for Digital scholarship - Read, Annotate, Publish" />
     <meta name="twitter:card" content="summary" />
     <meta name="twitter:site" content="@emorycds" />

diff --git a/apps/templates/page.html b/apps/templates/page.html
@@ -5,6 +5,7 @@
 {% endblock extra_css %}
 
 {% block content %}
+
 <h1 class='uk-text-truncate'>
   {{volume.label}}
 </h1>
@@ -51,12 +52,10 @@ <h1 class='uk-text-truncate'>
         <br />
         <b>Canvas URL:</b> <span class="link" id="myLink"></span>
         <br />
-        <b>Stable page URL:</b> <span class="link" id="mySpan"></span>
-<!-- 
-        <p id="test"></p>
-        <a class="facebook" href='http://www.facebook.com/sharer.php?s=100&p[url]=http://{{ request.META.HTTP_HOST }}{{ request.path }}&p[images][0]{{ page.IIIF_IMAGE_SERVER_BASE }}{{ page.pid }}/full/600,/0/default.jpg' target="_blank">
-        <img src="https://www.cabq.gov/culturalservices/biopark/images/share-on-facebook.png/@@images/image.png" title="Facebook" alt="Facebook" ></a>
- -->
+        <b>Stable page URL:</b> <span class="link" id="mySpan"></span><a class="link" id="mySpan"></a>
+        <br/>
+
+
         {% endfor %}
       </div>