diff --git a/README.md b/README.md index 79c4aa3..0d31f53 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,9 @@ Installation To enable plugin, change property in your production.ini: ``` ckan.plugins = odn_theme odn_package_extras + +# version displayed in header and About page (current version) +ckan.odn_version = 0.11 ``` set in .ini: diff --git a/ckanext/i18n/sk/LC_MESSAGES/ckanext.po b/ckanext/i18n/sk/LC_MESSAGES/ckanext.po index 8c2c29c..77eb8ba 100644 --- a/ckanext/i18n/sk/LC_MESSAGES/ckanext.po +++ b/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-02-23 10:42+0100\n" +"POT-Creation-Date: 2015-03-26 04:32-0700\n" "PO-Revision-Date: 2015-02-23 10:46+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: sk \n" @@ -21,137 +21,139 @@ msgstr "" #: ckanext/extras/plugin.py:15 msgid "Creator" -msgstr "" +msgstr "Tvorca" #: ckanext/extras/plugin.py:16 msgid "Dataset" -msgstr "" +msgstr "Sada dát" #: ckanext/extras/plugin.py:17 msgid "Modified" -msgstr "" +msgstr "Zmenený" #: ckanext/extras/plugin.py:18 msgid "Source" -msgstr "" +msgstr "Zdroj" #: ckanext/extras/plugin.py:19 msgid "Example resource" -msgstr "" +msgstr "Príklad zdroja" #: ckanext/extras/plugin.py:20 msgid "SPARQL resource" -msgstr "" +msgstr "SPARQL zdroj" #: ckanext/odn_theme/templates/error_document_template.html:3 #, python-format msgid "Error %(error_code)s" -msgstr "" +msgstr "Chyba %(error_code)s" -#: ckanext/odn_theme/templates/footer.html:10 -msgid "FP7 Project COMSODE" -msgstr "" - -#: ckanext/odn_theme/templates/footer.html:18 +#: ckanext/odn_theme/templates/footer.html:17 msgid "" "Powered by: CKAN" msgstr "" - -#: ckanext/odn_theme/templates/footer.html:28 -msgid "" -"Project Comsode has received funding from the Seventh Framework Programme" -" of the European Union in Grant Agreement number 611358." -msgstr "" +"Postavené na: CKAN" #: ckanext/odn_theme/templates/header.html:12 msgid "Sysadmin settings" -msgstr "" +msgstr "Nastavenia systémového administrátora" #: ckanext/odn_theme/templates/header.html:18 msgid "View profile" -msgstr "" +msgstr "Prehľad profilu" #: ckanext/odn_theme/templates/header.html:25 #, python-format msgid "Dashboard (%(num)d new item)" msgid_plural "Dashboard (%(num)d new items)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Nástenka (%(num)d nových položiek)" +msgstr[1] "Nástenka (%(num)d nová položka)" +msgstr[2] "Nástenka (%(num)d nové položky)" #: ckanext/odn_theme/templates/header.html:33 msgid "Edit settings" -msgstr "" +msgstr "Zmeniť nastavenia" #: ckanext/odn_theme/templates/header.html:40 msgid "Log out" -msgstr "" +msgstr "Odhlásiť" #: ckanext/odn_theme/templates/header.html:51 msgid "Contact Us" -msgstr "" +msgstr "Kontaktovať nás" #: ckanext/odn_theme/templates/header.html:53 msgid "Log in" -msgstr "" +msgstr "Prihlásiť" #: ckanext/odn_theme/templates/header.html:55 msgid "Register" -msgstr "" +msgstr "Register" #: ckanext/odn_theme/templates/header.html:79 +#: ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html:8 msgid "Open Data Node" -msgstr "" +msgstr "Open Data Node" -#: ckanext/odn_theme/templates/header.html:80 -msgid "ver. 0.10" -msgstr "" - -#: ckanext/odn_theme/templates/header.html:99 +#: ckanext/odn_theme/templates/header.html:101 msgid "Datasets" -msgstr "" +msgstr "Dátové sady" -#: ckanext/odn_theme/templates/header.html:100 +#: ckanext/odn_theme/templates/header.html:102 msgid "Organizations" -msgstr "" +msgstr "Organizácie" -#: ckanext/odn_theme/templates/header.html:101 +#: ckanext/odn_theme/templates/header.html:103 msgid "About ODN" -msgstr "" +msgstr "O ODN" + +#: ckanext/odn_theme/templates/header.html:106 +msgid "Data.gov.sk" +msgstr "Data.gov.sk" -#: ckanext/odn_theme/templates/header.html:104 -msgid "Project Comsode" +#: ckanext/odn_theme/templates/admin/config.html:6 +msgid "Version" msgstr "" +#: ckanext/odn_theme/templates/admin/config.html:11 +msgid "" +"

