Merge branch 'release/ODN_v1.0.1'

ckanext/i18n/sk/LC_MESSAGES/ckanext.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ckanext-odn-theme 0.1.1-SNAPSHOT\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-26 04:32-0700\n"
+"POT-Creation-Date: 2015-04-27 02:51-0700\n"
 "PO-Revision-Date: 2015-02-23 10:46+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sk <LL@li.org>\n"
@@ -48,14 +48,25 @@ msgstr "SPARQL zdroj"
 msgid "Error %(error_code)s"
 msgstr "Chyba %(error_code)s"
 
-#: ckanext/odn_theme/templates/footer.html:17
+#: ckanext/odn_theme/templates/footer.html:11
+msgid "FP7 Project COMSODE"
+msgstr "FP7 Projekt COMSODE"
+
+#: ckanext/odn_theme/templates/footer.html:19
 msgid ""
 "<strong>Powered by:</strong> <a class=\"hide-text ckan-footer-logo\" "
 "href=\"http://ckan.org\">CKAN</a>"
 msgstr ""
 "<strong>Postavené na:</strong> <a class=\"hide-text ckan-footer-logo\" "
 "href=\"http://ckan.org\">CKAN</a>"
 
+#: ckanext/odn_theme/templates/footer.html:29
+msgid ""
+"Project Comsode has received funding from the Seventh Framework Programme"
+" of the European Union in Grant Agreement number 611358."
+msgstr "Projekt Comsode získal finančné prostriedky zo siedmeho rámcového "
+"programu Európskej únie v dohode o grante číslo 611358."
+
 #: ckanext/odn_theme/templates/header.html:12
 msgid "Sysadmin settings"
 msgstr "Nastavenia systémového administrátora"
@@ -92,39 +103,39 @@ msgstr "Prihlásiť"
 msgid "Register"
 msgstr "Register"
 
-#: ckanext/odn_theme/templates/header.html:79
-#: ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html:8
+#: ckanext/odn_theme/templates/header.html:84
 msgid "Open Data Node"
 msgstr "Open Data Node"
 
-#: ckanext/odn_theme/templates/header.html:101
+#: ckanext/odn_theme/templates/header.html:106
 msgid "Datasets"
 msgstr "Dátové sady"
 
-#: ckanext/odn_theme/templates/header.html:102
+#: ckanext/odn_theme/templates/header.html:107
 msgid "Organizations"
 msgstr "Organizácie"
 
-#: ckanext/odn_theme/templates/header.html:103
+#: ckanext/odn_theme/templates/header.html:108
 msgid "About ODN"
 msgstr "O ODN"
 
-#: ckanext/odn_theme/templates/header.html:106
-msgid "Data.gov.sk"
-msgstr "Data.gov.sk"
+#: ckanext/odn_theme/templates/header.html:111
+msgid "Project Comsode"
+msgstr "Projekt Comsode"
 
 #: ckanext/odn_theme/templates/admin/config.html:6
 msgid "Version"
-msgstr ""
+msgstr "Verzia"
 
 #: ckanext/odn_theme/templates/admin/config.html:11
 msgid ""
 " <p><strong>Version:</strong> This is the version displayed in the header"
 " and About page (see current version). It is set in CKAN configuration "
 "file in the property ckan.odn_version</p> "
-msgstr " <p><strong>Verzia:</strong> Toto je verzia zobrazená v hlavičke stránky"
-" a About stránke. Verzia je nastavená v CKAN konfiguračnom súbore v premennej "
-"ckan.odn_version</p> "
+msgstr ""
+" <p><strong>Verzia:</strong> Toto je verzia zobrazená v hlavičke "
+"stránky a \"O ODN\" stránke. Verzia je nastavená v CKAN konfiguračnom "
+"súbore v premennej ckan.odn_version</p> "
 
 #: ckanext/odn_theme/templates/home/about.html:3
 #: ckanext/odn_theme/templates/home/about.html:6
@@ -136,6 +147,7 @@ msgid "About Open Data Node"
 msgstr "O Open Data Node"
 
 #: ckanext/odn_theme/templates/home/snippets/about_text.html:1
