Přelinkovat cesty

Signed-off-by: Jakub Klímek <[email protected]>
datagov-cz · Mar 14, 2024 · 85b86e2 · 85b86e2
1 parent 25c3779
commit 85b86e2
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 94 deletions.
diff --git a/404.html b/404.html
@@ -5,7 +5,10 @@
 lang: cs
 ---
 
-  <div class="container">
-	<h1 class="header center orange-text">Stránka nenalezena</h1>
-	<p>Zkuste se vrátit na <a href="/">hlavní stránku</a>.</p>
-  </div>
+<gov-error-code>
+  <h2 class="gov-text--6xl">Stránka nenalezena</h2>
+  <p class="gov-text--l">Stránka, kterou hledáte, neexistuje.</p>
+  <gov-spacer size="l"></gov-spacer>
+  <gov-button variant="primary" size="m" type="solid" wcag-label="Na hlavní stránku">Na hlavní stránku</gov-button>
+  <gov-icon type="complex" name="card-404" slot="icon"></gov-icon>
+</gov-error-code>
diff --git a/_config.yml b/_config.yml
@@ -2,9 +2,10 @@
 title: Portál o datech České republiky
 
 description: Portál o datech a Národní katalog otevřených dat České republiky
-baseurl: "" # the subpath of your site, e.g. /blog
+
+#Změnit před nasazením!
+baseurl: "/data.gov.cz" # the subpath of your site, e.g. /blog.
 url: "https://data.gov.cz" # the base hostname & protocol for your site
-#develop: true
 
 # Build settings
 excerpt_separator: <!--more-->

diff --git a/_includes/footer.cs.html b/_includes/footer.cs.html
@@ -6,8 +6,8 @@
                 <gov-grid-item size-sm="12/12" size-md="4/12" role="listitem" size="12/12">
                     <h3 class="h6">Registrace do NKOD</h3>
                     <ul>
-                        <li><a href="{{base}}/formulář/registrace-datové-sady">Registrovat novou datovou sadu</a></li>
-                        <li><a href="{{base}}/formulář/registrace-lokálního-katalogu">Registrovat nový lokální katalog</a></li>
+                        <li><a href="{{baseurl}}/formulář/registrace-datové-sady">Registrovat novou datovou sadu</a></li>
+                        <li><a href="{{baseurl}}/formulář/registrace-lokálního-katalogu">Registrovat nový lokální katalog</a></li>
                         <li><a href="{{site.app_registration_form}}">Registrovat aplikaci využívající otevřená data</a></li>
                         <li><a href="{{site.suggestion_form}}">Registrovat návrh datové sady k otevření</a></li>
                     </ul>
@@ -23,22 +23,22 @@ <h3 class="h6">Kontakty</h3>
                 <gov-grid-item size-sm="12/12" size-md="4/12" role="listitem" size="12/12">
                     <h3 class="h6">Odkazy</h3>
                     <ul>
-                        <li><a href="{{base}}/novinky">Novinky</a></li>
-                        <li><a href="{{base}}/články">Články</a></li>
-                        <li><a href="{{base}}/vzdělávání">Vzdělávání</a></li>
-                        <li><a href="{{base}}/datové-sady">Národní katalog otevřených dat</a></li>
-                        <li><a href="{{base}}/poskytovatelé">Seznam poskytovatelů</a></li>
-                        <li><a href="{{base}}/datová-kvalita">Datová kvalita</a></li>
-                        <li><a href="{{base}}/výroční-zprávy">Výroční zprávy</a></li>
+                        <li><a href="{{baseurl}}/novinky">Novinky</a></li>
+                        <li><a href="{{baseurl}}/články">Články</a></li>
+                        <li><a href="{{baseurl}}/vzdělávání">Vzdělávání</a></li>
+                        <li><a href="{{baseurl}}/datové-sady">Národní katalog otevřených dat</a></li>
+                        <li><a href="{{baseurl}}/poskytovatelé">Seznam poskytovatelů</a></li>
+                        <li><a href="{{baseurl}}/datová-kvalita">Datová kvalita</a></li>
+                        <li><a href="{{baseurl}}/výroční-zprávy">Výroční zprávy</a></li>
                         <li><a href="https://github.com/datagov-cz/data.gov.cz">Web na GitHubu</a></li>
