diff --git a/.ci/generateIndex.py b/.ci/generateIndex.py
index 58109ba3c4d9f80c608072ccf72e5591de5c1fe4..1402f8a9749c447a82666822da6c817232204bfc 100644
--- a/.ci/generateIndex.py
+++ b/.ci/generateIndex.py
@@ -29,13 +29,27 @@ def root_handbook(href):
return href
+def root_lab(href):
+ # remove sym link reference in href
+ if ('lab-software' in href):
+ href = href.replace('lab-software', 'lab').strip()
+ elif ('lab-equipment' in href):
+ href = href.replace('lab-equipment', 'lab').strip()
+ elif ('lab-hsa' in href):
+ href = href.replace('lab-hsa', 'lab').strip()
+
+ return href
+
def build_section_start(title, shortcut):
title = title.replace("Gdpr", "GDPR")
- title = title.replace("Handbook additional", "PI/Supervisor specifics")
- title = title.replace("Handbook annexes", "Annexes")
+ title = title.replace("Handbook additional", "Handbook: PI/Supervisor specifics")
+ title = title.replace("Handbook annexes", "Handbook: Annexes")
title = title.replace("Covid 19", "COVID-19")
title = title.replace("Ppc", "PPC")
+ title = title.replace("Lab software", "Lab: Software")
+ title = title.replace("Lab equipment", "Lab: Equipment")
+ title = title.replace("Lab hsa", "Lab: Health & Safety, Access")
return f'\n\t<div class="index-box noborderbox" id="{shortcut}-card">\n\t\t<h3>{title}</h3>\n\t\t<ul>\n'
@@ -133,6 +147,50 @@ def remove_header(localroot, root, filename):
return n
+def generate_header(folder, permalink, shortcut, order, legacy_from):
+ header = "---\n"
+
+ if len(order) > 0:
+ header += "order: " + str(order) + "\n"
+
+ header += "layout: page\n"
+ header += "permalink: " + permalink + "\n"
+ header += "shortcut: " + root_handbook(shortcut) + "\n"
+ header += "redirect_from:\n"
+ header += " - /cards/" + shortcut + "\n"
+ header += " - /" + folder + "/cards/" + shortcut + "\n"
+ # special case of handbook
+ if "handbook-annexes" in permalink or "handbook-additional" in permalink:
+ header += " - /cards/" + root_handbook(shortcut) + "\n"
+ header += " - /" + folder + "/cards/" + root_handbook(shortcut) + "\n"
+ # separate lab section
+ if "lab-software" in permalink or "lab-equipment" in permalink or "lab-hsa" in permalink:
+ header += " - /cards/" + root_lab(shortcut) + "\n"
+ header += " - /" + folder + "/cards/" + root_lab(shortcut) + "\n"
+ # include the legacy section
+ if len(legacy_from) > 0:
+ for item in legacy_from:
+ header += str(item)
+ else:
+ header += "---"
+
+ return header
+
+def generate_whitelist_entry(folder, permalink, shortcut):
+ wl_entry = permalink + "\n"
+ wl_entry += "/?" + shortcut + "\n"
+ wl_entry += "/cards/" + shortcut + "\n"
+ wl_entry += "/" + folder + "/cards/" + shortcut + "\n"
+ if "handbook-annexes" in permalink or "handbook-additional" in permalink:
+ wl_entry += "/cards/" + root_handbook(shortcut) + "\n"
+ wl_entry += "/" + folder + "/cards/" + root_handbook(shortcut) + "\n"
+ # separate lab section
+ if "lab-software" in permalink or "lab-equipment" in permalink or "lab-hsa" in permalink:
+ wl_entry += "/cards/" + root_lab(shortcut) + "\n"
+ wl_entry += "/" + folder + "/cards/" + root_lab(shortcut) + "\n"
+
+ return wl_entry
+
# loop through the entire internal tree
localroot = os.getcwd()
@@ -214,14 +272,8 @@ for folder in cardDirs:
# replace the / with a :
shortcut = re.sub('/', ':', shortcut)
- # define the header for each card
- header = "---\n"
-
if len(order) > 0:
- header += "order: " + str(order) + "\n"
- # append the order of the card
- # find the maximum of existing orders
-
+ # find the maximum of existing orders
if folderFlag:
if len(orderArr[indexS]) > 0:
maxOrder = max(orderArr[indexS])
@@ -236,33 +288,11 @@ for folder in cardDirs:
else:
orderArr[indexS] = []
- header += "layout: page\n"
- header += "permalink: " + permalink + "\n"
- header += "shortcut: " + root_handbook(shortcut) + "\n"
- header += "redirect_from:\n"
- header += " - /cards/" + shortcut + "\n"
- header += " - /" + folder + "/cards/" + shortcut + "\n"
-
- # special case of handbook
- if "handbook-annexes" in permalink or "handbook-additional" in permalink:
- header += " - /cards/" + root_handbook(shortcut) + "\n"
- header += " - /" + folder + "/cards/" + root_handbook(shortcut) + "\n"
-
- # include the legacy section
- if len(legacy_from) > 0:
- for item in legacy_from:
- header += str(item)
- else:
- header += "---"
+ # generate the header for each card
+ header = generate_header(folder, permalink, shortcut, order, legacy_from)
# add autogenerated links to whitelist
- whiteList += permalink + "\n"
- whiteList += "/?" + shortcut + "\n"
- whiteList += "/cards/" +shortcut + "\n"
- whiteList += "/" + folder + "/cards/" + shortcut + "\n"
- if "handbook-annexes" in permalink or "handbook-additional" in permalink:
- whiteList += " - /cards/" + root_handbook(shortcut) + "\n"
- whiteList += " - /" + folder + "/cards/" + root_handbook(shortcut) + "\n"
+ whiteList += generate_whitelist_entry(folder, permalink, shortcut)
# add the header properly speaking
line_prepender(fileName, header)
diff --git a/assets/js/box_hider.js b/assets/js/box_hider.js
index 6a6160939771d51aac9a592260da0448dec13dcc..48aa48bdb0009749a279c59ef4143a08cc858af6 100644
--- a/assets/js/box_hider.js
+++ b/assets/js/box_hider.js
@@ -23,13 +23,17 @@ window.boxHider = (function() {
function GetSelectedBoxElement(id) {
var allBoxesArray = GetAllBoxElementsArray();
- var element = document.getElementById(id);
+ // note: handbook and lab are actually grouped sections
+ if (id.startsWith('handbook') || id.startsWith('lab')) {
+ return true;
+ } else {
+ var element = document.getElementById(id);
- if (allBoxesArray.includes(element)) {
- return element;
+ if (allBoxesArray.includes(element)) {
+ return element;
+ }
+ return false;
}
-
- return false;
}
function HideElement(element) {
@@ -84,6 +88,14 @@ window.boxHider = (function() {
ShowElement(box);
}
});
+ } else if (boxId.startsWith('lab')) {
+ allBoxes.map(function(box) {
+ if (!box.id.startsWith('lab')) {
+ HideElement(box);
+ } else {
+ ShowElement(box);
+ }
+ });
} else {
allBoxes.map(function(box) {
if (box != selectedBox) {
diff --git a/external/lab/dishwasher-utilization-and-maintenance/dishwasher-utilization-and-maintenance.md b/external/lab-equipment/dishwasher-utilization-and-maintenance/dishwasher-utilization-and-maintenance.md
similarity index 95%
rename from external/lab/dishwasher-utilization-and-maintenance/dishwasher-utilization-and-maintenance.md
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/dishwasher-utilization-and-maintenance.md
index 0793c85cd3336ad32263096539a0f18cacdba3a7..e1ec65f1e07f270fbc3a7396688bed85ff554579 100644
--- a/external/lab/dishwasher-utilization-and-maintenance/dishwasher-utilization-and-maintenance.md
+++ b/external/lab-equipment/dishwasher-utilization-and-maintenance/dishwasher-utilization-and-maintenance.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/dishwasher-utilization-and-maintenance/
-shortcut: lab:dishwasher-utilization-and-maintenance
+permalink: /external/lab-equipment/dishwasher-utilization-and-maintenance/
+shortcut: lab-equipment:dishwasher-utilization-and-maintenance
redirect_from:
+ - /cards/lab-equipment:dishwasher-utilization-and-maintenance
+ - /external/cards/lab-equipment:dishwasher-utilization-and-maintenance
- /cards/lab:dishwasher-utilization-and-maintenance
- /external/cards/lab:dishwasher-utilization-and-maintenance
---
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_1.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_1.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_1.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_1.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_10.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_10.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_10.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_10.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_11.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_11.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_11.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_11.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_12.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_12.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_12.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_12.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_13.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_13.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_13.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_13.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_14.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_14.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_14.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_14.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_15.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_15.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_15.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_15.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_16.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_16.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_16.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_16.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_17.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_17.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_17.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_17.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_2.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_2.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_2.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_2.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_3.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_3.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_3.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_3.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_4.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_4.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_4.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_4.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_5.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_5.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_5.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_5.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_6.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_6.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_6.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_6.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_7.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_7.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_7.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_7.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_8.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_8.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_8.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_8.jpg
diff --git a/external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_9.jpg b/external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_9.jpg
similarity index 100%
rename from external/lab/dishwasher-utilization-and-maintenance/img/dishwasher_img_9.jpg
rename to external/lab-equipment/dishwasher-utilization-and-maintenance/img/dishwasher_img_9.jpg
diff --git a/external/lab/maintenance-of-fridges/img/Tab1.png b/external/lab-equipment/maintenance-of-fridges/img/Tab1.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/Tab1.png
rename to external/lab-equipment/maintenance-of-fridges/img/Tab1.png
diff --git a/external/lab/maintenance-of-fridges/img/img1.png b/external/lab-equipment/maintenance-of-fridges/img/img1.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img1.png
rename to external/lab-equipment/maintenance-of-fridges/img/img1.png
diff --git a/external/lab/maintenance-of-fridges/img/img10.png b/external/lab-equipment/maintenance-of-fridges/img/img10.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img10.png
rename to external/lab-equipment/maintenance-of-fridges/img/img10.png
diff --git a/external/lab/maintenance-of-fridges/img/img11.png b/external/lab-equipment/maintenance-of-fridges/img/img11.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img11.png
rename to external/lab-equipment/maintenance-of-fridges/img/img11.png
diff --git a/external/lab/maintenance-of-fridges/img/img12.png b/external/lab-equipment/maintenance-of-fridges/img/img12.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img12.png
rename to external/lab-equipment/maintenance-of-fridges/img/img12.png
diff --git a/external/lab/maintenance-of-fridges/img/img13.png b/external/lab-equipment/maintenance-of-fridges/img/img13.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img13.png
rename to external/lab-equipment/maintenance-of-fridges/img/img13.png
diff --git a/external/lab/maintenance-of-fridges/img/img14.png b/external/lab-equipment/maintenance-of-fridges/img/img14.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img14.png
rename to external/lab-equipment/maintenance-of-fridges/img/img14.png
diff --git a/external/lab/maintenance-of-fridges/img/img15.png b/external/lab-equipment/maintenance-of-fridges/img/img15.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img15.png
rename to external/lab-equipment/maintenance-of-fridges/img/img15.png
diff --git a/external/lab/maintenance-of-fridges/img/img16.png b/external/lab-equipment/maintenance-of-fridges/img/img16.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img16.png
rename to external/lab-equipment/maintenance-of-fridges/img/img16.png
diff --git a/external/lab/maintenance-of-fridges/img/img2.png b/external/lab-equipment/maintenance-of-fridges/img/img2.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img2.png
rename to external/lab-equipment/maintenance-of-fridges/img/img2.png
diff --git a/external/lab/maintenance-of-fridges/img/img3.png b/external/lab-equipment/maintenance-of-fridges/img/img3.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img3.png
rename to external/lab-equipment/maintenance-of-fridges/img/img3.png
diff --git a/external/lab/maintenance-of-fridges/img/img4.png b/external/lab-equipment/maintenance-of-fridges/img/img4.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img4.png
rename to external/lab-equipment/maintenance-of-fridges/img/img4.png
diff --git a/external/lab/maintenance-of-fridges/img/img5.png b/external/lab-equipment/maintenance-of-fridges/img/img5.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img5.png
rename to external/lab-equipment/maintenance-of-fridges/img/img5.png
diff --git a/external/lab/maintenance-of-fridges/img/img6a.png b/external/lab-equipment/maintenance-of-fridges/img/img6a.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img6a.png
rename to external/lab-equipment/maintenance-of-fridges/img/img6a.png
diff --git a/external/lab/maintenance-of-fridges/img/img6b.png b/external/lab-equipment/maintenance-of-fridges/img/img6b.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img6b.png
rename to external/lab-equipment/maintenance-of-fridges/img/img6b.png
diff --git a/external/lab/maintenance-of-fridges/img/img7.png b/external/lab-equipment/maintenance-of-fridges/img/img7.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img7.png
rename to external/lab-equipment/maintenance-of-fridges/img/img7.png
diff --git a/external/lab/maintenance-of-fridges/img/img8.png b/external/lab-equipment/maintenance-of-fridges/img/img8.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img8.png
rename to external/lab-equipment/maintenance-of-fridges/img/img8.png
diff --git a/external/lab/maintenance-of-fridges/img/img9.png b/external/lab-equipment/maintenance-of-fridges/img/img9.png
similarity index 100%
rename from external/lab/maintenance-of-fridges/img/img9.png
rename to external/lab-equipment/maintenance-of-fridges/img/img9.png
diff --git a/external/lab/maintenance-of-fridges/maintenance-of-fridges.md b/external/lab-equipment/maintenance-of-fridges/maintenance-of-fridges.md
similarity index 98%
rename from external/lab/maintenance-of-fridges/maintenance-of-fridges.md
rename to external/lab-equipment/maintenance-of-fridges/maintenance-of-fridges.md
index b893b23b364d221ced6993297952d8dc0ccb0de3..aa627adb0030e14f2ed4b6e833ef907b463423a6 100644
--- a/external/lab/maintenance-of-fridges/maintenance-of-fridges.md
+++ b/external/lab-equipment/maintenance-of-fridges/maintenance-of-fridges.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/maintenance-of-fridges/
-shortcut: lab:maintenance-of-fridges
+permalink: /external/lab-equipment/maintenance-of-fridges/
+shortcut: lab-equipment:maintenance-of-fridges
redirect_from:
+ - /cards/lab-equipment:maintenance-of-fridges
+ - /external/cards/lab-equipment:maintenance-of-fridges
- /cards/lab:maintenance-of-fridges
- /external/cards/lab:maintenance-of-fridges
---
diff --git a/external/lab/maintenance_of_cold_traps/img/cold-trap_img_1.png b/external/lab-equipment/maintenance_of_cold_traps/img/cold-trap_img_1.png
similarity index 100%
rename from external/lab/maintenance_of_cold_traps/img/cold-trap_img_1.png
rename to external/lab-equipment/maintenance_of_cold_traps/img/cold-trap_img_1.png
diff --git a/external/lab/maintenance_of_cold_traps/img/cold-trap_img_2.png b/external/lab-equipment/maintenance_of_cold_traps/img/cold-trap_img_2.png
similarity index 100%
rename from external/lab/maintenance_of_cold_traps/img/cold-trap_img_2.png
rename to external/lab-equipment/maintenance_of_cold_traps/img/cold-trap_img_2.png
diff --git a/external/lab/maintenance_of_cold_traps/img/cold-trap_img_3.png b/external/lab-equipment/maintenance_of_cold_traps/img/cold-trap_img_3.png
similarity index 100%
rename from external/lab/maintenance_of_cold_traps/img/cold-trap_img_3.png
rename to external/lab-equipment/maintenance_of_cold_traps/img/cold-trap_img_3.png
diff --git a/external/lab/maintenance_of_cold_traps/maintenance_of_cold_traps.md b/external/lab-equipment/maintenance_of_cold_traps/maintenance_of_cold_traps.md
similarity index 93%
rename from external/lab/maintenance_of_cold_traps/maintenance_of_cold_traps.md
rename to external/lab-equipment/maintenance_of_cold_traps/maintenance_of_cold_traps.md
index e0e50d9c346fc69eb858e3283a0d1b5755d175a6..f006e214befff5c4158071d1b9792fd9500e1150 100644
--- a/external/lab/maintenance_of_cold_traps/maintenance_of_cold_traps.md
+++ b/external/lab-equipment/maintenance_of_cold_traps/maintenance_of_cold_traps.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/maintenance_of_cold_traps/
-shortcut: lab:maintenance_of_cold_traps
+permalink: /external/lab-equipment/maintenance_of_cold_traps/
+shortcut: lab-equipment:maintenance_of_cold_traps
redirect_from:
+ - /cards/lab-equipment:maintenance_of_cold_traps
+ - /external/cards/lab-equipment:maintenance_of_cold_traps
- /cards/lab:maintenance_of_cold_traps
- /external/cards/lab:maintenance_of_cold_traps
---
diff --git a/external/lab/utilization-of-autoclaves/img/img1.png b/external/lab-equipment/utilization-of-autoclaves/img/img1.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img1.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img1.png
diff --git a/external/lab/utilization-of-autoclaves/img/img10.png b/external/lab-equipment/utilization-of-autoclaves/img/img10.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img10.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img10.png
diff --git a/external/lab/utilization-of-autoclaves/img/img11.png b/external/lab-equipment/utilization-of-autoclaves/img/img11.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img11.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img11.png
diff --git a/external/lab/utilization-of-autoclaves/img/img12.png b/external/lab-equipment/utilization-of-autoclaves/img/img12.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img12.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img12.png
diff --git a/external/lab/utilization-of-autoclaves/img/img13.png b/external/lab-equipment/utilization-of-autoclaves/img/img13.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img13.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img13.png
diff --git a/external/lab/utilization-of-autoclaves/img/img14.png b/external/lab-equipment/utilization-of-autoclaves/img/img14.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img14.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img14.png
diff --git a/external/lab/utilization-of-autoclaves/img/img15.png b/external/lab-equipment/utilization-of-autoclaves/img/img15.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img15.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img15.png
diff --git a/external/lab/utilization-of-autoclaves/img/img16.png b/external/lab-equipment/utilization-of-autoclaves/img/img16.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img16.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img16.png
diff --git a/external/lab/utilization-of-autoclaves/img/img17.png b/external/lab-equipment/utilization-of-autoclaves/img/img17.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img17.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img17.png
diff --git a/external/lab/utilization-of-autoclaves/img/img18.png b/external/lab-equipment/utilization-of-autoclaves/img/img18.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img18.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img18.png
diff --git a/external/lab/utilization-of-autoclaves/img/img19.png b/external/lab-equipment/utilization-of-autoclaves/img/img19.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img19.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img19.png
diff --git a/external/lab/utilization-of-autoclaves/img/img2.png b/external/lab-equipment/utilization-of-autoclaves/img/img2.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img2.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img2.png
diff --git a/external/lab/utilization-of-autoclaves/img/img20.png b/external/lab-equipment/utilization-of-autoclaves/img/img20.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img20.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img20.png
diff --git a/external/lab/utilization-of-autoclaves/img/img21.png b/external/lab-equipment/utilization-of-autoclaves/img/img21.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img21.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img21.png
diff --git a/external/lab/utilization-of-autoclaves/img/img22.png b/external/lab-equipment/utilization-of-autoclaves/img/img22.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img22.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img22.png
diff --git a/external/lab/utilization-of-autoclaves/img/img23.png b/external/lab-equipment/utilization-of-autoclaves/img/img23.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img23.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img23.png
diff --git a/external/lab/utilization-of-autoclaves/img/img24.png b/external/lab-equipment/utilization-of-autoclaves/img/img24.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img24.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img24.png
diff --git a/external/lab/utilization-of-autoclaves/img/img25.png b/external/lab-equipment/utilization-of-autoclaves/img/img25.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img25.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img25.png
diff --git a/external/lab/utilization-of-autoclaves/img/img3.png b/external/lab-equipment/utilization-of-autoclaves/img/img3.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img3.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img3.png
diff --git a/external/lab/utilization-of-autoclaves/img/img4.png b/external/lab-equipment/utilization-of-autoclaves/img/img4.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img4.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img4.png
diff --git a/external/lab/utilization-of-autoclaves/img/img6.png b/external/lab-equipment/utilization-of-autoclaves/img/img6.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img6.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img6.png
diff --git a/external/lab/utilization-of-autoclaves/img/img7.png b/external/lab-equipment/utilization-of-autoclaves/img/img7.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img7.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img7.png
diff --git a/external/lab/utilization-of-autoclaves/img/img8.png b/external/lab-equipment/utilization-of-autoclaves/img/img8.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img8.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img8.png
diff --git a/external/lab/utilization-of-autoclaves/img/img9.png b/external/lab-equipment/utilization-of-autoclaves/img/img9.png
similarity index 100%
rename from external/lab/utilization-of-autoclaves/img/img9.png
rename to external/lab-equipment/utilization-of-autoclaves/img/img9.png
diff --git a/external/lab/utilization-of-autoclaves/utilization-of-autoclaves.md b/external/lab-equipment/utilization-of-autoclaves/utilization-of-autoclaves.md
similarity index 98%
rename from external/lab/utilization-of-autoclaves/utilization-of-autoclaves.md
rename to external/lab-equipment/utilization-of-autoclaves/utilization-of-autoclaves.md
index 9c98f95720f4f77270cd81a74f5b4ac11e2437fe..64778d2ee1a5e9138e0063af5c4859355a32dab9 100644
--- a/external/lab/utilization-of-autoclaves/utilization-of-autoclaves.md
+++ b/external/lab-equipment/utilization-of-autoclaves/utilization-of-autoclaves.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/utilization-of-autoclaves/
-shortcut: lab:utilization-of-autoclaves
+permalink: /external/lab-equipment/utilization-of-autoclaves/
+shortcut: lab-equipment:utilization-of-autoclaves
redirect_from:
+ - /cards/lab-equipment:utilization-of-autoclaves
+ - /external/cards/lab-equipment:utilization-of-autoclaves
- /cards/lab:utilization-of-autoclaves
- /external/cards/lab:utilization-of-autoclaves
---
diff --git a/external/lab/utilization-of-balances/img/Crown.jpg b/external/lab-equipment/utilization-of-balances/img/Crown.jpg
similarity index 100%
rename from external/lab/utilization-of-balances/img/Crown.jpg
rename to external/lab-equipment/utilization-of-balances/img/Crown.jpg
diff --git a/external/lab/utilization-of-balances/img/Ergo-Clip.jpg b/external/lab-equipment/utilization-of-balances/img/Ergo-Clip.jpg
similarity index 100%
rename from external/lab/utilization-of-balances/img/Ergo-Clip.jpg
rename to external/lab-equipment/utilization-of-balances/img/Ergo-Clip.jpg
diff --git a/external/lab/utilization-of-balances/img/Ergo-Clip_2.jpg b/external/lab-equipment/utilization-of-balances/img/Ergo-Clip_2.jpg
similarity index 100%
rename from external/lab/utilization-of-balances/img/Ergo-Clip_2.jpg
rename to external/lab-equipment/utilization-of-balances/img/Ergo-Clip_2.jpg
diff --git a/external/lab/utilization-of-balances/img/XPE205DR.jpg b/external/lab-equipment/utilization-of-balances/img/XPE205DR.jpg
similarity index 100%
rename from external/lab/utilization-of-balances/img/XPE205DR.jpg
rename to external/lab-equipment/utilization-of-balances/img/XPE205DR.jpg
diff --git a/external/lab/utilization-of-balances/img/XPE205DR_2.jpg b/external/lab-equipment/utilization-of-balances/img/XPE205DR_2.jpg
similarity index 100%
rename from external/lab/utilization-of-balances/img/XPE205DR_2.jpg
rename to external/lab-equipment/utilization-of-balances/img/XPE205DR_2.jpg
diff --git a/external/lab/utilization-of-balances/img/XS4002S.jpg b/external/lab-equipment/utilization-of-balances/img/XS4002S.jpg
similarity index 100%
rename from external/lab/utilization-of-balances/img/XS4002S.jpg
rename to external/lab-equipment/utilization-of-balances/img/XS4002S.jpg
diff --git a/external/lab/utilization-of-balances/utilization-of-balances.md b/external/lab-equipment/utilization-of-balances/utilization-of-balances.md
similarity index 93%
rename from external/lab/utilization-of-balances/utilization-of-balances.md
rename to external/lab-equipment/utilization-of-balances/utilization-of-balances.md
index 20aa279396a78134c9b311b77733c58f137e2a6d..f92ca68a15153006aed22a2730400c7c436f64a4 100644
--- a/external/lab/utilization-of-balances/utilization-of-balances.md
+++ b/external/lab-equipment/utilization-of-balances/utilization-of-balances.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/utilization-of-balances/
-shortcut: lab:utilization-of-balances
+permalink: /external/lab-equipment/utilization-of-balances/
+shortcut: lab-equipment:utilization-of-balances
redirect_from:
+ - /cards/lab-equipment:utilization-of-balances
+ - /external/cards/lab-equipment:utilization-of-balances
- /cards/lab:utilization-of-balances
- /external/cards/lab:utilization-of-balances
---
diff --git a/external/lab/utilization-of-bsc/img/img1.png b/external/lab-equipment/utilization-of-bsc/img/img1.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img1.png
rename to external/lab-equipment/utilization-of-bsc/img/img1.png
diff --git a/external/lab/utilization-of-bsc/img/img10.png b/external/lab-equipment/utilization-of-bsc/img/img10.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img10.png
rename to external/lab-equipment/utilization-of-bsc/img/img10.png
diff --git a/external/lab/utilization-of-bsc/img/img11.png b/external/lab-equipment/utilization-of-bsc/img/img11.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img11.png
rename to external/lab-equipment/utilization-of-bsc/img/img11.png
diff --git a/external/lab/utilization-of-bsc/img/img12.png b/external/lab-equipment/utilization-of-bsc/img/img12.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img12.png
rename to external/lab-equipment/utilization-of-bsc/img/img12.png
diff --git a/external/lab/utilization-of-bsc/img/img13.png b/external/lab-equipment/utilization-of-bsc/img/img13.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img13.png
rename to external/lab-equipment/utilization-of-bsc/img/img13.png
diff --git a/external/lab/utilization-of-bsc/img/img14.png b/external/lab-equipment/utilization-of-bsc/img/img14.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img14.png
rename to external/lab-equipment/utilization-of-bsc/img/img14.png
diff --git a/external/lab/utilization-of-bsc/img/img15.png b/external/lab-equipment/utilization-of-bsc/img/img15.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img15.png
rename to external/lab-equipment/utilization-of-bsc/img/img15.png
diff --git a/external/lab/utilization-of-bsc/img/img16.png b/external/lab-equipment/utilization-of-bsc/img/img16.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img16.png
rename to external/lab-equipment/utilization-of-bsc/img/img16.png
diff --git a/external/lab/utilization-of-bsc/img/img17.png b/external/lab-equipment/utilization-of-bsc/img/img17.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img17.png
rename to external/lab-equipment/utilization-of-bsc/img/img17.png
diff --git a/external/lab/utilization-of-bsc/img/img18.png b/external/lab-equipment/utilization-of-bsc/img/img18.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img18.png
rename to external/lab-equipment/utilization-of-bsc/img/img18.png
diff --git a/external/lab/utilization-of-bsc/img/img19.png b/external/lab-equipment/utilization-of-bsc/img/img19.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img19.png
rename to external/lab-equipment/utilization-of-bsc/img/img19.png
diff --git a/external/lab/utilization-of-bsc/img/img2.png b/external/lab-equipment/utilization-of-bsc/img/img2.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img2.png
rename to external/lab-equipment/utilization-of-bsc/img/img2.png
diff --git a/external/lab/utilization-of-bsc/img/img20.png b/external/lab-equipment/utilization-of-bsc/img/img20.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img20.png
rename to external/lab-equipment/utilization-of-bsc/img/img20.png
diff --git a/external/lab/utilization-of-bsc/img/img21.png b/external/lab-equipment/utilization-of-bsc/img/img21.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img21.png
rename to external/lab-equipment/utilization-of-bsc/img/img21.png
diff --git a/external/lab/utilization-of-bsc/img/img22.png b/external/lab-equipment/utilization-of-bsc/img/img22.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img22.png
rename to external/lab-equipment/utilization-of-bsc/img/img22.png
diff --git a/external/lab/utilization-of-bsc/img/img23.png b/external/lab-equipment/utilization-of-bsc/img/img23.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img23.png
rename to external/lab-equipment/utilization-of-bsc/img/img23.png
diff --git a/external/lab/utilization-of-bsc/img/img24.png b/external/lab-equipment/utilization-of-bsc/img/img24.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img24.png
rename to external/lab-equipment/utilization-of-bsc/img/img24.png
diff --git a/external/lab/utilization-of-bsc/img/img25.png b/external/lab-equipment/utilization-of-bsc/img/img25.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img25.png
rename to external/lab-equipment/utilization-of-bsc/img/img25.png
diff --git a/external/lab/utilization-of-bsc/img/img26.png b/external/lab-equipment/utilization-of-bsc/img/img26.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img26.png
rename to external/lab-equipment/utilization-of-bsc/img/img26.png
diff --git a/external/lab/utilization-of-bsc/img/img27.png b/external/lab-equipment/utilization-of-bsc/img/img27.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img27.png
rename to external/lab-equipment/utilization-of-bsc/img/img27.png
diff --git a/external/lab/utilization-of-bsc/img/img28.png b/external/lab-equipment/utilization-of-bsc/img/img28.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img28.png
rename to external/lab-equipment/utilization-of-bsc/img/img28.png
diff --git a/external/lab/utilization-of-bsc/img/img29.png b/external/lab-equipment/utilization-of-bsc/img/img29.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img29.png
rename to external/lab-equipment/utilization-of-bsc/img/img29.png
diff --git a/external/lab/utilization-of-bsc/img/img3.png b/external/lab-equipment/utilization-of-bsc/img/img3.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img3.png
rename to external/lab-equipment/utilization-of-bsc/img/img3.png
diff --git a/external/lab/utilization-of-bsc/img/img30.png b/external/lab-equipment/utilization-of-bsc/img/img30.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img30.png
rename to external/lab-equipment/utilization-of-bsc/img/img30.png
diff --git a/external/lab/utilization-of-bsc/img/img31.png b/external/lab-equipment/utilization-of-bsc/img/img31.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img31.png
rename to external/lab-equipment/utilization-of-bsc/img/img31.png
diff --git a/external/lab/utilization-of-bsc/img/img4.png b/external/lab-equipment/utilization-of-bsc/img/img4.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img4.png
rename to external/lab-equipment/utilization-of-bsc/img/img4.png
diff --git a/external/lab/utilization-of-bsc/img/img5.png b/external/lab-equipment/utilization-of-bsc/img/img5.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img5.png
rename to external/lab-equipment/utilization-of-bsc/img/img5.png
diff --git a/external/lab/utilization-of-bsc/img/img6.png b/external/lab-equipment/utilization-of-bsc/img/img6.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img6.png
rename to external/lab-equipment/utilization-of-bsc/img/img6.png
diff --git a/external/lab/utilization-of-bsc/img/img7.png b/external/lab-equipment/utilization-of-bsc/img/img7.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img7.png
rename to external/lab-equipment/utilization-of-bsc/img/img7.png
diff --git a/external/lab/utilization-of-bsc/img/img8.png b/external/lab-equipment/utilization-of-bsc/img/img8.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img8.png
rename to external/lab-equipment/utilization-of-bsc/img/img8.png
diff --git a/external/lab/utilization-of-bsc/img/img9.png b/external/lab-equipment/utilization-of-bsc/img/img9.png
similarity index 100%
rename from external/lab/utilization-of-bsc/img/img9.png
rename to external/lab-equipment/utilization-of-bsc/img/img9.png
diff --git a/external/lab/utilization-of-bsc/utilization-of-bsc.md b/external/lab-equipment/utilization-of-bsc/utilization-of-bsc.md
similarity index 99%
rename from external/lab/utilization-of-bsc/utilization-of-bsc.md
rename to external/lab-equipment/utilization-of-bsc/utilization-of-bsc.md
index 574256752baca0d8d4c898a2e1b65b1c614085b1..fe96002b4305796b6a47d3a03537e4eaefc8aa90 100644
--- a/external/lab/utilization-of-bsc/utilization-of-bsc.md
+++ b/external/lab-equipment/utilization-of-bsc/utilization-of-bsc.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/utilization-of-bsc/
-shortcut: lab:utilization-of-bsc
+permalink: /external/lab-equipment/utilization-of-bsc/
+shortcut: lab-equipment:utilization-of-bsc
redirect_from:
+ - /cards/lab-equipment:utilization-of-bsc
+ - /external/cards/lab-equipment:utilization-of-bsc
- /cards/lab:utilization-of-bsc
- /external/cards/lab:utilization-of-bsc
---
diff --git a/external/lab/utilization-of-pH-meter/description_pH-meters.jpg b/external/lab-equipment/utilization-of-pH-meter/description_pH-meters.jpg
similarity index 100%
rename from external/lab/utilization-of-pH-meter/description_pH-meters.jpg
rename to external/lab-equipment/utilization-of-pH-meter/description_pH-meters.jpg
diff --git a/external/lab/utilization-of-pH-meter/utilization-of-pH-meter.md b/external/lab-equipment/utilization-of-pH-meter/utilization-of-pH-meter.md
similarity index 94%
rename from external/lab/utilization-of-pH-meter/utilization-of-pH-meter.md
rename to external/lab-equipment/utilization-of-pH-meter/utilization-of-pH-meter.md
index 3625b26475f8acb45c0e76d3e800d7deec432dd7..de9464d4489263c6a81c0d849543e0f1edd194df 100644
--- a/external/lab/utilization-of-pH-meter/utilization-of-pH-meter.md
+++ b/external/lab-equipment/utilization-of-pH-meter/utilization-of-pH-meter.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/utilization-of-pH-meter/
-shortcut: lab:utilization-of-pH-meter
+permalink: /external/lab-equipment/utilization-of-pH-meter/
+shortcut: lab-equipment:utilization-of-pH-meter
redirect_from:
+ - /cards/lab-equipment:utilization-of-pH-meter
+ - /external/cards/lab-equipment:utilization-of-pH-meter
- /cards/lab:utilization-of-pH-meter
- /external/cards/lab:utilization-of-pH-meter
---
diff --git a/external/lab/handwashing/handwashing.md b/external/lab-hsa/handwashing/handwashing.md
similarity index 89%
rename from external/lab/handwashing/handwashing.md
rename to external/lab-hsa/handwashing/handwashing.md
index 7ca6043c8c96741455efb50082cde64660c78cdb..082677a1d057049c89cb1007a6b5ee5090f3aeb3 100644
--- a/external/lab/handwashing/handwashing.md
+++ b/external/lab-hsa/handwashing/handwashing.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/handwashing/
-shortcut: lab:handwashing
+permalink: /external/lab-hsa/handwashing/
+shortcut: lab-hsa:handwashing
redirect_from:
+ - /cards/lab-hsa:handwashing
+ - /external/cards/lab-hsa:handwashing
- /cards/lab:handwashing
- /external/cards/lab:handwashing
---
diff --git a/external/lab/handwashing/img/handwashing_img_1.png b/external/lab-hsa/handwashing/img/handwashing_img_1.png
similarity index 100%
rename from external/lab/handwashing/img/handwashing_img_1.png
rename to external/lab-hsa/handwashing/img/handwashing_img_1.png
diff --git a/external/lab/lab-coats/img/1.png b/external/lab-hsa/lab-coats/img/1.png
similarity index 100%
rename from external/lab/lab-coats/img/1.png
rename to external/lab-hsa/lab-coats/img/1.png
diff --git a/external/lab/lab-coats/img/2.png b/external/lab-hsa/lab-coats/img/2.png
similarity index 100%
rename from external/lab/lab-coats/img/2.png
rename to external/lab-hsa/lab-coats/img/2.png
diff --git a/external/lab/lab-coats/img/3.png b/external/lab-hsa/lab-coats/img/3.png
similarity index 100%
rename from external/lab/lab-coats/img/3.png
rename to external/lab-hsa/lab-coats/img/3.png
diff --git a/external/lab/lab-coats/img/4.png b/external/lab-hsa/lab-coats/img/4.png
similarity index 100%
rename from external/lab/lab-coats/img/4.png
rename to external/lab-hsa/lab-coats/img/4.png
diff --git a/external/lab/lab-coats/img/5.png b/external/lab-hsa/lab-coats/img/5.png
similarity index 100%
rename from external/lab/lab-coats/img/5.png
rename to external/lab-hsa/lab-coats/img/5.png
diff --git a/external/lab/lab-coats/img/6.png b/external/lab-hsa/lab-coats/img/6.png
similarity index 100%
rename from external/lab/lab-coats/img/6.png
rename to external/lab-hsa/lab-coats/img/6.png
diff --git a/external/lab/lab-coats/lab-coats.md b/external/lab-hsa/lab-coats/lab-coats.md
similarity index 94%
rename from external/lab/lab-coats/lab-coats.md
rename to external/lab-hsa/lab-coats/lab-coats.md
index 7046155375c0399b242aa5ebd18292cdbea0088a..6f1ac4fd137778aede933b831225fc8db69e7a29 100644
--- a/external/lab/lab-coats/lab-coats.md
+++ b/external/lab-hsa/lab-coats/lab-coats.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/lab-coats/
-shortcut: lab:lab-coats
+permalink: /external/lab-hsa/lab-coats/
+shortcut: lab-hsa:lab-coats
redirect_from:
+ - /cards/lab-hsa:lab-coats
+ - /external/cards/lab-hsa:lab-coats
- /cards/lab:lab-coats
- /external/cards/lab:lab-coats
---
diff --git a/external/lab/personal-alert-safety-system/img/pass_img-1.jpg b/external/lab-hsa/personal-alert-safety-system/img/pass_img-1.jpg
similarity index 100%
rename from external/lab/personal-alert-safety-system/img/pass_img-1.jpg
rename to external/lab-hsa/personal-alert-safety-system/img/pass_img-1.jpg
diff --git a/external/lab/personal-alert-safety-system/img/pass_img-2.jpg b/external/lab-hsa/personal-alert-safety-system/img/pass_img-2.jpg
similarity index 100%
rename from external/lab/personal-alert-safety-system/img/pass_img-2.jpg
rename to external/lab-hsa/personal-alert-safety-system/img/pass_img-2.jpg
diff --git a/external/lab/personal-alert-safety-system/img/pass_img-3.jpg b/external/lab-hsa/personal-alert-safety-system/img/pass_img-3.jpg
similarity index 100%
rename from external/lab/personal-alert-safety-system/img/pass_img-3.jpg
rename to external/lab-hsa/personal-alert-safety-system/img/pass_img-3.jpg
diff --git a/external/lab/personal-alert-safety-system/img/pass_img-4.jpg b/external/lab-hsa/personal-alert-safety-system/img/pass_img-4.jpg
similarity index 100%
rename from external/lab/personal-alert-safety-system/img/pass_img-4.jpg
rename to external/lab-hsa/personal-alert-safety-system/img/pass_img-4.jpg
diff --git a/external/lab/personal-alert-safety-system/img/pass_img-5.jpg b/external/lab-hsa/personal-alert-safety-system/img/pass_img-5.jpg
similarity index 100%
rename from external/lab/personal-alert-safety-system/img/pass_img-5.jpg
rename to external/lab-hsa/personal-alert-safety-system/img/pass_img-5.jpg
diff --git a/external/lab/personal-alert-safety-system/img/pass_img-6.jpg b/external/lab-hsa/personal-alert-safety-system/img/pass_img-6.jpg
similarity index 100%
rename from external/lab/personal-alert-safety-system/img/pass_img-6.jpg
rename to external/lab-hsa/personal-alert-safety-system/img/pass_img-6.jpg
diff --git a/external/lab/personal-alert-safety-system/personal-alert-safety-system.md b/external/lab-hsa/personal-alert-safety-system/personal-alert-safety-system.md
similarity index 97%
rename from external/lab/personal-alert-safety-system/personal-alert-safety-system.md
rename to external/lab-hsa/personal-alert-safety-system/personal-alert-safety-system.md
index e01ac64af4b2b1e7cfc26eb7d06b90ed880e2049..a986afd45f612dbd3c07c81f60a507ed99f92b57 100644
--- a/external/lab/personal-alert-safety-system/personal-alert-safety-system.md
+++ b/external/lab-hsa/personal-alert-safety-system/personal-alert-safety-system.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/personal-alert-safety-system/
-shortcut: lab:personal-alert-safety-system
+permalink: /external/lab-hsa/personal-alert-safety-system/
+shortcut: lab-hsa:personal-alert-safety-system
redirect_from:
+ - /cards/lab-hsa:personal-alert-safety-system
+ - /external/cards/lab-hsa:personal-alert-safety-system
- /cards/lab:personal-alert-safety-system
- /external/cards/lab:personal-alert-safety-system
---
diff --git a/external/lab/book-lab-equipment/book-lab-equipment.md b/external/lab-software/book-lab-equipment/book-lab-equipment.md
similarity index 97%
rename from external/lab/book-lab-equipment/book-lab-equipment.md
rename to external/lab-software/book-lab-equipment/book-lab-equipment.md
index 0e21ad3b5c3cd2608ec63473af425a438f0bd625..1f10f5c8bba9586cdc34ba8e1d52bd1ae765c9ba 100644
--- a/external/lab/book-lab-equipment/book-lab-equipment.md
+++ b/external/lab-software/book-lab-equipment/book-lab-equipment.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/book-lab-equipment/
-shortcut: lab:book-lab-equipment
+permalink: /external/lab-software/book-lab-equipment/
+shortcut: lab-software:book-lab-equipment
redirect_from:
+ - /cards/lab-software:book-lab-equipment
+ - /external/cards/lab-software:book-lab-equipment
- /cards/lab:book-lab-equipment
- /external/cards/lab:book-lab-equipment
---
diff --git a/external/lab/book-lab-equipment/img/1.png b/external/lab-software/book-lab-equipment/img/1.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/1.png
rename to external/lab-software/book-lab-equipment/img/1.png
diff --git a/external/lab/book-lab-equipment/img/10.png b/external/lab-software/book-lab-equipment/img/10.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/10.png
rename to external/lab-software/book-lab-equipment/img/10.png
diff --git a/external/lab/book-lab-equipment/img/11.png b/external/lab-software/book-lab-equipment/img/11.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/11.png
rename to external/lab-software/book-lab-equipment/img/11.png
diff --git a/external/lab/book-lab-equipment/img/12.png b/external/lab-software/book-lab-equipment/img/12.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/12.png
rename to external/lab-software/book-lab-equipment/img/12.png
diff --git a/external/lab/book-lab-equipment/img/13.png b/external/lab-software/book-lab-equipment/img/13.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/13.png
rename to external/lab-software/book-lab-equipment/img/13.png
diff --git a/external/lab/book-lab-equipment/img/14.png b/external/lab-software/book-lab-equipment/img/14.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/14.png
rename to external/lab-software/book-lab-equipment/img/14.png
diff --git a/external/lab/book-lab-equipment/img/15.png b/external/lab-software/book-lab-equipment/img/15.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/15.png
rename to external/lab-software/book-lab-equipment/img/15.png
diff --git a/external/lab/book-lab-equipment/img/16.png b/external/lab-software/book-lab-equipment/img/16.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/16.png
rename to external/lab-software/book-lab-equipment/img/16.png
diff --git a/external/lab/book-lab-equipment/img/17.png b/external/lab-software/book-lab-equipment/img/17.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/17.png
rename to external/lab-software/book-lab-equipment/img/17.png
diff --git a/external/lab/book-lab-equipment/img/18.png b/external/lab-software/book-lab-equipment/img/18.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/18.png
rename to external/lab-software/book-lab-equipment/img/18.png
diff --git a/external/lab/book-lab-equipment/img/19.png b/external/lab-software/book-lab-equipment/img/19.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/19.png
rename to external/lab-software/book-lab-equipment/img/19.png
diff --git a/external/lab/book-lab-equipment/img/2.png b/external/lab-software/book-lab-equipment/img/2.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/2.png
rename to external/lab-software/book-lab-equipment/img/2.png
diff --git a/external/lab/book-lab-equipment/img/20.png b/external/lab-software/book-lab-equipment/img/20.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/20.png
rename to external/lab-software/book-lab-equipment/img/20.png
diff --git a/external/lab/book-lab-equipment/img/21.png b/external/lab-software/book-lab-equipment/img/21.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/21.png
rename to external/lab-software/book-lab-equipment/img/21.png
diff --git a/external/lab/book-lab-equipment/img/22.png b/external/lab-software/book-lab-equipment/img/22.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/22.png
rename to external/lab-software/book-lab-equipment/img/22.png
diff --git a/external/lab/book-lab-equipment/img/23.png b/external/lab-software/book-lab-equipment/img/23.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/23.png
rename to external/lab-software/book-lab-equipment/img/23.png
diff --git a/external/lab/book-lab-equipment/img/24.png b/external/lab-software/book-lab-equipment/img/24.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/24.png
rename to external/lab-software/book-lab-equipment/img/24.png
diff --git a/external/lab/book-lab-equipment/img/25.png b/external/lab-software/book-lab-equipment/img/25.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/25.png
rename to external/lab-software/book-lab-equipment/img/25.png
diff --git a/external/lab/book-lab-equipment/img/26.png b/external/lab-software/book-lab-equipment/img/26.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/26.png
rename to external/lab-software/book-lab-equipment/img/26.png
diff --git a/external/lab/book-lab-equipment/img/27.png b/external/lab-software/book-lab-equipment/img/27.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/27.png
rename to external/lab-software/book-lab-equipment/img/27.png
diff --git a/external/lab/book-lab-equipment/img/28.png b/external/lab-software/book-lab-equipment/img/28.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/28.png
rename to external/lab-software/book-lab-equipment/img/28.png
diff --git a/external/lab/book-lab-equipment/img/29.png b/external/lab-software/book-lab-equipment/img/29.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/29.png
rename to external/lab-software/book-lab-equipment/img/29.png
diff --git a/external/lab/book-lab-equipment/img/3.png b/external/lab-software/book-lab-equipment/img/3.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/3.png
rename to external/lab-software/book-lab-equipment/img/3.png
diff --git a/external/lab/book-lab-equipment/img/4.png b/external/lab-software/book-lab-equipment/img/4.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/4.png
rename to external/lab-software/book-lab-equipment/img/4.png
diff --git a/external/lab/book-lab-equipment/img/5.png b/external/lab-software/book-lab-equipment/img/5.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/5.png
rename to external/lab-software/book-lab-equipment/img/5.png
diff --git a/external/lab/book-lab-equipment/img/6.png b/external/lab-software/book-lab-equipment/img/6.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/6.png
rename to external/lab-software/book-lab-equipment/img/6.png
diff --git a/external/lab/book-lab-equipment/img/7.png b/external/lab-software/book-lab-equipment/img/7.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/7.png
rename to external/lab-software/book-lab-equipment/img/7.png
diff --git a/external/lab/book-lab-equipment/img/8.png b/external/lab-software/book-lab-equipment/img/8.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/8.png
rename to external/lab-software/book-lab-equipment/img/8.png
diff --git a/external/lab/book-lab-equipment/img/9.png b/external/lab-software/book-lab-equipment/img/9.png
similarity index 100%
rename from external/lab/book-lab-equipment/img/9.png
rename to external/lab-software/book-lab-equipment/img/9.png
diff --git a/external/lab/quarks-general/img/40.png b/external/lab-software/quarks-general/img/40.png
similarity index 100%
rename from external/lab/quarks-general/img/40.png
rename to external/lab-software/quarks-general/img/40.png
diff --git a/external/lab/quarks-general/img/41.png b/external/lab-software/quarks-general/img/41.png
similarity index 100%
rename from external/lab/quarks-general/img/41.png
rename to external/lab-software/quarks-general/img/41.png
diff --git a/external/lab/quarks-general/img/42.png b/external/lab-software/quarks-general/img/42.png
similarity index 100%
rename from external/lab/quarks-general/img/42.png
rename to external/lab-software/quarks-general/img/42.png
diff --git a/external/lab/quarks-general/img/43.png b/external/lab-software/quarks-general/img/43.png
similarity index 100%
rename from external/lab/quarks-general/img/43.png
rename to external/lab-software/quarks-general/img/43.png
diff --git a/external/lab/quarks-general/img/44.png b/external/lab-software/quarks-general/img/44.png
similarity index 100%
rename from external/lab/quarks-general/img/44.png
rename to external/lab-software/quarks-general/img/44.png
diff --git a/external/lab/quarks-general/quarks-general.md b/external/lab-software/quarks-general/quarks-general.md
similarity index 96%
rename from external/lab/quarks-general/quarks-general.md
rename to external/lab-software/quarks-general/quarks-general.md
index 615397f66f312ec4a92f12566d618d28e034fba4..a98233be9476143c914533f8c5e42821dc6878f6 100644
--- a/external/lab/quarks-general/quarks-general.md
+++ b/external/lab-software/quarks-general/quarks-general.md
@@ -1,8 +1,10 @@
---
layout: page
-permalink: /external/lab/quarks-general/
-shortcut: lab:quarks-general
+permalink: /external/lab-software/quarks-general/
+shortcut: lab-software:quarks-general
redirect_from:
+ - /cards/lab-software:quarks-general
+ - /external/cards/lab-software:quarks-general
- /cards/lab:quarks-general
- /external/cards/lab:quarks-general
---