diff --git a/ckanext/odsh/commands/initialization.py b/ckanext/odsh/commands/initialization.py index 043d8e8f597b8bda26c765d05e6ab250849171e0..f15d9346a9d20710bbc4d475a8b52a2e8d8e43f4 100755 --- a/ckanext/odsh/commands/initialization.py +++ b/ckanext/odsh/commands/initialization.py @@ -113,7 +113,7 @@ class Initialization(CkanCommand): 'active': True, 'owner_org': "landeshauptstadt-kiel", 'frequency': "MANUAL", - 'notes': "Die Stadt Kiel ist die nördlichste Großstadt Deutschlands und die Landeshauptstadt Schleswig-Holsteins. Als kreisfreie Stadt erledigt sie neben den kommunalen Selbstverwaltungsaufgaben auch Aufgaben einer unteren staatlichen Verwaltungsbehörde und erzeugt, erhebt und verarbeitet als Gebietskörperschaft eine Vielzahl von Daten mit lokalem Bezug." + 'notes': u"Die Stadt Kiel ist die nördlichste Großstadt Deutschlands und die Landeshauptstadt Schleswig-Holsteins. Als kreisfreie Stadt erledigt sie neben den kommunalen Selbstverwaltungsaufgaben auch Aufgaben einer unteren staatlichen Verwaltungsbehörde und erzeugt, erhebt und verarbeitet als Gebietskörperschaft eine Vielzahl von Daten mit lokalem Bezug." }, "Statistisches Amt für Hamburg und Schleswig-Holstein - Anstalt des öffentlichen Rechts - (Statistikamt Nord)": { 'name': u"statistikamt-nord", diff --git a/ckanext/odsh/controller.py b/ckanext/odsh/controller.py index ba821838b3597c2d6031ec7da50f321fb49212b9..d339273dd3b453c0704f773d0089cbffec31acac 100644 --- a/ckanext/odsh/controller.py +++ b/ckanext/odsh/controller.py @@ -9,7 +9,7 @@ abort = base.abort class OdshRouteController(HomeController): def info_page(self): - return base.render('info_page.html') + h.redirect_to('https://preview-sh70.dpaorinp.de/DE/Schwerpunkte/openData/Infos/infos_node.html') def start(self): return base.render('start.html') diff --git a/ckanext/odsh/harvesters/statistikamtnordharvester.py b/ckanext/odsh/harvesters/statistikamtnordharvester.py index 003691cfcae566b1bb81c505d820f47c779f20a1..f6d06a341bffdc06b7581bf5131a0e53d914268f 100755 --- a/ckanext/odsh/harvesters/statistikamtnordharvester.py +++ b/ckanext/odsh/harvesters/statistikamtnordharvester.py @@ -163,11 +163,11 @@ class StatistikamtNordHarvester(ODSHBaseHarvester): package_dict.update({'licenseAttributionByText': 'Statistisches Amt für Hamburg und Schleswig-Holstein -' ' Anstalt des öffentlichen Rechts - (Statistikamt Nord)'}) - package_dict.update({'temporal_start': values['ZeitraumVon']}) - package_dict.update({'temporal_end': values['ZeitraumBis']}) + package_dict.update({'temporal_start': datetime.datetime.strptime(values['ZeitraumVon'], '%Y-%m-%d').isoformat()}) + package_dict.update({'temporal_end': datetime.datetime.strptime(values['ZeitraumBis'], '%Y-%m-%d').isoformat()}) package_dict.update({'spatial_uri': 'http://dcat-ap.de/def/politicalGeocoding/stateKey/01'}) # issued sollte noch geliefert werden! - package_dict.update({'issued': datetime.datetime.now()}) + package_dict.update({'issued': datetime.datetime.utcnow().isoformat()}) self.add_ressources(package_dict, values) self.add_tags(package_dict, values) diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo index b78ceec4f6a144574ce8a604425f7fe531d61b01..c18f411194b2c76da97372e439cf38554b0223d9 100644 Binary files a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo and b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo differ diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po index fba045b2488bff750543628d1d90b7eed9034bff..26f589326b67e8276f7bb3d24cf53517b66efaf6 100644 --- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po +++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po @@ -209,7 +209,7 @@ msgid "Tag string: Fehlender Wert" msgstr "Bitte wählen Sie geeignete Schlagwörter" msgid "odsh_resource_upload_error_label" -msgstr "Bitte laden Sie Ihren Datensatz hoch" +msgstr "Bitte laden Sie eine Distribution hoch" msgid "odsh_resource_name_error_label" msgstr "Bitte geben sie einen Namen für den Datensatz ein" diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css index 1f3ce784a8ffb97b523ae0feb63441fb78eb58bc..fe97be2bb15cf7f0d66f28e7807cba6ff0c8ae70 100644 --- a/ckanext/odsh/public/odsh.css +++ b/ckanext/odsh/public/odsh.css @@ -77,7 +77,7 @@ h3{ /* same width as schleswig-holstein.de */ .container { - width: 1000px; + width: 960px; } @media (max-width: 767px){ .container { @@ -372,6 +372,9 @@ label.rangesearch.disabled { padding: 20px 0px 20px 0px; border-bottom: 2px solid #DBDBDB; } +.container-fluid.odsh-dataset-item:hover { + background-color: rgb(246,247,249); +} .organization-item{ padding: 5px 0px 5px 0px; @@ -585,6 +588,8 @@ label:after { .controls textarea::placeholder { color: #657592!important } + + .slug-preview .btn.btn-mini, .btn.btn-primary{ background-image: none; @@ -641,6 +646,14 @@ label:after { background-color: rgb(212,0,75); color:white; } +.slug-preview .btn.disabled.btn-mini:hover, +.js .image-upload .btn.disabled.hover, +.image-upload a.btn.disabled:hover, +.image-upload .btn.disabled:hover, +.btn.disabled.btn-primary:hover{ + background-color: #0089ca; + color:white; +} .js .image-upload #field-image-url { padding-right: 0px; } @@ -663,6 +676,14 @@ label:after { font-weight: normal; font-size: 16px; } +.btn.disabled, .btn[disabled] { + cursor: default; + opacity: 0.65; + filter: alpha(opacity=65); + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} .btn:hover { background-color:#0089ca; color: white; @@ -1215,6 +1236,27 @@ body { font-weight: normal; border-top: 2px solid #dddddd; } +.dataset-map-expanded #dataset-map .module-heading{ + padding: 5px 0px 5px 5px; +} +.dataset-map-expanded #dataset-map +{ + width: 960px; +} +.dataset-map-expanded #dataset-map .module-heading{ + border-top: none; +} +#dataset-map-edit-buttons-text{ + display: none; +} + +.dataset-map-expanded #dataset-map-edit-buttons-text{ + width: 300px; + font-size: 12px; + display: block; + float: left; + padding: 12px; +} .module.module-narrow.dataset-map{ margin: 5px 0; } @@ -1298,6 +1340,22 @@ display: none; width: 20px; } +.home-title{ + font-size: 32px; + font-weight: normal; + color:#003064; +} + +.home-button{ + float:right; + margin-bottom: 20px; +} + +.home-page-content{ + width: 960px; + margin-left: auto; + margin-right: auto; +} .home-groups{ width: 100%; margin-top: 20px; @@ -1347,7 +1405,6 @@ display: none; position: relative; } -.dataset-map-expanded #dataset-map -{ - width: 960px; +.required-text{ + font-size: 14px; } \ No newline at end of file diff --git a/ckanext/odsh/public/odsh_header.css b/ckanext/odsh/public/odsh_header.css index 830cfdb369683ce73a950301fe112cf887ceac0c..c140285fb3a793a66b75c9bc396d9a819bbbe09c 100644 --- a/ckanext/odsh/public/odsh_header.css +++ b/ckanext/odsh/public/odsh_header.css @@ -2,7 +2,7 @@ /* same width as schleswig-holstein.de */ .navbar-static-top .container { - max-width: 1000px; + max-width: 960px; width: 100%; } .navbar-static-top .container.navigation-container{ @@ -108,7 +108,7 @@ } .navigation-row { - width: 1000px; + width: 960px; padding-left: 0px; margin-left: auto; margin-right: auto; diff --git a/ckanext/odsh/templates/home/index.html b/ckanext/odsh/templates/home/index.html index a2466176e575e97c4feb9361b9a5f020cabef787..ae3f5ce466c72fa65d70ca72663390bf3cf5ef9c 100644 --- a/ckanext/odsh/templates/home/index.html +++ b/ckanext/odsh/templates/home/index.html @@ -15,7 +15,12 @@ {% snippet "snippets/search_box.html"%} {% endblock %} -<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet</p> +<div class='home-page-content'> +<h2 class='home-title'>Open Data Schleswig-Holstein</h2> +<p>Wir fördern Transparenz und Innovation durch Veröffentlichung schleswig-holsteinischer Daten in offenen, freien und wiederverwendbaren Formaten.</p> +<a href="/dataset" class="btn btn-primary home-button"> +Datensätze entdecken +</a> {% for group_row in h.odsh_main_groups() | batch(3, '') %} <div class='home-groups'> <div class='home-groups-rows'> @@ -37,6 +42,7 @@ </div> </div> {% endfor %} +</div> {% endblock %} {% block secondary%} {% endblock %} \ No newline at end of file diff --git a/ckanext/odsh/templates/package/snippets/info.html b/ckanext/odsh/templates/package/snippets/info.html index aa8d02d0e4b360fa1415e8975401adfe96a04f8d..b6f4eabb3d752043f3fc94c97de0384d84e9f6f3 100644 --- a/ckanext/odsh/templates/package/snippets/info.html +++ b/ckanext/odsh/templates/package/snippets/info.html @@ -91,8 +91,8 @@ Example: <div>{{ _('borders of map') }}:</div> <p> {{ '{0:0.3f}'.format(bbox[0]).zfill(2).replace('.',',') }}° {{_('in east')}}</p> <p> {{ '{0:0.3f}'.format(bbox[1]).replace('.',',') }}° {{_('in west')}}</p> - <p> {{ '{0:0.3f}'.format(bbox[2]).replace('.',',') }}° {{_('in south')}}</p> - <p> {{ '{0:0.3f}'.format(bbox[3]).replace('.',',') }}° {{_('in north')}}</p> + <p> {{ '{0:0.3f}'.format(bbox[2]).replace('.',',') }}° {{_('in north')}}</p> + <p> {{ '{0:0.3f}'.format(bbox[3]).replace('.',',') }}° {{_('in south')}}</p> {% endif %} </div> {% endblock %} diff --git a/ckanext/odsh/templates/package/snippets/package_form.html b/ckanext/odsh/templates/package/snippets/package_form.html index 0867b2118b575108a24a6140324586ddd9d99155..9e5fe6a9c93b7ab9acefc793fb3c53bd10731203 100644 --- a/ckanext/odsh/templates/package/snippets/package_form.html +++ b/ckanext/odsh/templates/package/snippets/package_form.html @@ -43,4 +43,5 @@ then itself be extended to add/remove blocks of functionality. #} {% endblock %} </div> {% endblock %} + <span class='required-text'>*Pflichtangabe</span> </form> \ No newline at end of file diff --git a/ckanext/odsh/templates/package/snippets/resource_form.html b/ckanext/odsh/templates/package/snippets/resource_form.html index dd736974e4bfabeb731c87036acff359091c2f65..c32a5ebed6346d83cdbf54e0f0a3294f1e932a28 100644 --- a/ckanext/odsh/templates/package/snippets/resource_form.html +++ b/ckanext/odsh/templates/package/snippets/resource_form.html @@ -117,4 +117,5 @@ </div> </div> </div> + <span class='required-text'>*Pflichtangabe</span> </form> \ No newline at end of file diff --git a/ckanext/odsh/templates/snippets/search_form.html b/ckanext/odsh/templates/snippets/search_form.html index 40a7ff28ab76cdd55765e7e32b3769e9733fe51a..aa97eaf98ea94e72be4e46597bb6ccc3e8280e21 100644 --- a/ckanext/odsh/templates/snippets/search_form.html +++ b/ckanext/odsh/templates/snippets/search_form.html @@ -97,7 +97,7 @@ {%set ext_bbox=request.params.get('ext_bbox')%} {%set ext_prev_extent=request.params.get('ext_prev_extent')%} {%set ext_location=request.params.get('ext_location')%} - {% if ext_bbox or ext_prev_extent %} + {% if ext_bbox %} <p class="filter-list"> <span class="filtered pill"> {{_('map search active')}}