-                        <li><a href="{{base}}/prohlášení-o-přístupnosti">Prohlášení o přístupnosti</a></li>
+                        <li><a href="{{baseurl}}/prohlášení-o-přístupnosti">Prohlášení o přístupnosti</a></li>
                     </ul>
                 </gov-grid-item>
                 <gov-grid-item size-sm="12/12" size-md="4/12" role="listitem" size="12/12">
                     <h3 class="h6">Poděkování</h3>
                     <p>Tento web vznikl v rámci projektu <a href="https://www.esfcr.cz/projekty-opz/-/asset_publisher/ODuZumtPTtTa/content/implementace-strategii-v-oblasti-otevrenych-dat-ii">OPZ č. CZ.03.4.74/0.0/0.0/15_025/0004172</a> a je dále rozvíjen v rámci projektu <a href="https://www.esfcr.cz/projekty-opz/-/asset_publisher/ODuZumtPTtTa/content/rozvoj-datovych-politik-v-oblasti-zlepsovani-kvality-a-interoperability-dat-verejne-spravy">OPZ č. CZ.03.4.74/0.0/0.0/15_025/0013983</a>. Zvýšení počtu subjektů zveřejňujících otevřená data ve veřejné správě, kteří otevřená data zveřejňují v Národním katalogu otevřených dat byl spolufinancován z Národního plánu obnovy.</p>
                     <div class="bg-white shadow">
-                        <img alt="Národní plán obnovy" id="npologo" src="{{ "{{base}}/images/npo_cz.webp" | relative_url}}" width="300">
+                        <img alt="Národní plán obnovy" id="npologo" src="{{ "{{baseurl}}/images/npo_cz.webp" | relative_url}}" width="300">
                     </div>
                 </gov-grid-item>
             </gov-grid>

diff --git a/_includes/footer.en.html b/_includes/footer.en.html
@@ -6,8 +6,8 @@
 			<gov-grid-item size-sm="12/12" size-md="4/12" role="listitem" size="12/12">
 				<h3 class="h6">Registration in NKOD</h3>
 				<ul>
-					<li><a href="{{base}}/formulář/dataset-registration">Register a dataset</a></li>
-					<li><a href="{{base}}/formulář/local-catalog-registration">Register a new local catalog</a></li>
+					<li><a href="{{baseurl}}/formulář/dataset-registration">Register a dataset</a></li>
+					<li><a href="{{baseurl}}/formulář/local-catalog-registration">Register a new local catalog</a></li>
 					<li><a href="{{site.app_registration_form}}">Register an application using open data</a></li>
 					<li><a href="{{site.suggestion_form}}">Suggest data to be opened</a></li>
 				</ul>
@@ -23,21 +23,21 @@ <h3 class="h6">Contacts</h3>
 			<gov-grid-item size-sm="12/12" size-md="4/12" role="listitem" size="12/12">
 				<h3 class="h6">Links</h3>
 				<ul>
-					<li><a href="{{base}}/news">News archive</a></li>
-					<li><a href="{{base}}/datasets">National Open Data Catalog</a></li>
-					<li><a href="{{base}}/datasets">List of datasets</a></li>
-					<li><a href="{{base}}/publishers">List of publishers</a></li>
-					<li><a href="{{base}}/datová-kvalita">Data quality</a></li>
+					<li><a href="{{baseurl}}/news">News archive</a></li>
+					<li><a href="{{baseurl}}/datasets">National Open Data Catalog</a></li>
+					<li><a href="{{baseurl}}/datasets">List of datasets</a></li>
+					<li><a href="{{baseurl}}/publishers">List of publishers</a></li>
+					<li><a href="{{baseurl}}/datová-kvalita">Data quality</a></li>
 					<li><a href="https://docs.google.com/forms/d/e/1FAIpQLSdUaVaCITtmHdTGxsU5xPvdzIygOA7wHHaotPRPAbglCF3mpw/viewform">Suggest data to be opened</a></li>
 					<li><a href="https://github.com/datagov-cz/data.gov.cz">Web on GitHub</a></li>
