From 85f6fdb0fa2cac6a6bd5eb3557bc086f11794c18 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Wed, 7 Oct 2015 13:27:53 +0200 Subject: [PATCH 1/8] update version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fb8ef1b..22815e4 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import sys, os -version = '1.2.0' +version = '1.2.1-SNAPSHOT' setup( name='ckanext-odn-theme', From ea74f22f41b253ad8627e0e681c83ff577c21cf3 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Wed, 7 Oct 2015 13:29:46 +0200 Subject: [PATCH 2/8] updated the translations --- CHANGELOG.rst | 7 ++++++- ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1dc5416..f918f5f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,8 +1,13 @@ --------- Changelog --------- +v1.2.1 2015-10-7 -v1.2.0-SNAPSHOT 2015-9-11 +Bug fixes: + * i18n updates + + +v1.2.0 2015-9-11 Features: * added plugins for Internal and Public Catalog themes, where the odn_theme plugin is a common base diff --git a/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po b/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po index 2265abb..90ed23b 100644 --- a/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po +++ b/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po @@ -179,14 +179,6 @@ msgstr "Nastavenia systémového administrátora" msgid "View profile" msgstr "Prehľad profilu" -#: ckanext/odn_theme_ic/templates/header.html:19 -#, python-format -msgid "Dashboard (%(num)d new item)" -msgid_plural "Dashboard (%(num)d new items)" -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_ic/templates/header.html:27 msgid "Edit settings" msgstr "Zmeniť nastavenia" From bbfaac5c6d1f63a5ca954f979d419e63a02db281 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Thu, 8 Oct 2015 15:00:05 +0200 Subject: [PATCH 3/8] fix removed the duplicity translations - these translation are in ckan.po --- .../i18n/sk/LC_MESSAGES/ckanext_odn_theme.po | 112 ------------------ 1 file changed, 112 deletions(-) diff --git a/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po b/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po index 90ed23b..7602ee8 100644 --- a/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po +++ b/ckanext/i18n/sk/LC_MESSAGES/ckanext_odn_theme.po @@ -23,18 +23,10 @@ msgstr "" msgid "Creator" msgstr "Tvorca" -#: ckanext/extras/plugin.py:16 -msgid "Dataset" -msgstr "Sada dát" - #: ckanext/extras/plugin.py:17 msgid "Modified" msgstr "Zmenený" -#: ckanext/extras/plugin.py:18 -msgid "Source" -msgstr "Zdroj" - #: ckanext/extras/plugin.py:19 msgid "Example resource" msgstr "Príklad zdroja" @@ -52,21 +44,6 @@ msgstr " " msgid "Open Data Node" msgstr "Open Data Node" -#: ckanext/odn_theme/templates/header.html:25 -#: ckanext/odn_theme/templates/header.html:31 -msgid "Datasets" -msgstr "Dátové sady" - -#: ckanext/odn_theme/templates/header.html:26 -#: ckanext/odn_theme/templates/header.html:32 -msgid "Organizations" -msgstr "Organizácie" - -#: ckanext/odn_theme/templates/header.html:27 -#: ckanext/odn_theme/templates/header.html:33 -msgid "Groups" -msgstr "" - #: ckanext/odn_theme/templates/header.html:43 msgid "Tools" msgstr "Nástroje" @@ -95,96 +72,7 @@ msgstr "napríklad Ceny zlata" msgid "Search Your Data" msgstr "Hľadať vo Vašich dátach" -#: ckanext/odn_theme/templates/home/snippets/search.html:11 -msgid "Search" -msgstr "Hľadať" - -#: ckanext/odn_theme/templates/package/resource_read.html:5 -msgid "Additional Information" -msgstr "Doplňujúce informácie" - -#: ckanext/odn_theme/templates/package/resource_read.html:9 -msgid "Field" -msgstr "" - -#: ckanext/odn_theme/templates/package/resource_read.html:10 -msgid "Value" -msgstr "" - -#: ckanext/odn_theme/templates/package/resource_read.html:15 -msgid "Last updated" -msgstr "Naposledy aktualizované" - -#: ckanext/odn_theme/templates/package/resource_read.html:16 -#: ckanext/odn_theme/templates/package/resource_read.html:20 -#: ckanext/odn_theme/templates/package/resource_read.html:24 -msgid "unknown" -msgstr "" - -#: ckanext/odn_theme/templates/package/resource_read.html:19 -msgid "Created" -msgstr "" - -#: ckanext/odn_theme/templates/package/resource_read.html:23 -msgid "Format" -msgstr "" - -#: ckanext/odn_theme/templates/package/resource_read.html:27 -msgid "License" -msgstr "" - -#: ckanext/odn_theme/templates/user/read_base.html:7 -msgid "Open ID" -msgstr "" - -#: ckanext/odn_theme/templates/user/read_base.html:10 -msgid "Username" -msgstr "" - -#: ckanext/odn_theme/templates/user/read_base.html:16 -msgid "Email" -msgstr "" - -#: ckanext/odn_theme/templates/user/read_base.html:16 -#: ckanext/odn_theme/templates/user/read_base.html:30 -msgid "This means only you can see this" -msgstr "" - -#: ckanext/odn_theme/templates/user/read_base.html:16 -#: ckanext/odn_theme/templates/user/read_base.html:30 -msgid "Private" -msgstr "Súkromné" - #: ckanext/odn_theme/templates/user/read_base.html:17 msgid "None" msgstr "Žiadny" -#: ckanext/odn_theme/templates/user/read_base.html:21 -msgid "Member Since" -msgstr "" - -#: ckanext/odn_theme/templates/user/read_base.html:25 -msgid "State" -msgstr "" - -#: ckanext/odn_theme/templates/user/read_base.html:30 -msgid "API Key" -msgstr "" - -#: ckanext/odn_theme_ic/templates/header.html:6 -msgid "Sysadmin settings" -msgstr "Nastavenia systémového administrátora" - -#: ckanext/odn_theme_ic/templates/header.html:12 -msgid "View profile" -msgstr "Prehľad profilu" - -#: ckanext/odn_theme_ic/templates/header.html:27 -msgid "Edit settings" -msgstr "Zmeniť nastavenia" - -#: ckanext/odn_theme_ic/templates/header.html:34 -msgid "Log out" -msgstr "Odhlásiť" - - From 1e3e54213a3679f041ab415f446ec6144dadb420 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Mon, 19 Oct 2015 14:14:52 +0200 Subject: [PATCH 4/8] OpenDataNode/open-data-node#222 - Tolls menu after mouse over hiding menu item --- ckanext/odn_theme_ic/public/css/odn_theme_ic.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ckanext/odn_theme_ic/public/css/odn_theme_ic.css b/ckanext/odn_theme_ic/public/css/odn_theme_ic.css index 358a716..7520c86 100644 --- a/ckanext/odn_theme_ic/public/css/odn_theme_ic.css +++ b/ckanext/odn_theme_ic/public/css/odn_theme_ic.css @@ -45,4 +45,8 @@ .alert-info a { font-weight: bold; color: #514b33; +} + +.dropdown-menu>li>a:hover { + color: #cc3700; } \ No newline at end of file From 6e3d29d4bf662d79e8f93403ce1d0401369a8c18 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Mon, 19 Oct 2015 14:51:45 +0200 Subject: [PATCH 5/8] OpenDataNode/open-data-node#230 - Theme - formatting of icons looks strange --- ckanext/odn_theme/public/css/odn_theme.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckanext/odn_theme/public/css/odn_theme.css b/ckanext/odn_theme/public/css/odn_theme.css index 7561353..8e717ae 100644 --- a/ckanext/odn_theme/public/css/odn_theme.css +++ b/ckanext/odn_theme/public/css/odn_theme.css @@ -145,7 +145,7 @@ div.subrow.space { margin-left: 60px; } .footer-links ul { width: auto; margin-left:0; float: left; } .footer-links { width: 500px; } -.attribution { width: auto; margin-left: 0; } +.attribution { width: auto; margin-left: 80px; } .site-footer form { margin: 0; } .site-footer .container { padding-top: 7px; } From 7596619c9124d962689ef1633467fed486ba2a25 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Tue, 20 Oct 2015 12:20:47 +0200 Subject: [PATCH 6/8] fix the alignment of resources --- ckanext/odn_theme/public/css/odn_theme.css | 1 - 1 file changed, 1 deletion(-) diff --git a/ckanext/odn_theme/public/css/odn_theme.css b/ckanext/odn_theme/public/css/odn_theme.css index 8e717ae..a451e23 100644 --- a/ckanext/odn_theme/public/css/odn_theme.css +++ b/ckanext/odn_theme/public/css/odn_theme.css @@ -121,7 +121,6 @@ h3.dataset-heading { line-height: inherit; } .group-list .dataset-content { min-height: 0; } .group-list .dataset-content { float: left; } .dataset-resources { margin-top: 0; } -.label[data-format="zip"], .label[data-format*="zip"] { margin-right:10px; } h3.dataset-heading, h3.media-heading { font-size: 14px; } .module-image { height: auto; line-height:inherit; margin-right:0; } From 1e14106c9b8a066a2d0045f93311c5c949613d53 Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Tue, 20 Oct 2015 12:48:13 +0200 Subject: [PATCH 7/8] OpenDataNode/open-data-node#222 - Tolls menu after mouse over hiding menu item --- ckanext/odn_theme_ic/public/css/odn_theme_ic.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckanext/odn_theme_ic/public/css/odn_theme_ic.css b/ckanext/odn_theme_ic/public/css/odn_theme_ic.css index 7520c86..075a5ab 100644 --- a/ckanext/odn_theme_ic/public/css/odn_theme_ic.css +++ b/ckanext/odn_theme_ic/public/css/odn_theme_ic.css @@ -47,6 +47,6 @@ color: #514b33; } -.dropdown-menu>li>a:hover { - color: #cc3700; +.masthead .navigation .nav-pills .dropdown > ul > li > a:hover { + background: #005d7a; } \ No newline at end of file From f95499b41e321c4c56f2cc472be788224eaf005b Mon Sep 17 00:00:00 2001 From: Jan Marcek Date: Tue, 20 Oct 2015 13:30:19 +0200 Subject: [PATCH 8/8] set version & update changelog --- CHANGELOG.rst | 3 ++- setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f918f5f..909187b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,7 +5,8 @@ v1.2.1 2015-10-7 Bug fixes: * i18n updates - + * layout fixes - formatting of icons looks strange + * Tolls menu after mouse over hiding menu item. v1.2.0 2015-9-11 diff --git a/setup.py b/setup.py index 22815e4..ff97b61 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import sys, os -version = '1.2.1-SNAPSHOT' +version = '1.2.1' setup( name='ckanext-odn-theme',