Version: 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

" +msgstr "

Verzia: 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

" + #: ckanext/odn_theme/templates/home/about.html:3 #: ckanext/odn_theme/templates/home/about.html:6 msgid "About" -msgstr "" +msgstr "O ODN" #: ckanext/odn_theme/templates/home/about.html:16 msgid "About Open Data Node" -msgstr "" +msgstr "O Open Data Node" #: ckanext/odn_theme/templates/home/snippets/about_text.html:1 msgid "" "

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.

Current" -" version 0.10 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 UnifiedViews).

Documentation

" -"

Documentation is and will be available here: 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 UnifiedViews).

" +"

Documentation

Documentation is and will be available here: https://github.com/OpenDataNode/open-data-node

Release" " Plan

Licensing

" @@ -162,6 +164,10 @@ msgid "" "node#license\">https://github.com/OpenDataNode/open-data-" "node#license.

So, what it does?

" msgstr "" +"

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.

" +"

Takže, čo to robí?

" #: ckanext/odn_theme/templates/home/snippets/about_text.html:40 msgid "" @@ -225,11 +231,11 @@ msgid "" "href=\"http://www.comsode.eu/index.php/2014/06/open-data-node-what-it-is-" "what-it-does-what-is-next/\">Comsode project

" " " -msgstr "" +msgstr " " #: ckanext/odn_theme/templates/home/snippets/odn_theme_methodology.html:3 msgid "Methodology for publishing Open Data" -msgstr "" +msgstr "Metodika zverejňovania otvorených dát" #: ckanext/odn_theme/templates/home/snippets/odn_theme_methodology.html:5 msgid "" @@ -239,47 +245,50 @@ msgid "" "publishers (mainly public bodies) as the generic methodology for the " "design of their internal processes. " msgstr "" +" Metodika otvorených dát je ďalším komponentom Open data sady " +"poskytovanej Comsode projektom. Je určený pre vlastníkov dát a " +"vydavateľ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 "" - -#: ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html:8 -msgid "Comsode: Open Data Node" -msgstr "" +msgstr "Viac informácií.." #: ckanext/odn_theme/templates/home/snippets/odn_theme_promoted.html:10 msgid "" " ODN is platform fur 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." #: ckanext/odn_theme/templates/home/snippets/search.html:2 msgid "eg. Gold Prices" -msgstr "" +msgstr "napríklad Ceny zlata" #: ckanext/odn_theme/templates/home/snippets/search.html:6 msgid "Search Your Data" -msgstr "" +msgstr "Hľadať vo Vašich dátach" #: ckanext/odn_theme/templates/home/snippets/search.html:11 msgid "Search" -msgstr "" +msgstr "Hľadať" #: ckanext/odn_theme/templates/snippets/package_item.html:38 msgid "Private" -msgstr "" +msgstr "Súkromné" #: ckanext/odn_theme/templates/snippets/package_item.html:43 msgid "Draft" -msgstr "" +msgstr "Návrh" #: ckanext/odn_theme/templates/snippets/package_item.html:45 msgid "Deleted" -msgstr "" +msgstr "Odtránené" #: ckanext/odn_theme/templates/snippets/package_item.html:50 msgid "Popular" -msgstr "" +msgstr "Obľúbené" diff --git a/ckanext/i18n/sk/base/images/odnscheme.jpg b/ckanext/i18n/sk/base/images/odnscheme.jpg new file mode 100644 index 0000000..0b86006 Binary files /dev/null and b/ckanext/i18n/sk/base/images/odnscheme.jpg differ diff --git a/ckanext/i18n/sk/base/images/odnschemesmall.jpg b/ckanext/i18n/sk/base/images/odnschemesmall.jpg new file mode 100644 index 0000000..ddfaea5 Binary files /dev/null and b/ckanext/i18n/sk/base/images/odnschemesmall.jpg differ diff --git a/ckanext/odn_theme/plugin.py b/ckanext/odn_theme/plugin.py index 1c39e87..23bf266 100644 --- a/ckanext/odn_theme/plugin.py +++ b/ckanext/odn_theme/plugin.py @@ -2,6 +2,9 @@ import ckan.plugins.toolkit as toolkit import ckan.lib.helpers as h import os +from ckan.lib.app_globals import auto_update + +auto_update.append('ckan.odn_version') def localized_url_for_static(link): return h.url_for_static("{lang}/{link}".format(lang=h.lang(), link=link)) diff --git a/ckanext/odn_theme/public/base/images/odnscheme.jpg b/ckanext/odn_theme/public/base/images/odnscheme.jpg index 012df31..0d0958e 100644 Binary files a/ckanext/odn_theme/public/base/images/odnscheme.jpg and b/ckanext/odn_theme/public/base/images/odnscheme.jpg differ diff --git a/ckanext/odn_theme/public/base/images/odnschemesmall.jpg b/ckanext/odn_theme/public/base/images/odnschemesmall.jpg index 105700f..c961da0 100644 Binary files a/ckanext/odn_theme/public/base/images/odnschemesmall.jpg and b/ckanext/odn_theme/public/base/images/odnschemesmall.jpg differ diff --git a/ckanext/odn_theme/public/base/images/upvs-logo.png b/ckanext/odn_theme/public/base/images/upvs-logo.png new file mode 100644 index 0000000..967c2bb Binary files /dev/null and b/ckanext/odn_theme/public/base/images/upvs-logo.png differ diff --git a/ckanext/odn_theme/public/css/odn_theme.css b/ckanext/odn_theme/public/css/odn_theme.css index 514e659..0b50b3f 100644 --- a/ckanext/odn_theme/public/css/odn_theme.css +++ b/ckanext/odn_theme/public/css/odn_theme.css @@ -32,10 +32,11 @@ body, .account-masthead, .masthead { background: none; } .masthead { padding-bottom: 12px; padding-top: 0; border-bottom: 1px solid #efeeec; } .account-masthead, .masthead, .site-footer { background: #efeeec; } -h1 { font-size: 20px; } -h1 { color: #2c3e50; } +h1 { font-size: 20px; color: #2c3e50; } .context-info h1.heading { margin-top: 12px; } +h1, div.notes p, div.dataset-content div { word-wrap: break-word; } + .homepage .module-search .module-content .heading { color: #2c3e50; } .search-form .search-input.search-giant input { font-size: 16px; padding: 10px; } .homepage [role="main"] { padding-bottom: 0; } @@ -73,7 +74,7 @@ hgroup.header-image { margin-left: 5px; } .site-footer { min-height: 110px; margin-top:20px;} .site-footer, .site-footer label, .site-footer small { color: #2c3e50; } .attribution .ckan-footer-logo { margin-top: 7px; } -.footer-links ul { width: auto; margin-left:0; } +.footer-links ul { width: auto; margin-left:0; float: left; } .footer-links { width: 500px; } .attribution { width: auto; margin-left: 0; } .footer-links a { color:#2c3e50; } @@ -96,3 +97,7 @@ ol.stages { margin: 10px 0 20px; } .page_primary_action { margin-top: 15px; margin-bottom: 15px; } .btn-primary { background: #2c3e50; } .btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled] { background: #909090; } + +[role=main] { + min-height: 160px; +} \ No newline at end of file diff --git a/ckanext/odn_theme/templates/admin/config.html b/ckanext/odn_theme/templates/admin/config.html new file mode 100644 index 0000000..b7150db --- /dev/null +++ b/ckanext/odn_theme/templates/admin/config.html @@ -0,0 +1,17 @@ +{% ckan_extends %} + +{% import 'macros/form.html' as form %} + +{% block admin_form %} + {{ form.input('odn_version', label=_('Version'), value=g.odn_version, placeholder='ckan.odn_version in CKAN config', classes=['control-medium'], attrs={'disabled':'disabled'}) }} + {{ super() }} +{% endblock %} + +{% block admin_form_help %} + {% trans %} +

Version: 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

+ {% endtrans %} + {{ super() }} +{% endblock %} \ No newline at end of file diff --git a/ckanext/odn_theme/templates/base.html b/ckanext/odn_theme/templates/base.html index e77dc26..bbecf4b 100644 --- a/ckanext/odn_theme/templates/base.html +++ b/ckanext/odn_theme/templates/base.html @@ -27,6 +27,7 @@ {%- block meta -%} {% block meta_generator %}{% endblock %} + {%- endblock -%} {# diff --git a/ckanext/odn_theme/templates/footer.html b/ckanext/odn_theme/templates/footer.html index e08beef..f434d1f 100644 --- a/ckanext/odn_theme/templates/footer.html +++ b/ckanext/odn_theme/templates/footer.html @@ -1,18 +1,18 @@