inject map link html

draw map icon only on demand
style changes
2025-03-21 22:44:51 +03:00 · 2025-03-21 22:44:36 +03:00 · 2025-03-21 22:44:11 +03:00 · 2025-03-21 22:43:38 +03:00 · 2025-03-21 22:43:21 +03:00
5 changed files with 91 additions and 25 deletions
--- a/static/Abaev_logo.png
+++ b/static/Abaev_logo.png
--- a/static/abaev-html.css
+++ b/static/abaev-html.css
@ -32,18 +32,69 @@ h6 {}
 body > header {
    position: sticky;
    top: 0;
-    background: white;
-    border-bottom-width: thin;
-    border-bottom-style: solid;
+    background-color: #FCF9F5;
+    margin-left: 0;
+    margin-right: 0;
+    width: 100vw !important;
+    max-width: 100vw;
+/*    border-bottom-width: thin;
+    border-bottom-style: solid;*/
    padding-bottom: 0px !important;
+    margin-bottom: 0px !important;
    padding-top: 0px !important;
-    padding-right: 1em !important;
-    padding-left: 1em !important;
+/*    padding-right: 1em !important;
+    padding-left: 1em !important;*/
 /*     color: #f1f1f1; */
 }

-nav {}
+@media (min-width:576px) {
+  body>footer>nav,
+  body>header>nav {
+    max-width:510px;
+    padding-right:0;
+    padding-left:0
+  }
+}
+@media (min-width:768px) {
+  body>footer>nav,
+  body>header>nav {
+    max-width:700px
+  }
+}
+@media (min-width:1024px) {
+  body>footer>nav,
+  body>header>nav {
+    max-width:950px
+  }
+}
+@media (min-width:1280px) {
+  body>footer>nav,
+  body>header>nav {
+    max-width:1200px
+  }
+}
+@media (min-width:1536px) {
+  body>footer>nav,
+  body>header>nav {
+    max-width:1450px
+  }
+}
+
+body>header>nav,
+body>footer>nav {
+    margin: auto;
+    --pico-primary: #8D0B02 !important;
+    --pico-primary-hover: #cd5c5c !important;
+}
+body>footer>nav {
+    border-top-width: thin;
+    border-top-style: solid;
+}
 nav ul, nav ol {}
+nav ul.abv-brand {
+    border-bottom-width: thin;
+    border-bottom-style: solid;
+}
 nav li {}
 nav a {}
 nav a:visited {}
@ -85,16 +136,21 @@ aside#leftbar {

 search {}

