Merge templates with updated versions from centraldedados.pt

centraldedados · Jul 9, 2016 · 2498b50 · 2498b50
1 parent 879a3bd
commit 2498b50
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ settings.conf
 *.pyc
 *.swp
 *~
+*.orig
diff --git a/themes/centraldedados/templates/base.html b/themes/centraldedados/templates/base.html
@@ -3,9 +3,12 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>{% block title %}Datacentral{% endblock %}</title>
-    <meta name="description" content="An open dataset repository">
+    {% block title %}
+      <title>Datacentral</title>
+    {% endblock %}
+    <meta name="description" content="An open data repository">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="/img/favicon.png">
     <link rel="stylesheet" href="/css/main.css">
   </head>
   <body>
@@ -30,19 +33,31 @@ <h1>Central de Dados</h1>
     {% block content %}{% endblock %}
     <footer class="footer row">
       <div>
-        <h4><a rel="external" href="http://transparenciahackday.org" title="Transparência Hackday">Transparência Hackday Portugal</a></h4>
+        <h5>Powered by
+          <a rel="external" target="_blank" href="http://transparenciahackday.org" title="Transparência Hackday">
+            <img src="/img/thackdaypt.png" alt="Transparência Hackday Portugal"> Transparência Hackday Portugal
+          </a> 
+          nos 
+          <a rel="external" target="_blank" href="http://datewithdata.pt" title="Date With Data">
+            <img src="/img/datewithdata.png" alt="Date With Data">
+          </a>
+        </h5>
         <ul>
-          <li>Apoio&nbsp;
-            <a rel="external" href="http://jplusplus.org">
-              <img src="/img/jplusplus.png" alt="Journalism++" />
+          <li>Supported by&nbsp;
+            <a rel="external" target="_blank" href="https://okfn.org/network/portugal/">
+              <img src="/img/okfn-pt.png" alt="Open Knowledge Portugal">
+              <strong>Open Knowledge Portugal</strong>
+            </a>
+            <a rel="external" target="_blank" href="http://jplusplus.org">
+              <img src="/img/jplusplus.png" alt="Journalism++">
               <strong>Journalism++</strong>
             </a>
           </li>
           <li>
-            Agradecimentos&nbsp;
-            <a rel="external" href="https://okfn.org">
-              <img src="/img/okfn.png" alt="OKFN" />
-              <strong>Open Knowledge</strong>
+            Thanks to&nbsp;
+            <a rel="external" target="_blank" href="https://okfn.org">
+              <img src="/img/okfn.png" alt="OKI">
+              <strong>Open Knowledge International</strong>
             </a>
           </li>
         </ul>
@@ -67,6 +82,5 @@ <h4><a rel="external" href="http://transparenciahackday.org" title="Transparênc
     </script>
     <noscript><p><img src="//piwik.manufacturaindependente.org/piwik.php?idsite=2" style="border:0;" alt="" /></p></noscript>
     <!-- End Piwik Code -->
-
   </body>
 </html>
diff --git a/themes/centraldedados/templates/dataset.html b/themes/centraldedados/templates/dataset.html
@@ -1,12 +1,16 @@
 {% extends "base.html" %}
 
+{% block title %}
+      <title>{{ datapkg.title }} — Datacentral</title>
+      <meta name="description" content="{{ datapkg.description }}. An open data repository powered by Datacentral">
+{% endblock %}
+
 {% block content %}
 
 <section class="row">
   <div>
     <div class="main-dataset">
-      <h1>{{ title }}</h1>
-
+
       <div class="details">
         <h4>Detalhes</h4>
         <p><strong>Versão</strong> {{ datapkg.version }}</p>

diff --git a/themes/centraldedados/templates/page.html b/themes/centraldedados/templates/page.html
@@ -1,11 +1,18 @@
 {% extends "base.html" %}
 
+{% block title %}
+      <title>{{ pagename }} — Datacentral</title>
+{% endblock %}
+
 {% block content %}
 
 <section class="row">
   <div>
-    <div class="main-dataset">
-      <div class="readme">
+    <div class="description">
+      {{ welcome_text }}
+    </div>
+    <div class="main">
+      <div class="static-page page-{{ pagename }}">
         {{ content }}
       </div>
     </div>