+#, python-format
 msgid ""
 " <p>ODN is publication platform for open data supporting whole process of"
 " publishing. Our motivation is to provide tool which can make this "
@@ -164,10 +176,6 @@ msgid ""
 "node#license\">https://github.com/OpenDataNode/open-data-"
 "node#license</a>.</p> <h2>So, what it does?</h2> "
 msgstr ""
-" <p>ODN je zverejňovacia platforma pre otvorené dáta, ktorá podporuje "
-"celý proces zverejňovania. Našou motiváciou je poskytovať nástroj, ktorý "
-"umožní zverejňovať dáta opakovane, automatizovane a jednoducho.</p> "
-"<h2>Takže, čo to robí?</h2> "
 
 #: ckanext/odn_theme/templates/home/snippets/about_text.html:40
 msgid ""
@@ -231,7 +239,7 @@ msgid ""
 "href=\"http://www.comsode.eu/index.php/2014/06/open-data-node-what-it-is-"
 "what-it-does-what-is-next/\">Comsode project</a></p> </div> </article> "
 "</div> </div> </div> "
-msgstr " "
+msgstr ""
 
 #: ckanext/odn_theme/templates/home/snippets/odn_theme_methodology.html:3
 msgid "Methodology for publishing Open Data"
@@ -248,21 +256,25 @@ msgstr ""
 " Metodika otvorených dát je ďalším komponentom Open data sady "
 "poskytovanej <a href=\"http://www.comsode.eu\" target=\"_blank\" "
 "class=\"rlink\">Comsode projektom</a>. Je určený pre vlastníkov dát a "
-"vydavateľov (hlavne verejné orgány) ako všeobecná metodika navrhovania "
+"vydávateľov (hlavne verejné orgány) ako všeobecná metodika navrhovania "
 "ich interných procesov. "
 
 #: ckanext/odn_theme/templates/home/snippets/odn_theme_methodology.html:9
 #: ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html:13
 msgid "More information.."
 msgstr "Viac informácií.."
 
+#: ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html:8
+msgid "Comsode: Open Data Node"
+msgstr ""
+
 #: ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html:10
 msgid ""
-" ODN is platform fur publishing, retrieving and interchange of open data "
+" ODN is platform for publishing, retrieving and interchange of open data "
 "supporting whole process of publication. "
 msgstr ""
-"Toto je Podporná aplikácia, ktorá zabezpečuje synchronizáciu dát a "
-"metadát medzi vami (ako povinnou osobou) a centrálným systémom MOD."
+" ODN je platforma určená na publikáciu, získavanie a výmenu otvorených dát "
+"podporujúca celý proces publikácie. "
 
 #: ckanext/odn_theme/templates/home/snippets/search.html:2
 msgid "eg. Gold Prices"

ckanext/odn_theme/templates/footer.html

@@ -5,10 +5,11 @@
       <div class="span8 footer-links">
         {% block footer_nav %}
           <ul class="unstyled">
-            <li><a href="https://www.slovensko.sk" target="_blank"><img src="{{h.url_for_static('/base/images/upvs-logo.png')}}" alt="ÚPVS" border="0" style="margin-top:6px;width:100px;"/></a></li>
+            <li><a href="http://www.comsode.eu" target="_blank"><img src="{{h.url_for_static('/base/images/comsodelogo.png')}}" alt="Comsode" border="0" style="margin-top:6px;"/></a></li>
           </ul>
           <ul class="unstyled" style="margin-left:75px;margin-top:4px;">  
-            <li><a href="http://www.comsode.eu" target="_blank"><img src="{{h.url_for_static('/base/images/comsodelogo.png')}}" alt="Comsode" border="0" style="margin-top:6px;"/></a></li>
+            <li style="line-height:22px;"><strong>{{ _('FP7 Project COMSODE') }}</strong><br>
+                <a href="http://www.comsode.eu" target="_blank">www.comsode.eu</a> - <a href="https://twitter.com/FP7COMSODE" target="_blank">@FP7COMSODE</a> </li>         
           </ul>
         {% endblock %}
       </div>
