Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into f…

…eature-2375-demo-theme
ckan · Jul 5, 2012 · ec7df1b · ec7df1b
2 parents a5320ac + 77fe461
commit ec7df1b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/ckan/templates/macros/form.html b/ckan/templates/macros/form.html
@@ -107,7 +107,7 @@
 
   {% call block(id or name, label or name, error, classes, control_classes=["editor"]) %}
     <textarea id="{{ id or name }}" name="{{ name }}" cols="20" rows="5" placeholder="{{ placeholder }}"{{ attributes(attrs) }}>{{ value | e }}</textarea>
-    <span class="info-block">{% trans %}You can use <a href="http://daringfireball.net/projects/markdown/syntax">Markdown formatting</a> here{% endtrans %}</span>
+    <span class="info-block">{% trans %}You can use <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown formatting</a> here{% endtrans %}</span>
   {% endcall %}
 {% endmacro %}
 

diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -57,7 +57,7 @@ <h3>Data and Resources</h3>
       {% else %}
         <p>
           {% trans url=h.url_for(controller='package', action='new_resource', id=pkg.name) %}
-          This dataset has no data, <a href="{{ url }}">why not add some?</a>
+          This dataset has no data{#, <a href="{{ url }}">why not add some?</a>#}
           {% endtrans %}
       </p>
       {% endif %}

diff --git a/ckan/templates/package/snippets/resources.html b/ckan/templates/package/snippets/resources.html
@@ -18,7 +18,7 @@ <h2 class="module-heading">{{ _("Resources") }}</h2>
     <ul class="unstyled nav nav-simple">
       {% for resource in resources %}
         <li class="nav-item{{ ' active' if active == resource.id }}">
-          {% link_for (resource.name or resource.description or resource.url)|truncate(25, true), controller='package', action=action or 'resource_read', id=pkg.name, resource_id=resource.id %}
+          {% link_for h.resource_display_name(resource)|truncate(25, true), controller='package', action=action or 'resource_read', id=pkg.name, resource_id=resource.id %}
         </li>
       {% endfor %}
     </ul>

diff --git a/ckan/templates/snippets/license.html b/ckan/templates/snippets/license.html
@@ -1,23 +1,25 @@
 {% if pkg_dict.license_id %}
-{% if not text_only %}
-  <section class="module module-narrow module-shallow license">
-    <h2 class="module-heading"><i class="icon-medium icon-lock"></i> License</h2>
-    <p class="module-content">
-{% endif %}
-    {% if 'license_url' in pkg_dict %}
+  {% if not text_only %}
+    <section class="module module-narrow module-shallow license">
+      <h2 class="module-heading"><i class="icon-medium icon-lock"></i> License</h2>
+      <p class="module-content">
+  {% endif %}
+  {% if 'license_url' in pkg_dict %}
     <a href="{{ pkg_dict.license_url }}" rel="dc:rights">{{ pkg_dict.license_title }}</a>
-      {% else %}
-      <span property="dc:rights">{{ pkg_dict.license_title }}</span>
-      {% endif %}
-{% if not text_only %}
-    {% if pkg_dict.isopen %}
-      <a 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>
-      {% else %}
-      <span class="closed">{{ h.icon('lock') }}</span>
-      {% endif %}
-    </p>
-  </section>
-{% endif %}
+  {% else %}
+    <span property="dc:rights">{{ pkg_dict.license_title }}</span>
+  {% endif %}
+  {% if not text_only %}
+      {% if pkg_dict.isopen %}
+        <a 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>
+        {% else %}
+        <span class="closed">{{ h.icon('lock') }}</span>
+        {% endif %}
+      </p>
+    </section>
+  {% endif %}
+{% elif text_only %}
+  {{ _('No Licence Provided') }}
 {% endif %}