Merge branch 'lending' into 'master'

Lending

See merge request !17

_config.yml

@@ -72,11 +72,11 @@ collections:
     output: true
     nofeature: true
     permalink: media/:path/
-  tools:
+  inventory:
     title: Geräte
     output: true
     nofeature: true
-    permalink: nobreakspace/werkstatt/tool/:path/
+    permalink: nobreakspace/inventory/:path/
   imagemeta:
     output: false
   press:
@@ -98,6 +98,14 @@ collections:
     title: Events
     output: true
     permalink: event/:path.xml
+  loan:
+    title: Leihgaben
+    output: true
+    permalink: loan/:path
+  loancal:
+    title: Verleihkalender
+    output: true
+    permalink: loancal/:path.ics   
 
 
 # 6. Jekyll collections settings

_events/20230306-video-ag.markdown

@@ -9,5 +9,7 @@ contact: tvluke@chaotikum.org
 recording: false
 locations:
  - Augenprüfraum
+sets:
+ - video
 short: "Reden über Videodinge"
 ---

_events/20230322-5min.markdown

@@ -10,6 +10,8 @@ recording: true
 stream: https://www.youtube.com/watch?v=OBeXznf5RjA
 locations:
  - Augenprüfraum
+sets:
+ - kofferblau
 short: "Du hast 300 Sekunden: Was ist dein Thema?"
 ---
 

_events/20230515-video-ag.markdown

@@ -10,5 +10,7 @@ contact: info@chaotikum.org
 recording: false
 locations:
  - Augenprüfraum
+sets:
+ - kofferblau
 short: "Förderantrag Digitale Knotenpunkte, Kameraantrag, Verleihkonzept,..."
 ---

_events/20230628-5min.markdown

@@ -9,6 +9,8 @@ contact: info@chaotikum.org
 recording: true
 locations:
  - Augenprüfraum
+sets:
+ - kofferblau
 short: "Du hast 300 Sekunden: Was ist dein Thema?"
 ---
 

_events/20230813-camp.md

+---
+layout: [eventcal]
+title:  "MOiN Vallage - CCCamp 2023"
+eventdate:   2023-08-13 00:00:00 +0200
+eventend:   2023-08-21 23:59:59 +0200
+#https://www.uuidgenerator.net/
+uid: 1bb444b6-b315-495f-87dd-365ca39f533e
+contact: info@chaotikum.org
+locations:
+ - Brandenburg
+sets:
+ - video
+ - vortrag
+short: "Menschen sind auf dem Camp"
+---

_events/20230927-5min.markdown

@@ -9,6 +9,8 @@ contact: info@chaotikum.org
 recording: true
 locations:
  - Augenprüfraum
+sets:
+ - kofferblau
 short: "Du hast 300 Sekunden: Was ist dein Thema?"
 ---
 

_events/20231103-nook.markdown

@@ -10,5 +10,8 @@ organizer: NooK Orga
 recording: true
 locations:
  - Audimax Uni Lübeck
+sets:
+ - kofferblau
+ - kofferweiss
 short: "Zweitägige Konferenz auf dem Campus der Uni Lübeck mit vielen Vorträgen, Ständen, Kunst und spannenden Themen."
 ---

_includes/space-status.html

@@ -2,8 +2,8 @@
 {%- capture nowunix %}{{'now' | date: '%s'}}{% endcapture -%}
 {%- assign show_event = 2 -%}
 {%- for e in site.events -%}
-    {%- capture event_start_plus %}{{e.eventdate  | date: '%s' | minus: 259200 }}{% endcapture -%}
-    {%- capture event_start %}{{e.eventdate  | date: '%s' }}{% endcapture -%}
+    {%- capture event_start_plus %}{{e.eventdate  | date: '%s' | minus: 259200 }}{%- endcapture -%}
+    {%- capture event_start %}{{e.eventdate  | date: '%s' }}{%- endcapture -%}
     {%- if event_start_plus < nowunix and event_start > nowunix and show_event > 1 -%}
       <b>Demnächst:</b>
       {%- assign show_event = 0 - %}<p id="nextevent"> {{ e.eventdate | date: "%d.%m.%Y %H:%M" }}: {{e.title}}</p>{% endif -%}

_includes/tool-list.html

-{% for tool in site.tools %}
+{% for tool in site.inventory %}
 
+{%- if tool.sets contains 'werkstatt' -%}
 {% include {{site.toolinfo}} uid=tool.uid %}
+{%- endif -%}
 <hr>
 {% endfor %}

_includes/tool.html

@@ -9,7 +9,7 @@
  padding: 10px 25px;
  max-width:500px;
  font-family:sans-serif">
- {% for tool in site.tools %}{% if tool.uid contains {{include.uid}} %}
+ {% for tool in site.inventory %}{% if tool.uid contains {{include.uid}} %}
   <h4 style="font-family:sans-serif;font-size:28pt;">{{tool.name}}</h4>
     <ul style="list-style-type:none;">
     {% for hint in tool.hints %}<li style="margin:15px 0;line-height:18pt;">{{hint}}</li>{% endfor %}

_includes/vereinnavigation.html

 <ul>