@@ -25,6 +26,7 @@
         </div>
       </div>
     {% endblock %}
+    <div style="clear:both;padding-top:15px;">{{ _('Project Comsode has received funding from the Seventh Framework Programme of the European Union in Grant Agreement number 611358.') }}</div>
 
   </div>
 

ckanext/odn_theme/templates/header.html

@@ -108,7 +108,7 @@ <h1>
                 ('about', _('About ODN'))
               ) }}
             {% endblock %}
-<li><a target="_blank" href="http://data.gov.sk">{{ _("Data.gov.sk") }}</a></li>
+<li><a target="_blank" href="http://www.comsode.eu">{{ _("Project Comsode") }}</a></li>
           </ul>
         </nav>
       {% endblock %}

ckanext/odn_theme/templates/home/snippets/about_text.html

@@ -2,34 +2,17 @@
 <p>ODN is publication platform for open data supporting whole process of publishing. Our motivation is to provide tool which can make this publication repeatable, automated and easy to use.</p>
 <p><strong>Current version {{ odn_version }}</strong> is pilot with limited functionality, allowing user to browse, search and download published datasets and allowing registered user also to manage, transform (ETL) and publish datasets (using integrated tool <a href="http://www.comsode.eu/index.php/2014/04/unifiedviews-an-etl-framework-for-sustainable-rdf-data-processing/">UnifiedViews</a>).</p>
 <h2>Documentation</h2>
-<p>Documentation is and will be available here: <a href="https://github.com/OpenDataNode/open-data-node">https://github.com/OpenDataNode/open-data-node</a></p>
-<h2>Release Plan</h2>
+<p>Documentation is and will be available here:
 <ul>
-   <li>
-      5.12.2014 - Ver. 0.9 pilot with limited functionality
-   </li>
-   <li>
-      10.2.2015 - Ver. 0.10 beta version for testing
-   </li>
-   <li>
-      9.3.2015 - Ver. 0.11 beta version for testing
-   </li>
-   <li>
-      31.3.2015 - Ver. 1.0 - first version - may be used for pilots and early adopters
-   </li>
-   <li>
-      31.4.2015 - Ver. 1.1 - version for pilot installations
-   </li>
-   <li>
-      29.5.2015 - Ver. 1.1.x - big fix release
-   </li>
-   <li>
-      30.6.2015 - Ver. 1.2 - final Comsode release for evaluation
-   </li>
-   <li>
-      31.7.2015 - Ver. 1.2.x - final bugfix
-   </li>
+	<li>
+		<a href="https://utopia.sk/wiki/x/6IIuAw">documentation at utopia.sk</a></p>
+	</li>
+	<li>
+		<a href="https://github.com/OpenDataNode/open-data-node">documentation at github.com</a></p>
+	</li>
 </ul>
+<h2>Release Plan</h2>
+<p>Release plan is and will be available <a href="https://utopia.sk/wiki/x/nID5Ag">here</a>.</p>
 <h2>Licensing</h2>
 <p>ODN consists from several modules, each with its own license. But overall, ODN is <a href="https://en.wikipedia.org/wiki/FOSS">free and open-source</a>. For more information please take a look at <a href="https://github.com/OpenDataNode/open-data-node#license">https://github.com/OpenDataNode/open-data-node#license</a>.</p>
 <h2>So, what it does?</h2>

ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html

@@ -5,10 +5,10 @@
     {% if intro %}
       {{ h.render_markdown(intro) }}
     {% else %}
-      <h1 class="page-heading">{{ _("Open Data Node") }}</h1>
+      <h1 class="page-heading">{{ _("Comsode: Open Data Node") }}</h1>
       <p>
       {% trans %}
-        ODN is platform fur publishing, retrieving and interchange of open data supporting whole process of publication.
+        ODN is platform for publishing, retrieving and interchange of open data supporting whole process of publication.
       {% endtrans %}
       <a href="{% url_for controller='home', action='about' %}">{{ _('More information..') }}</a>
       </p>

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '1.0.0'
+version = '1.0.1'
 
 setup(
     name='ckanext-odn-theme',