update csLink to v2, closes #450

Edirom · Jan 8, 2024 · 47c005e · 47c005e
1 parent e5da932
commit 47c005e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/modules/app.xqm b/modules/app.xqm
@@ -1682,7 +1682,8 @@ declare
             attribute data-selection-when {"before-after"},
             attribute data-selection-span {"median-before-after"},
             attribute data-result-max {"4"},
-            attribute data-exclude-edition {"#WEGA"}            
+            attribute data-exclude-edition {"#" || config:get-option('cmifID')},
+            attribute data-language {$lang}            
 }
 };
 

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "bootstrap-hover-dropdown": "^2.2.1",
     "bootstrap-remote-data": "peterstadler/bootstrap-remote-data#master",
     "bravura": "https://github.com/steinbergmedia/bravura",
-    "csLink": "correspSearch/csLink",
+    "csLink": "correspSearch/csLink#v2.0.0",
     "datatables.net": "^1.11.3",
     "datatables.net-bs4": "^1.11.3",
     "datatables.net-buttons": "^2.1.1",
@@ -53,6 +53,7 @@
       "bootstrap/{build,dist,js,scss}",
       "bravura",
       "csLink/dist",
+      "csLink/static",
       "datatables.net",
       "datatables.net-bs4",
       "datatables.net-buttons",

diff --git a/resources/sass/components/_csLink.scss b/resources/sass/components/_csLink.scss
@@ -6,7 +6,7 @@
     }
 }
 
-.popover[id*='BV_popover'] {
+.popover[id*='bv_popover_3'] {
    table {
         font-size:unset;
    }
@@ -15,25 +15,18 @@
         padding-right: 2em;
    }
 
-   .popover-body [id*="_BVID_"].tabs {
-        max-height:400px;
-        padding: 10px;
-        .tab-content {
-            overflow-y:auto;
-            font-size:smaller;
-            p {
-                margin-bottom:unset;
-            }
-        }
+
+    .tab-content {
+        padding: 0.5rem 0.75rem;
     }
 
     .popover-header:empty {
         display:none; 
     }
 
     .nav {
-        margin:4px 0 4px 0;
         flex-wrap:nowrap;
+        background-color: #F5F5F5;
     }
 
     .nav-tabs li {
@@ -50,6 +43,7 @@
                 color:gray;
                 &.active {
                     border-bottom: 4px solid #0064bb;
+                    background-color: #F5F5F5;
                 }
             }
         }
@@ -58,4 +52,4 @@
     hr {
         margin: 4px 0 4px 0;
     }
-}
+}
diff --git a/templates/document.html b/templates/document.html
@@ -101,7 +101,7 @@ <h2>
                         <div id="kontext" class="panel-collapse collapse borderBox">
                                 <div data-template="app-shared:if-matches" data-template-key="docType" data-template-value="letters">            
                                     <div data-template="app:csLink"/>
-                                    <script type="text/javascript" src="$resources/lib/csLink/dist/static/js/cslink.js"/>                                
+                                    <script type="text/javascript" src="$resources/lib/csLink/dist/csLink.js"/>                                
                                 </div>
                             <div id="relatedItems" data-template="app-shared:if-exists" data-template-key="context-relatedItems">
                                 <h3 data-template="lang:translate">relatedItems</h3>

diff --git a/yarn.lock b/yarn.lock
@@ -458,7 +458,7 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-csLink@correspSearch/csLink:
+csLink@correspSearch/csLink#v2.0.0:
   version "1.1.1"
   resolved "https://codeload.github.com/correspSearch/csLink/tar.gz/c13112498a99f402248cce97164056687b72ae83"
   dependencies: