Skip to content

Commit

Permalink
Merge branch 'release/ODN_v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
SvetoKrchnavy committed Apr 24, 2015
2 parents 9954381 + a8062aa commit f0f7a9a
Show file tree
Hide file tree
Showing 18 changed files with 140 additions and 108 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
147 changes: 78 additions & 69 deletions ckanext/i18n/sk/LC_MESSAGES/ckanext.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: sk <LL@li.org>\n"
Expand All @@ -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 ""
"<strong>Powered by:</strong> <a class=\"hide-text ckan-footer-logo\" "
"href=\"http://ckan.org\">CKAN</a>"
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 ""
"<strong>Postavené na:</strong> <a class=\"hide-text ckan-footer-logo\" "
"href=\"http://ckan.org\">CKAN</a>"

#: 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 ""
" <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> "

#: 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 ""
" <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 0.10</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-"
" version %(odn_version)s</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> <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> 28.2.2015 - Ver 1.0 - complete beta version for testing </li> "
"<li> 31.3.2015 - Ver. 1.0.x - bug fix release - may be used for pilots "
"and early adopters </li> <li> 31.4.2015 - Ver. 1.1 - version for pilot "
"</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> </ul> <h2>Licensing</h2>"
Expand All @@ -162,6 +164,10 @@ 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 ""
Expand Down Expand Up @@ -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</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"
msgstr ""
msgstr "Metodika zverejňovania otvorených dát"

#: ckanext/odn_theme/templates/home/snippets/odn_theme_methodology.html:5
msgid ""
Expand All @@ -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 <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 "
"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é"

Binary file added ckanext/i18n/sk/base/images/odnscheme.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ckanext/i18n/sk/base/images/odnschemesmall.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions ckanext/odn_theme/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Binary file modified ckanext/odn_theme/public/base/images/odnscheme.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ckanext/odn_theme/public/base/images/odnschemesmall.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions ckanext/odn_theme/public/css/odn_theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down Expand Up @@ -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; }
Expand All @@ -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;
}
17 changes: 17 additions & 0 deletions ckanext/odn_theme/templates/admin/config.html
Original file line number Diff line number Diff line change
@@ -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 %}
<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>
{% endtrans %}
{{ super() }}
{% endblock %}
1 change: 1 addition & 0 deletions ckanext/odn_theme/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
{%- block meta -%}
<meta charset="utf-8" />
{% block meta_generator %}<meta name="generator" content="ckan {{ c.__version__ }}" />{% endblock %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{%- endblock -%}

{#
Expand Down
Loading

0 comments on commit f0f7a9a

Please sign in to comment.