Merge branch 'develop' of github.com:ecds/readux into develop

README.md

@@ -1,6 +1,12 @@
 # Readux
 
-...
+Readux is a platform developed by the Emory Center for Digital Scholarship which allows users to read, take notes on, and publish with digitized texts from libraries’ archival collections. With Readux, users are able to:
+-	browse digitized page images, 
+-	search and select the texts of these digitized books, 
+-	annotate text or illustrations in these works, and then 
+-	publish digital copies of the texts with their annotations. 
+Administrators can organize digitized books into collections, facilitating user access to digitized books available through the platform. Since its release, Readux has proved to be an innovative research and pedagogy tool for scholars and faculty at Emory University and beyond, with an array of use-cases ranging from teaching to publishing. 
+
 
 ## Motivation
 
@@ -87,4 +93,4 @@ We use the [Git-Flow](https://danielkummer.github.io/git-flow-cheatsheet/) branc
 
 ## License
 
-This software is distributed under the Apache 2.0 License.
+This software is distributed under the Apache 2.0 License.

apps/iiif/kollections/migrations/0004_auto_20190415_1613.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.2 on 2019-04-15 16:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kollections', '0003_auto_20190415_0145'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='collection',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name='collection',
+            name='upload',
+            field=models.FileField(blank=True, null=True, upload_to='uploads/'),
+        ),
+    ]

apps/iiif/kollections/models.py

@@ -6,6 +6,8 @@
 from io import BytesIO
 from django.core.files.base import ContentFile
 from PIL import Image
+from django.utils import timezone
+from ...users.models import User
 
 class Collection(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
@@ -126,14 +128,14 @@ def make_thumbnail(self):
 #         header_io.close()
 #                 
 #         return True
-    upload = models.FileField(upload_to='uploads/', null=True)
-    created_at = models.DateTimeField()
-
-    def __str__(self):
-        return self.label
-
-    def save(self, *args, **kwargs):
-        ''' On create, set create time '''
-        if not self.id:
-            self.created_at = timezone.now()
-        return super(User, self).save(*args, **kwargs)
+    #upload = models.FileField(upload_to='uploads/', null=True)
+    #created_at = models.DateTimeField()
+ #    
+#     def __str__(self):
+#         return self.label
+#     
+#     def save(self, *args, **kwargs):
+#         ''' On create, set create time '''
+#         if not self.id:
+#             self.created_at = timezone.now()
+#         return super(User, self).save(*args, **kwargs)

apps/templates/page.html

@@ -49,8 +49,9 @@ <h1 class='uk-text-truncate'>
         <br />
         <b>Stable volume URL:</b> <a href="https://{{ request.META.HTTP_HOST }}{% url 'volume' col.pid volume.pid %}" target="_blank">https://{{ request.META.HTTP_HOST }}{% url 'volume' col.pid volume.pid %}</a>
         <br />
-        <b>Stable page URL:</b> <span class="link" id="myLink"></span>
+        <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">