-					<li><a href="{{base}}/prohlášení-o-přístupnosti">Declaration of accessibility (in Czech)</a></li>
+					<li><a href="{{baseurl}}/prohlášení-o-přístupnosti">Declaration of accessibility (in Czech)</a></li>
 				</ul>
 			</gov-grid-item>
 			<gov-grid-item size-sm="12/12" size-md="4/12" role="listitem" size="12/12">
 				<h3 class="h6">Acknowledgements</h3>
 				<p>This web was created thanks to the project OPZ number CZ.03.4.74/0.0/0.0/15_025/0004172 and is further developed as part of the project OPZ number CZ.03.4.74/0.0/0.0/15_025/0013983. Increase in the number of open data producers in the public administration publishing open data in the National Open Data Catalogue was co-financed from Recovery and Resilience Facility.</p>
 				<div>
-					<img alt="Czech Recovery Plan" id="npologo" src="{{ "{{base}}/images/npo_en.webp" | relative_url}}" width="300">
+					<img alt="Czech Recovery Plan" id="npologo" src="{{ "{{baseurl}}/images/npo_en.webp" | relative_url}}" width="300">
 				</div>
 			</gov-grid-item>
 		</gov-grid>

diff --git a/_includes/head.html b/_includes/head.html
@@ -2,40 +2,40 @@
   <script>
     window.GOV_DS_CONFIG = {
       "canValidateWcagOnRender": true,
-      "iconsPath": "{{base}}/assets/icons"
+      "iconsPath": "https://oha02.dia.gov.cz/design-system/assets/icons"
     };
   </script>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="theme-color" content="#057fa5">
   <meta name="msapplication-TileColor" content="#057fa5">
-  <meta name="msapplication-TileImage" content="{{base}}/images/favicons/ms-icon-144x144.png">
+  <meta name="msapplication-TileImage" content="{{baseurl}}/images/favicons/ms-icon-144x144.png">
   {% if page.homepage %}
   <meta name="google-site-verification" content="KV7DACYOedpCe1G92g1y_QXmmAh_G_tZhtY-atfeI1M" />
   {% endif%}
