[2375] Only show the license title once

ckan · May 23, 2012 · d2aa95a · d2aa95a
1 parent 3395d83
commit d2aa95a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
@@ -55,13 +55,13 @@ <h1>${h.resource_display_name(c.resource)}</h1>
               </py:if>
             </div>
           </div>
-          <div class="resource-preview">
+          <div class="resource-preview content">
             <div class="preview-header">
               <h3>Preview</h3>
               <a py:if="c.pkg.is_private" title="Cannot embed as resource is private." style="display: none;" class="btn disabled" data-toggle="modal" href=".modal-data-viewer-embed-dialog">Embed</a>
               <a py:if="not c.pkg.is_private" style="display: none;" class="btn btn-primary" data-toggle="modal" href=".modal-data-viewer-embed-dialog">Embed</a>
             </div>
-            <div id="ckanext-datapreview"></div>
+            <div id="ckanext-datapreview content"></div>
           </div>
         </section>
 

diff --git a/ckan/templates/snippets/license.html b/ckan/templates/snippets/license.html
@@ -3,7 +3,7 @@
   xmlns:i18n="http://genshi.edgewall.org/i18n"
   xmlns:py="http://genshi.edgewall.org/">
   <a py:if="'license_url' in dataset" href="${dataset.license_url}" rel="dc:rights">${dataset.license_title}</a>
-  <span py:if="c.pkg.license" property="dc:rights">${dataset.license_title}</span>
+  <span py:if="not 'license_url' in dataset" property="dc:rights">${dataset.license_title}</span>
   <a py:if="dataset.isopen" href="http://opendefinition.org/okd/" title="This dataset satisfies the Open Definition.">
     <img class="open-data" src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" />
   </a>