Merge branch 'release/1.8.1'

CHANGELOG.rst

@@ -2,6 +2,10 @@
 
 CHANGELOG
 =========
+Release 1.8.1 - Bug Fixes
+* Annotation counts do not appear in Volume list
+* Option to export personal versus group annotations is missing
+
 Release 1.8 - WebSocket 1.x Upgrade, Move to ECDS VM
 ----------------------------------------------------
 * Chore: Move Readux to New Prod server

readux/__init__.py

@@ -1,4 +1,4 @@
-__version_info__ = (1, 8, 0, None)
+__version_info__ = (1, 8, 1, None)
 
 # Dot-connect all but the last. Last is dash-connected if not None.
 __version__ = '.'.join([str(i) for i in __version_info__[:-1]])

readux/books/forms.py

@@ -71,7 +71,7 @@ class VolumeExport(forms.Form):
     annotations = forms.ChoiceField(
         label='Annotations to export',
         help_text='Individual annotations or all annotations shared with ' +
-        'a single group')
+        'a single group.')
 
     #: include page images in export, instead of referencing on readux
     include_images = forms.BooleanField(

readux/books/templates/books/volume_export.html

@@ -159,6 +159,7 @@
         var deep_zoom = $("div.form-group:has(#id_deep_zoom)");
         var deep_zoom_select = $("#id_deep_zoom")[0];
         var image_hosting = $("div.form-group:has(#id_image_hosting)");
+        var annotations = $("div.form-group:has(#id_annotations)");
         // some form options are relevant to jekyll but not TEI export
         var jekyll_only = $('.jekyll-only');
 
@@ -186,6 +187,7 @@
           github_repo.hide(transition);
           update_repo.hide(transition);
           jekyll_only.hide(transition);
+          annotations.hide(transition);
 
           // toggle UI usabilities
           toggle_deep_zoom(deep_zoom_select[0]);
@@ -194,14 +196,18 @@
           if (this.value == 'github') {
             jekyll_only.show(transition);
             github_repo.show(transition);
+            annotations.show(transition);
           } else if (this.value == 'download') {
             jekyll_only.show(transition);
+            annotations.show(transition);
           } else if (this.value == 'github_update') {
             jekyll_only.show(transition);
             update_repo.show(transition);
+            annotations.show(transition);
           } else if (this.value == 'tei') {
             // jekyll options not applicable for tei export
             jekyll_only.css("display", "none");
+            annotations.show(transition);
           }
         });
 

readux/books/views.py

@@ -169,8 +169,8 @@ def get_context_data(self):
             if context_data['paginator'].count and self.request.user.is_authenticated():
                 notes = Volume.volume_annotation_count(self.request.user)
                 domain = get_current_site(self.request).domain.rstrip('/')
-                if not domain.startswith('http'):
-                    domain = 'http://' + domain
+                if not domain.startswith('https'):
+                    domain = 'https://' + domain
                 annotated_volumes = dict([(k.replace(domain, ''), v)
                                    for k, v in notes.iteritems()])
 
@@ -355,8 +355,9 @@ def get_context_data(self, **kwargs):
             # strip out base site url for easy lookup in the template
             # (need leading / left to match item urls)
             domain = get_current_site(self.request).domain.rstrip('/')
-            if not domain.startswith('http'):
-                domain = 'http://' + domain
+            if not domain.startswith('https'):
+                domain = 'https://' + domain
+
             annotated_pages = dict([(k.replace(domain, ''), v)
                                    for k, v in notes.iteritems()])
         else: