Products rendering correctly in list form, biblio rendered on client.

ourresearch · Mar 17, 2015 · 7e10861 · 7e10861
1 parent c93fb35
commit 7e10861
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 76 deletions.
diff --git a/totalimpactwebapp/static/dist/Impactstory.js b/totalimpactwebapp/static/dist/Impactstory.js
@@ -1,4 +1,4 @@
-/*! Impactstory - v0.0.1-SNAPSHOT - 2015-03-15
+/*! Impactstory - v0.0.1-SNAPSHOT - 2015-03-16
  * http://impactstory.org
  * Copyright (c) 2015 Impactstory;
  * Licensed MIT
@@ -7729,7 +7729,9 @@ angular.module("collection-page/collection-section.tpl.html", []).run(["$templat
     "         -->\n" +
     "\n" +
     "         <div class=\"product-container\">\n" +
-    "            <span class=\"biblio-container\" ng-include=\"'collection-page/product-biblio.tpl.html'\"></span>\n" +
+    "            <div class=\"biblio-container\" ng-include=\"'collection-page/product-biblio.tpl.html'\"></div>\n" +
+    "            <div class=\"awards-container\" ng-bind-html=\"trustHtml(product.markup)\"></div>\n" +
+    "\n" +
     "         </div>\n" +
     "\n" +
     "\n" +
@@ -7875,7 +7877,7 @@ angular.module("collection-page/product-biblio.tpl.html", []).run(["$templateCac
     "         title=\"Click to view impact details\"\n" +
     "         data-toggle='tooltip'\n" +
     "\n" +
-    "         href=\"/{{ url_slug }}/product/{{ tiid }}\">\n" +
+    "         href=\"/{{ page.getUrlSlug() }}/product/{{ product.tiid }}\">\n" +
     "\n" +
     "         {{product.biblio.display_title}}\n" +
     "\n" +
@@ -7905,9 +7907,9 @@ angular.module("collection-page/product-biblio.tpl.html", []).run(["$templateCac
     "   <div class=\"under-biblio\">\n" +
     "      <a class=\"has-fulltext\"\n" +
     "         ng-if=\"product.embed_markup\"\n" +
-    "         href=\"/{{ url_slug }}/product/{{ product.tiid }}/fulltext\">\n" +
+    "         href=\"/{{ page.getUrlSlug() }}/product/{{ product.tiid }}/fulltext\">\n" +
     "         <i class=\"icon-unlock-alt\"></i>\n" +
-    "         {{ product.fulltext_cta }}\n" +
+    "         {{ GenreConfigs.get(product.genre, 'fulltext_cta') }}\n" +
     "      </a>\n" +
     "   </div>\n" +
     "</div>");

diff --git a/totalimpactwebapp/static/src/app/collection-page/collection-section.tpl.html b/totalimpactwebapp/static/src/app/collection-page/collection-section.tpl.html
@@ -141,7 +141,9 @@
          -->
 
          <div class="product-container">
-            <span class="biblio-container" ng-include="'collection-page/product-biblio.tpl.html'"></span>
+            <div class="biblio-container" ng-include="'collection-page/product-biblio.tpl.html'"></div>
+            <div class="awards-container" ng-bind-html="trustHtml(product.markup)"></div>
+
          </div>
 
 

diff --git a/totalimpactwebapp/static/src/app/collection-page/product-biblio.tpl.html b/totalimpactwebapp/static/src/app/collection-page/product-biblio.tpl.html
@@ -4,7 +4,7 @@ <h5 class="title">
          title="Click to view impact details"
          data-toggle='tooltip'
 
-         href="/{{ url_slug }}/product/{{ tiid }}">
+         href="/{{ page.getUrlSlug() }}/product/{{ product.tiid }}">
 
          {{product.biblio.display_title}}
 
@@ -34,9 +34,9 @@ <h5 class="title">
    <div class="under-biblio">
       <a class="has-fulltext"
          ng-if="product.embed_markup"
-         href="/{{ url_slug }}/product/{{ product.tiid }}/fulltext">
+         href="/{{ page.getUrlSlug() }}/product/{{ product.tiid }}/fulltext">
          <i class="icon-unlock-alt"></i>
-         {{ product.fulltext_cta }}
+         {{ GenreConfigs.get(product.genre, 'fulltext_cta') }}
       </a>
    </div>
 </div>
diff --git a/totalimpactwebapp/templates/product.html b/totalimpactwebapp/templates/product.html
@@ -1,70 +1,3 @@
-<div class="biblio">
-   <h5 class="title">
-      <!-- if embedded, open product page in a new tab -->
-      <a class="title-text target-blank"
-
-         {% if embed %}
-         target="_blank"
-         {% endif %}
-
-         title="Click to view impact details"
-         data-toggle='tooltip'
-
-         href="/{{ url_slug }}/product/{{ tiid }}">
-
-         {{biblio.display_title}}
-
-      </a>
-
-
-      {% if aliases.best_url %}
-      <!--
-      <a class="linkout url title"
-         target="_blank"
-         title="Click to view on publisher site"
-         data-toggle='tooltip's
-         href="{{ aliases.best_url }}">
-         <i class="icon-external-link-sign"></i>
-      </a>
-      -->
-      {% endif %}
-   </h5>
-
-   <div class="optional-biblio">
-      {% if biblio.display_year %}
-      <span class="year">({{ biblio.display_year }})</span>
-      {% endif %}
-
-      {% if biblio.display_authors %}
-      <span class="authors">{{ biblio.display_authors }}.</span>
-      {% endif %}
-
-
-      {% if biblio.repository and not biblio.journal %}
-      <span class="repository">{{ biblio.repository }}.</span>
-      {% endif %}
-
-
-      {% if biblio.journal %}
-      <span class="journal">{{ biblio.journal }}</span>
-      {% endif %}
-
-      {% if biblio.description %}
-      <span class="description">{{ biblio.description }}</span>
-      {% endif %}
-   </div>
-
-   <div class="under-biblio">
-     {% if embed_markup %}
-      <a class="has-fulltext"
-         href="/{{ url_slug }}/product/{{ tiid }}/fulltext">
-         <i class="icon-unlock-alt"></i>
-         {{ fulltext_cta }}
-      </a>
-      {% endif %}
-   </div>
-</div>
-
 <div class="awards">
    <ul class="awards-list">
       {% for award in awards | sort(reverse=True, attribute="display_order") %}

diff --git a/totalimpactwebapp/views.py b/totalimpactwebapp/views.py
@@ -677,6 +677,7 @@ def profile_products_get(url_slug):
             show_keys=[
                 # for rendering biblio
                 "biblio",
+                "embed_markup",
 
                 "_tiid",
                 "tiid",