-  <li><a href="{{site.baseurl}}/verein">Verein</a></li>
-  <li><a href="{{site.baseurl}}/verein/mitgliedschaft/">Mitglied werden</a></li>
-  <li><a href="{{site.baseurl}}/verein/spenden/">Spenden</a></li>
+  <li><a href="{{site.baseurl}}/verein">Verein</a>
+    <ul>
+      <li><a href="{{site.baseurl}}/verein/mitgliedschaft/">Mitglied werden</a></li>
+      <li><a href="{{site.baseurl}}/verein/spenden/">Spenden</a></li>
+      <li><a href="{{site.baseurl}}/verein/dienste/">Infrastruktur</a></li>
+    </ul>
+  </li>
   <li><a href="{{site.baseurl}}/nobreakspace">Nobreakspace</a>
     <ul>
       <li><a href="{{site.baseurl}}/nobreakspace/werkstatt">Werkstatt</a></li>
+      <li><a href="{{site.baseurl}}/nobreakspace/ausleihen">Geräte Ausleihen</a></li>
     </ul>
   </li>
   <li><a href="{{site.baseurl}}/verein/press">Presse</a></li>

_tools/3ddrucker.md → _inventory/3ddrucker.md

 ---
-layout: tool
+layout: device
 name: "3D-Drucker"
 #https://www.uuidgenerator.net/
 uid: 40873e89-1515-412c-9a40-c27daf4e9894
 wikilink: https://wiki.chaotikum.org/hackspace:infrastruktur:3ddrucker
 imagetag: 3dprinterpic
+sets: 
+ - werkstatt
 hints:
  - "Gefahr durch Verbrennungen an heißen Teilen sowie Quetschungen."
  - "Der Druckvorgang sollte periodisch auf richtige Ausführung überprüft werden,

_inventory/atem-mini-blau.md

+---
+layout: device
+name: "ATEM Mini Extreme ISO (Koffer Blau)"
+#https://www.uuidgenerator.net/
+uid: e8b93fff-0f17-4a5a-ae97-611de68a86c5
+wikilink: https://wiki.chaotikum.org/hackspace:equipment:atem_mini_extreme_iso_1
+imagetag: atem1
+sets: 
+ - video
+ - leihbar
+ - kofferblau
+---
+
+ATEM Mini Extreme ISO
+

_inventory/atem-mini-weiss.md

+---
+layout: device
+name: "ATEM Mini Extreme ISO (Koffer Weiß)"
+#https://www.uuidgenerator.net/
+uid: 34eaa382-de42-4f1e-8f4d-987af077a613
+wikilink: https://wiki.chaotikum.org/hackspace:equipment:atem_mini_extreme_iso_2
+imagetag: atem2
+sets: 
+ - video
+ - leihbar
+ - kofferweiss
+---
+
+ATEM Mini Extreme ISO
+

_inventory/aver-gamer-mini.md

+---
+layout: device
+name: "Aver Capturecard Live Gamer MINI"
+#https://www.uuidgenerator.net/
+uid: 65b3752c-440e-4dc4-876c-5dd7b148ec92
+wikilink: https://wiki.chaotikum.org/hackspace:equipment:aver_gamer_mini
+imagetag: avercapturecard
+sets: 
+ - video
+ - leihbar
+---
+
+Aver Capturecard Live Gamer MINI
+

_inventory/beamer2.md

+---
+layout: device
+name: "Epson EB-992F Beamer (Mobiles Vortragsset)"
+#https://www.uuidgenerator.net/
+uid: 14961ed3-235f-4869-918b-573aa4f2befa
+wikilink: https://wiki.chaotikum.org/hackspace:equipment:beamer2
+imagetag: epsonbeamer
+sets: 
+ - vortrag
+ - leihbar
+---
+
+Epson EB-992F Beamer (Mobiles Vortragsset)
+

_inventory/blackmagic-design-mv-bidirect-sdihdmi-3g-blau.md

+---
+layout: device
+name: "Blackmagic Design MC BiDirect. SDI/HDMI 3G (2x) (Koffer Blau)"
+#https://www.uuidgenerator.net/
+uid: b5b9afc2-213d-49de-9ff0-6480cc8292fe
+wikilink: https://wiki.chaotikum.org/hackspace:equipment:blackmagic_design_mv_bidirect_sdihdmi_3g_1
+imagetag: blackmagic
+sets: 
+ - video
+ - leihbar
+ - kofferblau
+---
+
+Aver Capturecard Live Gamer MINI
+

_inventory/blackmagic-design-mv-bidirect-sdihdmi-3g-weiss.md

+---
+layout: device
+name: "Blackmagic Design MC BiDirect. SDI/HDMI 3G (2x) (Koffer Weiß)"
+#https://www.uuidgenerator.net/
+uid: 67fe9c8b-a59b-4d90-9cd2-27e00a6fc013
+wikilink: https://wiki.chaotikum.org/hackspace:equipment:blackmagic_design_mv_bidirect_sdihdmi_3g_2
+imagetag: blackmagic
+sets: 
+ - video
+ - leihbar
+ - kofferweiss
+---
+
+Aver Capturecard Live Gamer MINI
+

_inventory/elgato-capturecard.md

+---
+layout: device
+name: "Elgato Game Capture HD60 S"
+#https://www.uuidgenerator.net/
+uid: 0fcdfefe-6741-4833-83d4-fa0c6ed01b14
+wikilink: https://wiki.chaotikum.org/hackspace:equipment:elgato_game_capture_hd60_s
+imagetag:  capturecard
+sets: 
+ - video
+ - leihbar
+---
+
+Elgato Game Capture HD60 S