Skip to content
Snippets Groups Projects
Commit 7fff1b1f authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

Merge branch 'develop' into 'master' 

[release] Regular merge of develop

See merge request !215
parents 97047e34 c6634b83
No related branches found
No related tags found
4 merge requests!245Integrate data upload cloud,!235Integrate data upload cloud,!224Fixing a couple of issues in the redesign,!215[release] Regular merge of develop
Pipeline #35555 passed
Hide whitespace changes
Inline Side-by-side
.ci/generateIndex.py
+ 3
− 2
View file @ 7fff1b1f
......@@ -197,12 +197,13 @@ for s in sections:
index += "\n</div>"
## add link to return to main index
index += "<br><center><a href='/'>Overview of all HowTo cards</a></center>"
index += "<br><center><a href='/'>go back</a></center>"
index += "<br><center><a href='/cards'>Overview of all HowTo cards</a></center>"
# output the index
#print(index)
# Read in the file
indexFile = "index.md"
indexFile = "cards.md"
filedata = ""
with open(indexFile, 'r') as file :
for line in file:
......
.gitlab-ci.yml
+ 2
− 2
View file @ 7fff1b1f
......@@ -22,7 +22,7 @@ prepare:index:
script:
- python .ci/generateIndex.py
- mkdir .tmp
- cp index.md .tmp/.
- cp cards.md .tmp/.
artifacts:
expire_in: 1 day
paths:
......@@ -47,7 +47,7 @@ save:commitIndex:
- git config user.email $GIT_ACCESS_EMAIL
script:
# copy the index and remove the temporary directory
- cp .tmp/index.md .
- cp .tmp/cards.md .
- rm -rf .tmp
# commit
......
assets/js/landing.js
+ 29
− 17
View file @ 7fff1b1f
......@@ -16,7 +16,7 @@ window.pinned_cards = [
let create_card = function(icon, title, caption, link) {
let new_div = document.createElement('div');
new_div.innerHTML = `
<a class="card-link card-dynamic" href="${link}">
<a class="card-link card-dynamic" ondragstart="window.cardDragStart(event)" ondragend="window.cardDragEnd(event)" href="${link}">
<div class="card" draggable="True" ondragstart="window.cardDragStart(event)" ondragend="window.cardDragEnd(event)" data-icon='${icon}' data-title='${title}' data-caption='${caption}' data-link="${link}">
<div class="card-header">
<div class="card-icon">${icon}</div>
......@@ -33,8 +33,8 @@ let create_card = function(icon, title, caption, link) {
let create_pinned_card = function(icon, title, caption, link) {
let new_div = document.createElement('div');
new_div.innerHTML = `
<a class="card-link card-dynamic-pinned" href="${link}">
<div class="card-pinned" draggable="True" ondragstart="window.pinnedCardDragStart(event)" ondragend="window.pinnedCardDragEnd(event)" data-icon='${icon}' data-title='${title}' data-caption='${caption}' data-link="${link}">
<a class="card-link card-dynamic-pinned" ondragstart="window.pinnedCardDragStart(event)" ondragend="window.pinnedCardDragEnd(event)" href="${link}">
<div class="card-pinned" draggable="True" draggable="false" ondragstart="window.pinnedCardDragStart(event)" ondragend="window.pinnedCardDragEnd(event)" data-icon='${icon}' data-title='${title}' data-caption='${caption}' data-link="${link}">
<div class="card-header">
<div class="card-icon">${icon}</div>
</div>
......@@ -77,17 +77,21 @@ let remove_from_list = function(the_list, the_object, key) {
}
// ============= DRAG&DROP functions ========================================
window.cardDragStart = function(event) {
var target = event.target;
if (target.nodeName == 'A') {
target = target.firstElementChild;
}
// First, attach classes for animations
event.target.classList.add('card-dragged');
event.target.children[0].classList.add('card-dragged');
event.target.children[1].classList.add('card-dragged');
target.classList.add('card-dragged');
target.children[1].classList.add('card-dragged');
target.children[0].classList.add('card-dragged');
$right_inner_container.classList.add('droppable');
// Attach data about the card to drag&drop event
let card = {
"title": event.target.dataset['title'],
"icon": event.target.dataset['icon'],
"caption": event.target.dataset['caption'],
"link": event.target.dataset['link'],
"title": target.dataset['title'],
"icon": target.dataset['icon'],
"caption": target.dataset['caption'],
"link": target.dataset['link'],
"type": "big"
}
event.dataTransfer.setData("card", JSON.stringify(card));
......@@ -96,20 +100,28 @@ window.cardDragStart = function(event) {
return true;
}
window.cardDragEnd = function(event) {
event.target.classList.remove('card-dragged');
event.target.children[0].classList.remove('card-dragged');
event.target.children[1].classList.remove('card-dragged');
var target = event.target;
if (target.nodeName == 'A') {
target = target.firstElementChild;
}
target.classList.remove('card-dragged');
target.children[1].classList.remove('card-dragged');
target.children[0].classList.remove('card-dragged');
$right_inner_container.classList.remove('droppable');
return true;
}
window.pinnedCardDragStart = function(event) {
var target = event.target;
if (target.nodeName == 'A') {
target = target.firstElementChild;
}
$left_inner_container.classList.add('droppable');
// Attach data about the card to drag&drop event
let card = {
"title": event.target.dataset['title'],
"icon": event.target.dataset['icon'],
"caption": event.target.dataset['caption'],
"link": event.target.dataset['link'],
"title": target.dataset['title'],
"icon": target.dataset['icon'],
"caption": target.dataset['caption'],
"link": target.dataset['link'],
"type": "small"
}
event.dataTransfer.setData("card", JSON.stringify(card));
......
cards.md 0 → 100644
+ 67
− 0
View file @ 7fff1b1f
---
layout: default
title: Cards
order: -1
---
{% include scripts.html %}
<style>
.noborderbox {
border :0;
}
</style>
<!-- index -->
<div class="index-box-container">
<div class="index-box noborderbox" id="access">
<h3>Access</h3>
<ul>
<li><a href="external/access/harrenhal-access">HARRENHAL access</a></li>
<li><a href="external/access/lums-passwords">LUMS account</a></li>
<li><a href="external/access/passwords">Managing your passwords</a></li>
<li><a href="external/access/vpn-cerbere-access">VPN/CERBERE connection</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="contribute">
<h3>Contribute</h3>
<ul>
<li><a href="external/contribute/add-edit-card">How to add or edit a howto card</a></li>
<li><a href="external/contribute/git-clients">Git clients</a></li>
<li><a href="external/contribute/install-git">Installation of Git</a></li>
<li><a href="external/contribute/markdown">Markdown</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="exchange-channels">
<h3>Exchange channels</h3>
<ul>
<li><a href="external/exchange-channels/asperaweb">AsperaWEB Quick Guide</a></li>
<li><a href="external/exchange-channels/calendar">Sharing calendar in Microsoft Exchange</a></li>
<li><a href="external/exchange-channels/owncloud">Owncloud</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="general">
<h3>General</h3>
<ul>
<li><a href="external/general/attend-webex">Attend the LCSB Team Meeting online (webex)</a></li>
<li><a href="external/general/remote-working">Work remotely</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="integrity">
<h3>Integrity</h3>
<ul>
<li><a href="external/integrity/checksum">Ensuring Integrity of Data Files with Checksums</a></li>
<li><a href="external/integrity/encryption/disk">Encrypting the Startup Disk for Your Laptop/Desktop</a></li>
<li><a href="external/integrity/encryption/file">Encrypting Files and Folders</a></li>
<li><a href="external/integrity/naming">Naming files</a></li>
<li><a href="external/integrity/organization">Organization</a></li>
</ul>
</div>
</div><br><center><a href='/'>go back</a></center><br><center><a href='/cards'>Overview of all HowTo cards</a></center>
\ No newline at end of file
index.md
+ 45
− 62
View file @ 7fff1b1f
---
layout: default
layout: landing
title: Home
order: 1
---
{% include scripts.html %}
<style>
.noborderbox {
border :0;
}
</style>
<!-- index -->
<div class="index-box-container">
<div class="index-box noborderbox" id="access">
<h3>Access</h3>
<ul>
<li><a href="external/access/harrenhal-access">HARRENHAL access</a></li>
<li><a href="external/access/lums-passwords">LUMS account</a></li>
<li><a href="external/access/passwords">Managing your passwords</a></li>
<li><a href="external/access/vpn-cerbere-access">VPN/CERBERE connection</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="contribute">
<h3>Contribute</h3>
<ul>
<li><a href="external/contribute/add-edit-card">How to add or edit a howto card</a></li>
<li><a href="external/contribute/git-clients">Git clients</a></li>
<li><a href="external/contribute/install-git">Installation of Git</a></li>
<li><a href="external/contribute/markdown">Markdown</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="exchange-channels">
<h3>Exchange channels</h3>
<ul>
<li><a href="external/exchange-channels/asperaweb">AsperaWEB Quick Guide</a></li>
<li><a href="external/exchange-channels/calendar">Sharing calendar in Microsoft Exchange</a></li>
<li><a href="external/exchange-channels/owncloud">Owncloud</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="general">
<h3>General</h3>
<ul>
<li><a href="external/general/attend-webex">Attend the LCSB Team Meeting online (webex)</a></li>
<li><a href="external/general/remote-working">Work remotely</a></li>
</ul>
</div>
<div class="index-box noborderbox" id="integrity">
<h3>Integrity</h3>
<ul>
<li><a href="external/integrity/checksum">Ensuring Integrity of Data Files with Checksums</a></li>
<li><a href="external/integrity/encryption/disk">Encrypting the Startup Disk for Your Laptop/Desktop</a></li>
<li><a href="external/integrity/encryption/file">Encrypting Files and Folders</a></li>
<li><a href="external/integrity/naming">Naming files</a></li>
<li><a href="external/integrity/organization">Organization</a></li>
</ul>
</div>
</div><br><center><a href='/'>Overview of all HowTo cards</a></center>
\ No newline at end of file
{% comment %}
The Bioinformatics Core and Lab Support teams assist researchers from the Luxembourg Centre for Systems Biomedicine ([LCSB](https://www.uni.lu/lcsb)) with the organization, management, and curation of research data through its R3 initiative.
The How-to cards are intended to provide practical guidance in implementing Data Management, Data Protection, IT setup, lab support, and others.
{% endcomment %}
<script>
window.cards = [
{
"title": "General",
"caption": "I need information on LCSB operations",
"icon": "<i class=\"large material-icons\">sticky_note_2</i>",
"link": "/cards#general"
},
{
"title": "Access",
"caption": "How can I get access to systems and infrastructure?",
"icon": "<i class=\"large material-icons\">login</i>",
"link": "/cards#access"
},
{
"title": "Contribute",
"caption": "I want to share my knowledge and expertise. How?",
"icon": "<i class=\"large material-icons\">add_circle</i>",
"link": "/cards#contribute"
},
{
"title": "Exchange channels",
"caption": "I am looking to share data or information",
"icon": "<i class=\"large material-icons\">multiple_stop</i>",
"link": "/cards#exchange-channels"
},
{
"title": "Integrity",
"caption": "I want to ensure that my work and research is compliant and reusable",
"icon": "<i class=\"large material-icons\">vpn_key</i>",
"link": "/cards#integrity"
},
];
document.addEventListener('DOMContentLoaded', function() {
window.start_cards();
}, false);
</script>
landing.md deleted 100644 → 0
+ 0
− 50
View file @ 97047e34
---
layout: landing
title: Home
order: -1
---
{% comment %}
The Bioinformatics Core and Lab Support teams assist researchers from the Luxembourg Centre for Systems Biomedicine ([LCSB](https://www.uni.lu/lcsb)) with the organization, management, and curation of research data through its R3 initiative.
The How-to cards are intended to provide practical guidance in implementing Data Management, Data Protection, IT setup, lab support, and others.
{% endcomment %}
<script>
window.cards = [
{
"title": "General",
"caption": "I need information on LCSB operations",
"icon": "<i class=\"large material-icons\">sticky_note_2</i>",
"link": "/#general"
},
{
"title": "Access",
"caption": "How can I get access to systems and infrastructure?",
"icon": "<i class=\"large material-icons\">login</i>",
"link": "/#access"
},
{
"title": "Contribute",
"caption": "I want to share my knowledge and expertise. How?",
"icon": "<i class=\"large material-icons\">add_circle</i>",
"link": "/#contribute"
},
{
"title": "Exchange channels",
"caption": "I am looking to share data or information",
"icon": "<i class=\"large material-icons\">multiple_stop</i>",
"link": "/#exchange-channels"
},
{
"title": "Integrity",
"caption": "I want to ensure that my work and research is compliant and reusable",
"icon": "<i class=\"large material-icons\">vpn_key</i>",
"link": "/#integrity"
},
];
document.addEventListener('DOMContentLoaded', function() {
window.start_cards();
}, false);
</script>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment