Changes for page People in ErUM-Data
Last modified by Benjamin Fischer on 2025/03/26 13:22
From version 28.10
edited by admin
on 2024/10/23 13:56
on 2024/10/23 13:56
Change comment:
There is no comment for this version
To version 37.1
edited by Benjamin Fischer
on 2025/01/06 11:07
on 2025/01/06 11:07
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Attachments (0 modified, 1 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. admin1 +XWiki.fischer - Content
-
... ... @@ -2,9 +2,12 @@ 2 2 ((( 3 3 With this collection we want to provide an overview of of various research groups and people in ErUM (data). 4 4 5 -The list thrives on being filled. If you want to be subscribed or unsubscribed from this list please contact [[judith.steinfeld@erumdatahub.de>>mailto:judith.steinfeld@erumdatahub.de]] 5 +The list thrives on being filled. If you want to be subscribed or unsubscribed from this list please contact [[judith.steinfeld@erumdatahub.de>>mailto:judith.steinfeld@erumdatahub.de]]. 6 +Feel free to add or modify your workinggroup yourself. For help, see this [[video>>attach:people_in_erum_final.mp4]]. 6 6 ))) 7 7 9 +{{locationSearch width="100%" className="Research Groups.Code.Research GroupsClass" reference="" description="Search, including in excerpts."/}} 10 + 8 8 {{velocity}} 9 9 #set ($columnsProperties = { 10 10 'affiliation': {"filterable":true, "sortable":true, "html":true}, ... ... @@ -11,6 +11,7 @@ 11 11 'URL': {"type": "hidden"}, 12 12 "content": {"type": "hidden"}, 13 13 "tags": {"sortable": false, "filterable": false, "html": true, "headerClass": "tagsCol"}, 17 + "doc.date": {"filterable": false, "displayName": "Last Updated"}, 14 14 '_actions': {"actions":["view","edit"]} 15 15 }) 16 16 #set ($options = { ... ... @@ -17,11 +17,11 @@ 17 17 'className': 'Research Groups.Code.Research GroupsClass', 18 18 'translationPrefix': 'research groups.livetable.', 19 19 'tagCloud': true, 20 - 'rowCount': 15,24 + 'rowCount': 25, 21 21 'maxPages': 10, 22 - 'selectedColumn': 'a ffiliation',23 - 'defaultOrder': ' asc'26 + 'selectedColumn': 'doc.date', 27 + 'defaultOrder': 'desc' 24 24 }) 25 -#set ($columns = ['affiliation', 'URL', "content", "tags", "tags", "tags", '_actions']) 26 -#livetable('research 29 +#set ($columns = ['affiliation', 'URL', "content", "tags", "tags", "tags", "doc.date", '_actions']) 30 +#livetable('research_groups' $columns $columnsProperties $options) 27 27 {{/velocity}}
- people_in_erum_final.mp4
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.JanBurger - Size
-
... ... @@ -1,0 +1,1 @@ 1 +1.8 MB - Content
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -1,7 +1,7 @@ 1 -const tabName = "research 1 +const tabName = "research_groups"; 2 2 const tagCols = [ 3 3 ["Community", "KAT", "KET", "KfB", "KFN", "KFS", "KFSI", "KHuK", "RDS", "beyond ErUM"], 4 - ["Experiment", "CMS", "ATLAS", "Belle2", "CTA", "Auger"], 4 + ["Experiment", "CMS", "ATLAS", "Belle2", "CTA", "Pierre Auger Observatory", "SKA", "IceCube", "KATRIN", "KASCADE", "GREGOR", "STELLA", "LOFAR", "LHCb", "LHC", "PETRA III", "PETRA IV", "PANDA", "Gaia", "Euclid", "BESSY II", "ANTARES", "H.E.S.S.", "KM3NeT", "FLASH", "Einstein Telescope"], 5 5 ["Tags", true], 6 6 ] 7 7 ... ... @@ -48,16 +48,16 @@ 48 48 for (const row of data.rows) { 49 49 const a = new Element("a", { href: row.URL }); 50 50 a.innerHTML = row.affiliation_value.split("\n").map((a, i) => i ? a : `<b class="wikiexternallink">${a}</b>`).join("<br/>"); 51 - if (row.content) { 52 - a.title = row.content; 53 - a.dataset.toggle = "tooltip"; 54 - //a.dataset.placement="left"; 55 - //a.dataset.html="true"; 51 + a.title = row.doc_title; 52 + if (row.content !== "-") { 53 + a.dataset.content = row.content; 54 + a.dataset.toggle = "popover"; 56 56 } 57 57 58 58 row.affiliation = a.outerHTML; 59 - delete a; 60 60 59 + row.doc_date = row.doc_date.split(" ")[0].split("/").slice(0, 2).join("/"); 60 + 61 61 // tags 62 62 const tags = new Set(row.tags_value.slice(1, -1).split(", ")); 63 63 tagCols.forEach(([name, ...want], i) => ... ... @@ -70,8 +70,19 @@ 70 70 } 71 71 }); 72 72 73 -document.observe(`xwiki:livetable:${tabName}:displayComplete`, () => { 74 - jQuery(`[id='${tabName}'] [data-toggle="tooltip"]`).tooltip({ html: true, placement: "right" }); 73 +require(['jquery', 'bootstrap'], function($) { 74 + document.styleSheets[0].insertRule(`#mainContentArea .popover {max-width: 50%;}`) 75 + 76 + const ttApply = () => { 77 + $(`#${tabName} [data-toggle="popover"]`).popover({ 78 + html: true, 79 + container: `#mainContentArea`, 80 + trigger: "hover", 81 + }); 82 + }; 83 + 84 + document.observe(`xwiki:livetable:${tabName}:displayComplete`, ttApply); 85 + ttApply(); 75 75 }); 76 76 77 77