-  <link rel="apple-touch-icon" sizes="57x57" href="{{base}}/images/favicons/apple-icon-57x57.png">
-  <link rel="apple-touch-icon" sizes="60x60" href="{{base}}/images/favicons/apple-icon-60x60.png">
-  <link rel="apple-touch-icon" sizes="72x72" href="{{base}}/images/favicons/apple-icon-72x72.png">
-  <link rel="apple-touch-icon" sizes="76x76" href="{{base}}/images/favicons/apple-icon-76x76.png">
-  <link rel="apple-touch-icon" sizes="114x114" href="{{base}}/images/favicons/apple-icon-114x114.png">
-  <link rel="apple-touch-icon" sizes="120x120" href="{{base}}/images/favicons/apple-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="144x144" href="{{base}}/images/favicons/apple-icon-144x144.png">
-  <link rel="apple-touch-icon" sizes="152x152" href="{{base}}/images/favicons/apple-icon-152x152.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="{{base}}/images/favicons/apple-icon-180x180.png">
-  <link rel="icon" type="image/png" sizes="192x192"  href="{{base}}/images/favicons/android-icon-192x192.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="{{base}}/images/favicons/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="96x96" href="{{base}}/images/favicons/favicon-96x96.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="{{base}}/images/favicons/favicon-16x16.png">
-  <link rel="manifest" href="{{base}}/images/favicons/manifest.json">
+  <link rel="apple-touch-icon" sizes="57x57" href="{{baseurl}}/images/favicons/apple-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="{{baseurl}}/images/favicons/apple-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="{{baseurl}}/images/favicons/apple-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="{{baseurl}}/images/favicons/apple-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="{{baseurl}}/images/favicons/apple-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="{{baseurl}}/images/favicons/apple-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="{{baseurl}}/images/favicons/apple-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="{{baseurl}}/images/favicons/apple-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="{{baseurl}}/images/favicons/apple-icon-180x180.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="{{baseurl}}/images/favicons/android-icon-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="{{baseurl}}/images/favicons/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="{{baseurl}}/images/favicons/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="{{baseurl}}/images/favicons/favicon-16x16.png">
+  <link rel="manifest" href="{{baseurl}}/images/favicons/manifest.json">
 
   <title>{% if page.title %}{{ page.title | escape }} - {{ site.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}"/>
   {% if page.image %}<meta name="og:image" content="{{ page.image | remove: '..' | prepend: site.url}}"/>{% endif %}
 
-  <link rel="stylesheet" href="{{base}}/build/core.css">
-  <link rel="stylesheet" href="{{base}}/assets/fonts/roboto.css">
-  <script type="module" src="{{base}}/build/core.esm.js"></script>
-  <script nomodule src="{{base}}/build/core.js"></script>
+  <link rel="stylesheet" href="{{baseurl}}/build/core.css">
+  <link rel="stylesheet" href="{{baseurl}}/assets/fonts/roboto.css">
+  <script type="module" src="{{baseurl}}/build/core.esm.js"></script>
+  <script nomodule src="{{baseurl}}/build/core.js"></script>
 
 <!--  <link type="text/css" rel="stylesheet" href="{{ "/css/od.css" | prepend: site.baseurl }}">
   <link type="text/css" rel="stylesheet" href="{{ "/css/style-light.css" | prepend: site.baseurl }}">

diff --git a/_includes/nav.cs.html b/_includes/nav.cs.html
@@ -7,7 +7,7 @@ <h4>Portál o datech</h4>
 			Vzdělávání
 			</gov-nav-item>  
 			{% else %}
-			<gov-nav-item href="{{ "{{base}}/vzdělávání" | relative_url}}">
+			<gov-nav-item href="{{ "{{baseurl}}/vzdělávání" | relative_url}}">
 				Vzdělávání
 			</gov-nav-item>  
 		{% endif %}
@@ -16,7 +16,7 @@ <h4>Portál o datech</h4>
 			Články
 		</gov-nav-item>
 		{% else %}
-		<gov-nav-item href="{{ "{{base}}/články" | relative_url}}">
+		<gov-nav-item href="{{ "{{baseurl}}/články" | relative_url}}">
 			Články
 		</gov-nav-item>
 		{% endif %}
@@ -25,14 +25,14 @@ <h4>Portál o datech</h4>
 			Datová kvalita
 		</gov-nav-item>
 		{% else %}
-		<gov-nav-item href="{{ "{{base}}/datová-kvalita" | relative_url}}">
+		<gov-nav-item href="{{ "{{baseurl}}/datová-kvalita" | relative_url}}">
 			Datová kvalita
 		</gov-nav-item>
 		{% endif %}
-        <gov-nav-item href="{{base}}/datové-sady">
+        <gov-nav-item href="{{baseurl}}/datové-sady">
           Datové sady
         </gov-nav-item>
-        <gov-nav-item href="{{base}}/aplikace">
+        <gov-nav-item href="{{baseurl}}/aplikace">
           Aplikace
         </gov-nav-item>
         <gov-nav-item href="#">

diff --git a/_includes/nav.en.html b/_includes/nav.en.html
@@ -7,14 +7,14 @@ <h4>Czech Data Portal</h4>
 			News
 		</gov-nav-item>
 		{% else %}
-		<gov-nav-item href="{{ "{{base}}/news" | relative_url}}">
+		<gov-nav-item href="{{ "{{baseurl}}/news" | relative_url}}">
 			News
 		</gov-nav-item>
 		{% endif %}
-        <gov-nav-item href="{{base}}/datasets">
+        <gov-nav-item href="{{baseurl}}/datasets">
 			Datasets
         </gov-nav-item>
-        <gov-nav-item href="{{base}}/applications">
+        <gov-nav-item href="{{baseurl}}/applications">
 			Applications
         </gov-nav-item>
         <gov-nav-item href="#">

diff --git a/_includes/postnav.cs.html b/_includes/postnav.cs.html
@@ -2,19 +2,19 @@
     <gov-container>
 	  <h4>Portál o datech</h4>
       <gov-nav wcag-label="Hlavní navigace">
-		<gov-nav-item href="{{ "{{base}}/vzdělávání" | relative_url}}">
+		<gov-nav-item href="{{ "{{baseurl}}/vzdělávání" | relative_url}}">
 			Vzdělávání
 		</gov-nav-item>  
-		<gov-nav-item href="{{ "{{base}}/články" | relative_url}}">
+		<gov-nav-item href="{{ "{{baseurl}}/články" | relative_url}}">
 			Články
 		</gov-nav-item>
-		<gov-nav-item href="{{ "{{base}}/datová-kvalita" | relative_url}}">
+		<gov-nav-item href="{{ "{{baseurl}}/datová-kvalita" | relative_url}}">
 			Datová kvalita
 		</gov-nav-item>
-        <gov-nav-item href="{{base}}/datové-sady">
+        <gov-nav-item href="{{baseurl}}/datové-sady">
           Datové sady
         </gov-nav-item>
-        <gov-nav-item href="{{base}}/aplikace">
+        <gov-nav-item href="{{baseurl}}/aplikace">
           Aplikace
         </gov-nav-item>
         <gov-nav-item href="#">

diff --git a/_includes/postnav.en.html b/_includes/postnav.en.html
@@ -2,13 +2,13 @@
     <gov-container>
 	  <h4>Czech Data Portal</h4>
       <gov-nav wcag-label="Main navigation">
-		<gov-nav-item href="{{ "{{base}}/news" | relative_url}}">
+		<gov-nav-item href="{{ "{{baseurl}}/news" | relative_url}}">
 			News
 		</gov-nav-item>
-        <gov-nav-item href="{{base}}/datasets">
+        <gov-nav-item href="{{baseurl}}/datasets">
 			Datasets
         </gov-nav-item>
-        <gov-nav-item href="{{base}}/applications">
+        <gov-nav-item href="{{baseurl}}/applications">
 			Applications
         </gov-nav-item>
         <gov-nav-item href="#">

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,16 +1,4 @@
 <!DOCTYPE html>
-{% assign base = ''
-%}{% assign depth = page.url | split: '/' | size 
-%}{% if depth <= 1
-%}{% assign base = '.'
-%}{% elsif depth == 2
-%}{% assign base = '..'
-%}{% elsif depth == 3
-%}{% assign base = '../..'
-%}{% elsif depth == 4
-%}{% assign base = '../../..'
-%}{% endif
-%}
 <html lang="{{page.lang}}">
   {% include head.html %}
   <body>

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-{% assign base = '..'%}
 <html lang="{{page.lang}}">
   {% include head.html %}
   <body>

diff --git a/_layouts/redirect.html b/_layouts/redirect.html
@@ -2,24 +2,12 @@
 title: Přesměrování
 ---
 <!DOCTYPE html>
-{% assign base = ''
-%}{% if depth <= 1
-    %}{% assign depth = page.url | split: '/' | size 
-%}{% assign base = '.'
-%}{% elsif depth == 2
-%}{% assign base = '..'
-%}{% elsif depth == 3
-%}{% assign base = '../..'
-%}{% elsif depth == 4
-%}{% assign base = '../../..'
-%}{% endif
-%}
 <html lang="cs">
 <head>
   <script>
     window.GOV_DS_CONFIG = {
       "canValidateWcagOnRender": true,
-      "iconsPath": "/assets/icons"
+      "iconsPath": "https://oha02.dia.gov.cz/design-system/assets/icons"
     };
   </script>
   <meta charset="utf-8">
@@ -45,10 +33,10 @@
   <title>{% if page.title %}{{ page.title | escape }} - {{ site.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  <link rel="stylesheet" href="{{base}}/build/core.css">
-  <link rel="stylesheet" href="{{base}}/assets/fonts/roboto.css">
-  <script type="module" src="{{base}}/build/core.esm.js"></script>
-  <script nomodule src="{{base}}/build/core.js"></script>
+  <link rel="stylesheet" href="{{baseurl}}/build/core.css">
+  <link rel="stylesheet" href="{{baseurl}}/assets/fonts/roboto.css">
+  <script type="module" src="{{baseurl}}/build/core.esm.js"></script>
+  <script nomodule src="{{baseurl}}/build/core.js"></script>
 
   <link rel="canonical" href="{{page.redirect.to}}">
   <meta http-equiv="refresh" content="0; url={{page.redirect.to}}">

diff --git a/english/index.html b/english/index.html
@@ -64,4 +64,4 @@ <h3 slot="title">Data users</h3>
 	</gov-tiles>
 </gov-container>
 
-<script src="{{base}}/js/stats.js"></script>
+<script src="{{baseurl}}/js/stats.js"></script>
diff --git a/index.html b/index.html
@@ -91,4 +91,4 @@ <h3 slot="title">Uživatelé dat</h3>
 	</gov-tiles>
 </gov-container>
 
-<script src="{{base}}/js/stats.js" ></script>
+<script src="{{baseurl}}/js/stats.js" ></script>