-body > footer {
+body>footer {
    position: sticky;
+    width: 100vw !important;
+    max-width: 100vw;
    bottom: 0;
-    background: white;
-    border-top-width: thin;
-    border-top-style: solid;
+    background-color: #FCF9F5;
+    /*border-top-width: thin;
+    border-top-style: solid;*/
    padding-top: 0px !important;
    padding-bottom: 0px !important;
 /*     color: #f1f1f1; */
 }
+body>footer>nav {
+    margin:auto;
+}

 address {}

@ -140,6 +196,14 @@ a:visited {}
 a:hover {}
 a:active {}

+a.abv-map img {
+    height: 2ex;
+}
+
+a.abv-map:hover {
+    cursor: pointer;
+}
+
 strong {}
 b {}

@ -191,6 +255,10 @@ Embedded content
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

 img {}
+img.abv-logo {
+    height: 7ex;
+}
+
 svg {}
 video {}
 canvas {}
--- a/static/map.png
+++ b/static/map.png
--- a/xq/restx_dict_cached.xq
+++ b/xq/restx_dict_cached.xq
@ -40,8 +40,9 @@ declare function page:head($title as xs:string, $script as node()* := ()) {
 declare function page:header($lang as xs:string, $href-other as xs:string) {
      <header>
        <nav>
-          <ul>
-            <li><strong>{
+          <ul class="abv-brand">
+            <li><img class="abv-logo" src="/static/Abaev_logo.png" alt="Abaevdict logo"></img>
+            <strong>{
              switch($lang)
              case 'ru' return 'ИЭСОЯ В.&#160;И.&#160;Абаева'
              default return 'Abaevdict'
@ -343,8 +344,15 @@ declare %rest:path("{$lang}/dict")
      <main>
        {for $doc at $i in $page:sorted
         where $i > ($p - 1) * $page:items and $i <= $p * $page:items
-         let $html := doc(`abaevdict_{$lang}/html/{$doc/@xml:id}.html`)
-         return $html}
+         let $html := doc(`abaevdict_{$lang}/html/{$doc/@xml:id}.html`) 
+         return if (doc('abaevdict_index/mentioned_en.xml')/
+                   lang-index/lang/word/entry[@id=string($doc/@xml:id)]) then
+                $html transform with {insert nodes (<br/>,
+                     <a class="abv-map" data-abv-entry="{$doc/@xml:id}">
+                     <img src="/static/map.png"></img></a>) as last 
+                     into ./article[1]/h6[1]}
+                else $html
+        }
      </main>
      
      <!--  Footer for page navigation --> 
@ -356,7 +364,7 @@ declare %rest:path("{$lang}/dict")
          </li>
        </ul>
        <!--   <ul><li>Page {$p} of {$page:total}</li></ul> -->
-        <ul>
+        <ul class="abv-nextpage">
          <li>
            {if ($p < $page:total) then 
            <a class="pagination__next" href="?page={$p + 1}">Next page</a> else ()}
--- a/xsl/abaev2html.xsl
+++ b/xsl/abaev2html.xsl
@ -39,16 +39,6 @@
                <xsl:when test="current-grouping-key()">
                  <h6 class="abv-headword">
                      <xsl:apply-templates select="current-group()"/>
-                      <br/>
-                      <a class="abv-map" href="#modal_map">
-                        <xsl:attribute name="data-abv-entry" select="$entry-id"/>
-                        <!-- map icon by Free Icons (https://free-icons.github.io/free-icons/) -->
-                        <svg xmlns="http://www.w3.org/2000/svg" height="1em" fill="currentColor" viewBox="0 0 512 512">
-                          <path
-                            d="M 160.88888888888889 57.77777777777778 Q 163.55555555555554 56.888888888888886 165.33333333333334 56.888888888888886 L 348.44444444444446 113.77777777777777 L 348.44444444444446 113.77777777777777 L 473.77777777777777 67.55555555555556 L 473.77777777777777 67.55555555555556 Q 488 63.111111111111114 499.55555555555554 71.11111111111111 Q 511.1111111111111 79.11111111111111 512 94.22222222222223 L 512 376 L 512 376 Q 511.1111111111111 395.55555555555554 493.3333333333333 402.6666666666667 L 351.1111111111111 455.1111111111111 L 351.1111111111111 455.1111111111111 Q 348.44444444444446 455.1111111111111 346.6666666666667 455.1111111111111 L 163.55555555555554 398.22222222222223 L 163.55555555555554 398.22222222222223 L 38.22222222222222 444.44444444444446 L 38.22222222222222 444.44444444444446 Q 24 448.8888888888889 12.444444444444445 440.8888888888889 Q 0.8888888888888888 432.8888888888889 0 417.77777777777777 L 0 136 L 0 136 Q 0.8888888888888888 116.44444444444444 18.666666666666668 109.33333333333333 L 160.88888888888889 57.77777777777778 L 160.88888888888889 57.77777777777778 Z M 24 122.66666666666667 Q 15.11111111111111 126.22222222222223 14.222222222222221 136 L 14.222222222222221 417.77777777777777 L 14.222222222222221 417.77777777777777 Q 14.222222222222221 424.8888888888889 20.444444444444443 429.3333333333333 Q 25.77777777777778 432.8888888888889 33.77777777777778 431.1111111111111 L 156.44444444444446 385.77777777777777 L 156.44444444444446 385.77777777777777 L 156.44444444444446 73.77777777777777 L 156.44444444444446 73.77777777777777 L 24 122.66666666666667 L 24 122.66666666666667 Z M 341.3333333333333 438.22222222222223 L 341.3333333333333 126.22222222222223 L 341.3333333333333 438.22222222222223 L 341.3333333333333 126.22222222222223 L 170.66666666666666 73.77777777777777 L 170.66666666666666 73.77777777777777 L 170.66666666666666 385.77777777777777 L 170.66666666666666 385.77777777777777 L 341.3333333333333 438.22222222222223 L 341.3333333333333 438.22222222222223 Z M 355.55555555555554 438.22222222222223 L 488.8888888888889 389.3333333333333 L 355.55555555555554 438.22222222222223 L 488.8888888888889 389.3333333333333 Q 496.8888888888889 385.77777777777777 497.77777777777777 376 L 497.77777777777777 94.22222222222223 L 497.77777777777777 94.22222222222223 Q 497.77777777777777 87.11111111111111 491.55555555555554 82.66666666666667 Q 486.22222222222223 79.11111111111111 479.1111111111111 80.88888888888889 L 355.55555555555554 126.22222222222223 L 355.55555555555554 126.22222222222223 L 355.55555555555554 438.22222222222223 L 355.55555555555554 438.22222222222223 Z"
-                          />
-                      </svg>
-                    </a>
                  </h6>
                </xsl:when>
                <xsl:otherwise>
Author	SHA1	Message	Date
Oleg Belyaev	d19a835055	inject map link html	2025-03-21 22:44:51 +03:00
Oleg Belyaev	04f2106615	draw map icon only on demand	2025-03-21 22:44:36 +03:00
Oleg Belyaev	d65ee65f55	style changes	2025-03-21 22:44:11 +03:00
Oleg Belyaev	d948035b15	coloured map	2025-03-21 22:43:38 +03:00
Oleg Belyaev	338d5da22c	logo by Anna Osipova	2025-03-21 22:43:21 +03:00