[Blends-commit] [SCM] website branch, master, updated. ab2b34307f739ff45fd595996ce01e73b75b2e9d

[Ole Streicher]

The following commit has been merged in the master branch:
commit 1b119366d7777b719bae0697beda202d03746b63
Author: Ole Streicher <ole at aip.de>
Date:   Fri Mar 4 11:15:26 2016 +0100

    Add upstream_repository and upstream_bugs to packages

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 18f52f4..f7dcc46 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1631,7 +1631,7 @@ class TaskDependencies:
                 dep.properties['license'] = license_in_component[dep.component]
                 for prop in PROPERTIES:
                     dep.properties[prop] = row[prop]
-                for prop in ('vcs-type', 'vcs-url'):
+                for prop in ('vcs-type', 'vcs-url', 'upstream_bugs', 'upstream_repository'):
                     dep.properties[prop] = row[prop]
                 if row['vcs-browser']:
                     dep.properties['vcs-browser'] = row['vcs-browser']
diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml
index db55faf..16c4221 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -370,48 +370,57 @@ function show_fulldesc(hash) {
 		    <py:if test="'published' in project.properties">
 		      <dt>Reference</dt>
 		      <dd>
-			<py:if test="'authors' in project.properties['published']">
-			  ${project.properties['published']['authors']}:
-			</py:if>
-			<py:choose>
-			  <py:when test="'url' in project.properties['published']">
+			<ul class="desc-inline">
+			  <li>
+			    <py:if test="'authors' in project.properties['published']">
+			      ${project.properties['published']['authors']}:
+			    </py:if>
 			    <py:choose>
-			      <py:when test="'title' in project.properties['published']">
-				<a href="${project.properties['published']['url']}">
-				  <em>${project.properties['published']['title']}.</em>
-				</a>
+			      <py:when test="'url' in project.properties['published']">
+				<py:choose>
+				  <py:when test="'title' in project.properties['published']">
+				    <a href="${project.properties['published']['url']}">
+				      <em>${project.properties['published']['title']}.</em>
+				    </a>
+				  </py:when>
+				  <py:otherwise>
+				    <a href="${project.properties['published']['url']}">
+				      Link to publication
+				    </a>
+				  </py:otherwise>
+				</py:choose>
 			      </py:when>
-			      <py:otherwise>
-				<a href="${project.properties['published']['url']}">
-				  Link to publication
-				</a>
-			      </py:otherwise>
-			    </py:choose>
-			  </py:when>
-			  <py:when test="'doi' in project.properties['published']">
-			    <py:choose>
-			      <py:when test="'title' in project.properties['published']">
-				<a href="http://dx.doi.org/${project.properties['published']['doi']}">
-				  ${project.properties['published']['title']}.
-				</a>
+			      <py:when test="'doi' in project.properties['published']">
+				<py:choose>
+				  <py:when test="'title' in project.properties['published']">
+				    <a href="http://dx.doi.org/${project.properties['published']['doi']}">
+				      ${project.properties['published']['title']}.
+				    </a>
+				  </py:when>
+				  <py:otherwise>
+				    <a href="http://dx.doi.org/${project.properties['published']['doi']}">
+				      Link to publication</a>
+				  </py:otherwise>
+				</py:choose>
 			      </py:when>
 			      <py:otherwise>
-				<a href="http://dx.doi.org/${project.properties['published']['doi']}">
-				  Link to publication</a>
+				<py:if test="'title' in project.properties['published']">
+				  ${project.properties['published']['title']}
+				</py:if>
 			      </py:otherwise>
 			    </py:choose>
-			  </py:when>
-			  <py:otherwise>
-			    <py:if test="'title' in project.properties['published']">
-			      ${project.properties['published']['title']}
-			    </py:if>
-			  </py:otherwise>
-			</py:choose>
-			<py:if test="'pubmed' in project.properties['published']">
-			  (<a href="http://www.ncbi.nlm.nih.gov/pubmed/${project.properties['published']['pubmed']}">PubMed</a></py:if><py:if test="'pubmed' in project.properties['published'] and 'eprint' in project.properties['published']">,</py:if><py:if test="'pubmed' not in project.properties['published'] and 'eprint' in project.properties['published']">(</py:if><py:if test="'eprint' in project.properties['published']"><a href="${project.properties['published']['eprint']}">eprint</a></py:if><py:if test="'pubmed' in project.properties['published'] or 'eprint' in project.properties['published']">)</py:if>
-			<py:if test="'journal' in project.properties['published']">${project.properties['published']['journal']}</py:if>
-			<py:if test="'volume' in project.properties['published']">${project.properties['published']['volume']}</py:if><py:if test="'number' in project.properties['published']">(${project.properties['published']['number']})</py:if><py:if test="'pages' in project.properties['published']">:${project.properties['published']['pages']}</py:if>
-			<py:if test="'year' in project.properties['published']">(${project.properties['published']['year']})</py:if>
+			    <py:if test="'pubmed' in project.properties['published']">
+			      (<a href="http://www.ncbi.nlm.nih.gov/pubmed/${project.properties['published']['pubmed']}">PubMed</a></py:if><py:if test="'pubmed' in project.properties['published'] and 'eprint' in project.properties['published']">,</py:if><py:if test="'pubmed' not in project.properties['published'] and 'eprint' in project.properties['published']">(</py:if><py:if test="'eprint' in project.properties['published']"><a href="${project.properties['published']['eprint']}">eprint</a></py:if><py:if test="'pubmed' in project.properties['published'] or 'eprint' in project.properties['published']">)</py:if>
+			    <py:if test="'journal' in project.properties['published']">${project.properties['published']['journal']}</py:if>
+			    <py:if test="'volume' in project.properties['published']">${project.properties['published']['volume']}</py:if><py:if test="'number' in project.properties['published']">(${project.properties['published']['number']})</py:if><py:if test="'pages' in project.properties['published']">:${project.properties['published']['pages']}</py:if>
+			    <py:if test="'year' in project.properties['published']">(${project.properties['published']['year']})</py:if>
+			  </li>
+			  <py:if test="project.properties.get('ascl_id')">
+			    <li>
+			      <a href="http://ascl.net/${project.properties['ascl_id']}">ascl:[${project.properties['ascl_id']}]</a>
+			    </li>
+			  </py:if>
+			</ul>
 		      </dd>
 		    </py:if>
 		    <py:if test="project.responsible != None">
@@ -557,6 +566,20 @@ function show_fulldesc(hash) {
 			      </a>
 			    </li>
 			  </py:if>
+			  <py:if test="project.properties.get('upstream_bugs')">
+			    <li>
+			      <a href="${project.properties['upstream_bugs']}">
+				Bugs
+			      </a>
+			    </li>
+			  </py:if>
+			  <py:if test="project.properties.get('upstream_repository')">
+			    <li>
+			      <a href="${project.properties['upstream_repository']}">
+				Git
+			      </a>
+			    </li>
+			  </py:if>
 			</ul>
 		      </dd>
 		    </py:if>

-- 
Static and dynamic websites for Debian Pure Blends