[#144] Merges 1.15

myhpom · Apr 19, 2018 · 69af5f1 · 69af5f1
2 parents 1fda581 + c3b3740
commit 69af5f1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/hs_core/views/resource_rest_api.py b/hs_core/views/resource_rest_api.py
@@ -45,11 +45,15 @@ def resourceToResourceListItem(self, r):
         resource_url = site_url + r.get_absolute_url()
         coverages = [{"type": v['type'], "value": json.loads(v['_value'])}
                      for v in r.metadata.coverages.values()]
+        doi = None
+        if r.raccess.published:
+            doi = "10.4211/hs.{}".format(r.short_id)
         resource_list_item = serializers.ResourceListItem(resource_type=r.resource_type,
                                                           resource_id=r.short_id,
                                                           resource_title=r.metadata.title.value,
                                                           abstract=r.metadata.description,
                                                           creator=r.first_creator.name,
+                                                          doi=doi,
                                                           public=r.raccess.public,
                                                           discoverable=r.raccess.discoverable,
                                                           shareable=r.raccess.shareable,

diff --git a/hs_core/views/serializers.py b/hs_core/views/serializers.py
@@ -95,6 +95,7 @@ class ResourceListItemSerializer(serializers.Serializer):
     resource_id = serializers.CharField(max_length=100)
     abstract = serializers.CharField()
     creator = serializers.CharField(max_length=100)
+    doi = serializers.CharField(max_length=200)
     date_created = serializers.DateTimeField(format='%m-%d-%Y')
     date_last_updated = serializers.DateTimeField(format='%m-%d-%Y')
     public = serializers.BooleanField()
@@ -127,6 +128,7 @@ def __init__(self, resource_type):
                                'resource_title',
                                'abstract',
                                'creator',
+                               'doi',
                                'public',
                                'discoverable',
                                'shareable',

diff --git a/theme/templates/base.html b/theme/templates/base.html
@@ -168,7 +168,23 @@
             <div class="row">
                 <div class="col-md-12">
                     <button type="button" class="close btn-close-message">&times;</button>  {# TODO: TESTING #}
-                    <!-- extra tags can be used to pass html -->
+                    {% if 'verification email' in message.message %}
+                        <!-- Google Code for HydroShare Conversions Conversion Page -->
+                        <script type="text/javascript">
+                        /* <![CDATA[ */
+                        var google_conversion_id = 823458818;
+                        var google_conversion_label = "uwesCPCzjIABEIL404gD";
+                        var google_remarketing_only = false;
+                        /* ]]> */
+                        </script>
+                        <script type="text/javascript" src="//www.googleadservices.com/pagead/conversion.js">
+                        </script>
+                        <noscript>
+                        <div style="display:inline;">
+                        <img height="1" width="1" style="border-style:none;" alt="" src="//www.googleadservices.com/pagead/conversion/823458818/?label=uwesCPCzjIABEIL404gD&amp;guid=ON&amp;script=0"/>
+                        </div>
+                        </noscript>
+                    {% endif %}
                     {% if 'html' in message.tags %}
                         {% autoescape off %}
                         {{ message }}