Commit 3cbe4bf1 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request R3/howto-cards!237
parents 671b81d9 b84ea778
...@@ -42,14 +42,21 @@ ...@@ -42,14 +42,21 @@
<main class="page-content" aria-label="Content" style="margin-right: 0%"> <main class="page-content" aria-label="Content" style="margin-right: 0%">
{% if site.internal %} {% if site.internal %}
<div class="indicator tooltip" id="external-indicator"> <div class="indicator tooltip" id="external-indicator">
<i class="material-icons">verified</i> <p>
External
<i class="material-icons">info</i>
</p>
<span class="tooltip-text"> <span class="tooltip-text">
You are connected to the uni.lu network. <br />You see all the cards. You are connected to the uni.lu network. <br />You see all the cards.
</span> </span>
</div> </div>
{% else %} {% else %}
<div class="indicator tooltip" id="internal-indicator"> <div class="indicator tooltip" id="internal-indicator">
<i class="material-icons">pending</i> <p>
External
<i class="material-icons">info</i>
</p>
<span class="tooltip-text"> <span class="tooltip-text">
You are <strong>not connected</strong> to the uni.lu network. <br />You can see only publicly available cards. <br />In order to see all, please connect to the university network via VPN. You are <strong>not connected</strong> to the uni.lu network. <br />You can see only publicly available cards. <br />In order to see all, please connect to the university network via VPN.
</span> </span>
......
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
/* ==================================================== */ /* ==================================================== */
div.search-bar { div.search-bar {
width: 60%; width: 60%;
margin-left: 20%; margin-left: 12%;
display: flex; display: flex;
} }
@media (max-width: 1080px) { @media (max-width: 1080px) {
...@@ -300,19 +300,31 @@ div.search-bar { ...@@ -300,19 +300,31 @@ div.search-bar {
.indicator { .indicator {
position: absolute; position: absolute;
top: 190px; top: 190px;
right: 75px; right: 59px;
color: #d6d6d6; color: #d6d6d6;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
} }
@media (max-width: 1080px) { @media (max-width: 1080px) {
.indicator { .indicator {
top: 40px; top: 128px;
right: 20px; right: 72px;
} }
} }
.indicator > i { @media (max-width: 650px) {
font-size: 36px; .indicator {
top: 50px;
right: 50px;
}
}
.indicator > p > i {
font-size: 20px;
position: relative;
top: 5px;
left: 5px;
}
.indicator > p {
font-size: 14px;
} }
/* ==================================================== */ /* ==================================================== */
/* Tooltip */ /* Tooltip */
...@@ -321,7 +333,7 @@ div.search-bar { ...@@ -321,7 +333,7 @@ div.search-bar {
visibility: hidden; visibility: hidden;
width: 400px; width: 400px;
right: 120%; right: 120%;
top: -15px; top: -43px;
background-color: var(--tooltip-bg); background-color: var(--tooltip-bg);
color: var(--secondary-color); color: var(--secondary-color);
text-align: center; text-align: center;
......
...@@ -38,7 +38,7 @@ window.boxHider = (function() { ...@@ -38,7 +38,7 @@ window.boxHider = (function() {
} }
} }
function UnhideElement(element) { function ShowElement(element) {
if (element instanceof HTMLElement) { if (element instanceof HTMLElement) {
element.style['display'] = 'inline-block'; element.style['display'] = 'inline-block';
} }
...@@ -52,7 +52,7 @@ window.boxHider = (function() { ...@@ -52,7 +52,7 @@ window.boxHider = (function() {
function ShowAllBoxes() { function ShowAllBoxes() {
var allBoxes = GetAllBoxElementsArray(); var allBoxes = GetAllBoxElementsArray();
allBoxes.map(function(box) { allBoxes.map(function(box) {
UnhideElement(box); ShowElement(box);
}); });
} }
...@@ -74,17 +74,22 @@ window.boxHider = (function() { ...@@ -74,17 +74,22 @@ window.boxHider = (function() {
// Hide the "All Categories" element // Hide the "All Categories" element
HideAllCategories(); HideAllCategories();
// Finally, hide all boxes except of the selected one // Finally, hide all boxes except of the selected one
// Moreover, make sure that the selected boxes are displayed.
var allBoxes = GetAllBoxElementsArray(); var allBoxes = GetAllBoxElementsArray();
if (boxId.startsWith('handbook')) { if (boxId.startsWith('handbook')) {
allBoxes.map(function(box) { allBoxes.map(function(box) {
if (!box.id.startsWith('handbook')) { if (!box.id.startsWith('handbook')) {
HideElement(box); HideElement(box);
} else {
ShowElement(box);
} }
}); });
} else { } else {
allBoxes.map(function(box) { allBoxes.map(function(box) {
if (box != selectedBox) { if (box != selectedBox) {
HideElement(box); HideElement(box);
} else {
ShowElement(box);
} }
}); });
} }
......
...@@ -12,6 +12,21 @@ order: -1 ...@@ -12,6 +12,21 @@ order: -1
} }
</style> </style>
{% comment %}
This code adds CSS that hides the index-boxes by default.
It's in javascript, so that it doesn't effect the browsers with javascript disabled.
How the correct boxes are shown then? box_hider.js shows them
{% endcomment %}
<script>
var element = document.createElement('style');
var content = document.createTextNode(".index-box {display: none;}");
var head = document.getElementsByTagName('head');
if (head.length > 0) {
element.appendChild(content);
head[0].appendChild(element);
}
</script>
<!-- index --> <!-- index -->
<div class="index-box-container"> <div class="index-box-container">
...@@ -58,6 +73,7 @@ order: -1 ...@@ -58,6 +73,7 @@ order: -1
<h3>Integrity</h3> <h3>Integrity</h3>
<ul> <ul>
<li><a href="external/integrity/checksum">Ensuring Integrity of Data Files with Checksums</a></li> <li><a href="external/integrity/checksum">Ensuring Integrity of Data Files with Checksums</a></li>
<li><a href="external/integrity/encryption/cloud">Data upload to cloud</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/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/encryption/file">Encrypting Files and Folders</a></li>
<li><a href="external/integrity/naming">Naming files</a></li> <li><a href="external/integrity/naming">Naming files</a></li>
......
---
layout: page
permalink: /external/integrity/encryption/cloud/
shortcut: integrity:encryption:cloud
redirect_from:
- /cards/integrity:encryption:cloud
- /external/cards/integrity:encryption:cloud
---
# Data upload to cloud
Data encryption and hash-check for uploading to UL-LCSB onedrive or owncloud
[Windows](https://git-r3lab.uni.lu/transmed/support/data-upload-to-cloud/-/wikis/Upload-data-from-Windows)
Supports Markdown
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