Merge pull request #97 from ASKnetCommunity/development

Development changes of the code ready for deployment

Author: timmwille

Gemfile.lock

@@ -3,28 +3,14 @@ GEM
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    bcp47 (0.3.3)
-      i18n
-    builder (3.2.4)
     colorator (1.1.0)
     concurrent-ruby (1.1.9)
-    ebnf (1.2.0)
-      rdf (~> 3.1)
-      sxp (~> 1.1)
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    equivalent-xml (0.6.0)
-      nokogiri (>= 1.4.3)
     eventmachine (1.2.7)
     ffi (1.15.3)
     forwardable-extended (2.6.0)
-    haml (5.2.0)
-      temple (>= 0.8.0)
-      tilt
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
-    htmlentities (4.3.4)
     http_parser.rb (0.6.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
@@ -45,63 +31,16 @@ GEM
       terminal-table (~> 1.8)
     jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-rdf (3.1.1.pre.develop.743)
-      jekyll (>= 3.1)
-      linkeddata (~> 2.0)
-      net-http-persistent (~> 2.9)
-      sparql-client (~> 3.0, >= 3.0.1)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.7.1)
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json-canonicalization (0.2.0)
-    json-ld (3.1.4)
-      htmlentities (~> 4.3)
-      json-canonicalization (~> 0.2)
-      link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.14)
-      rack (~> 2.0)
-      rdf (~> 3.1)
-    json-ld-preloaded (3.1.3)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    ld-patch (0.3.3)
-      ebnf (~> 1.1)
-      rdf (>= 2.2, < 4.0)
-      rdf-xsd (>= 2.2, < 4.0)
-      sparql (>= 2.2, < 4.0)
-      sxp (~> 1.0)
-    link_header (0.0.8)
-    linkeddata (2.2.4)
-      equivalent-xml (~> 0.6)
-      json-ld (>= 2.1, < 4.0)
-      ld-patch (~> 0.3)
-      nokogiri (~> 1.8)
-      rdf (>= 2.2, < 4.0)
-      rdf-aggregate-repo (>= 2.2, < 4.0)
-      rdf-isomorphic (>= 2.0, < 4.0)
-      rdf-json (>= 2.0, < 4.0)
-      rdf-microdata (>= 2.2, < 4.0)
-      rdf-n3 (>= 2.1, < 4.0)
-      rdf-normalize (~> 0.3)
-      rdf-rdfa (>= 2.2, < 4.0)
-      rdf-rdfxml (>= 2.2, < 4.0)
-      rdf-reasoner (~> 0.4)
-      rdf-tabular (>= 2.2, < 4.0)
-      rdf-trig (>= 2.0, < 4.0)
-      rdf-trix (>= 2.2, < 4.0)
-      rdf-turtle (>= 2.2, < 4.0)
-      rdf-vocab (>= 2.2, < 4.0)
-      rdf-xsd (>= 2.2, < 4.0)
-      shex (~> 0.5)
-      sparql (>= 2.2, < 4.0)
-      sparql-client (>= 2.1, < 4.0)
     liquid (4.0.3)
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -111,113 +50,28 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    multi_json (1.15.0)
-    net-http-persistent (2.9.4)
-    nokogiri (1.11.7-x86_64-linux)
-      racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    racc (1.4.16)
-    rack (2.2.3)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.1.6)
-      hamster (~> 3.0)
-      link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.1.0)
-      rdf (~> 3.1)
-    rdf-isomorphic (3.1.0)
-      rdf (~> 3.1)
-    rdf-json (3.1.0)
-      rdf (~> 3.1)
-    rdf-microdata (3.1.1)
-      htmlentities (~> 4.3)
-      nokogiri (~> 1.10)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-n3 (3.1.0)
-      rdf (~> 3.0)
-      sparql (~> 3.0)
-      sxp (~> 1.0)
-    rdf-normalize (0.4.0)
-      rdf (~> 3.1)
-    rdf-rdfa (3.1.2)
-      haml (~> 5.1)
-      htmlentities (~> 4.3)
-      rdf (~> 3.1, >= 3.1.2)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-vocab (~> 3.1, >= 3.1.5)
-      rdf-xsd (~> 3.1)
-    rdf-rdfxml (3.1.0)
-      htmlentities (~> 4.3)
-      rdf (~> 3.1)
-      rdf-rdfa (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-reasoner (0.6.2)
-      rdf (~> 3.1, >= 3.1.2)
-      rdf-vocab (~> 3.1, >= 3.1.5)
-      rdf-xsd (~> 3.1)
-    rdf-tabular (3.1.1)
-      addressable (~> 2.3)
-      bcp47 (~> 0.3, >= 0.3.3)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
-      rdf-vocab (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-trig (3.1.0)
-      ebnf (~> 1.1)
-      rdf (~> 3.1)
-      rdf-turtle (~> 3.1)
-    rdf-trix (3.1.0)
-      rdf (~> 3.1)
-    rdf-turtle (3.1.1)
-      ebnf (~> 1.2)
-      rdf (~> 3.1, >= 3.1.2)
-    rdf-vocab (3.1.8)
-      rdf (~> 3.1, >= 3.1.2)
-    rdf-xsd (3.1.0)
-      rdf (~> 3.1)
     rexml (3.2.4)
     rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    shex (0.5.2)
-      ebnf (~> 1.1)
-      json-ld (>= 2.2, < 4.0)
-      json-ld-preloaded (>= 2.2, < 4.0)
-      rdf (>= 2.2, < 4.0)
-      rdf-xsd (>= 2.2, < 4.0)
-      sparql (>= 2.2, < 4.0)
-      sxp (~> 1.0)
-    sparql (3.0.2)
-      builder (~> 3.2)
-      ebnf (~> 1.1)
-      rdf (~> 3.0)
-      rdf-aggregate-repo (>= 2.2, < 4.0)
-      rdf-xsd (~> 3.0)
-      sparql-client (~> 3.0)
-      sxp (~> 1.0)
-    sparql-client (3.0.1)
-      net-http-persistent (>= 2.9, < 4)
-      rdf (~> 3.0)
-    sxp (1.1.0)
-      rdf (~> 3.1)
-    temple (0.8.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tilt (2.0.10)
     unicode-display_width (1.7.0)
 
 PLATFORMS
+  x86_64-linux
   x86_64-linux-musl
 
 DEPENDENCIES
   jekyll (~> 4.1.1)
   jekyll-feed (~> 0.12)
-  jekyll-rdf (~> 3.1.0)
   minima (~> 2.5)
   tzinfo (~> 1.2)
   tzinfo-data

_layouts/trainingsplan.html

@@ -171,6 +171,114 @@
   border-color: transparent transparent rgba(223, 175, 95, 0.9) transparent;
   transform-origin: bottom;
 }
+
+.license-author {
+  display: flex;
+  justify-content: space-between;
+}
+
+.license-author .button {
+  width: fit-content !important;
+  padding: 6px 10px !important;
+}
+
+.author-list .author:not(:first-child):before {
+  content: ', ';
+}
+
+.flex-between {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+#reference-list {
+  transform: scale(0, 0);
+  transition: transform ease-in-out 100ms;
+}
+
+#reference-list h4 {
+  margin-bottom: 0.5rem;
+}
+
+#reference-list ul {
+  list-style-position: inside;
+  margin-left: 30px;
+}
+
+.author-info {
+  margin-bottom: 1rem;
+}
+
+#reference-button {
+  cursor: pointer;
+}
+
+#reference-button i {
+  font-size: 1.5rem;
+}
+
+#sidebar .breaks {
+  bottom: 50px !important;
+}
+
+.display-print {
+  display: none;
+}
+
+@media print {
+    .pagebreak { page-break-before: always; } /* page-break-after works, as well */
+    .dont-print, #reference-button {
+      visibility: hidden;
+    }
+    #reference-list {
+      transform: scale(1, 1) !important;
+    }
+    .display-print {
+      display: inline;
+    }
+}
+
+.edit-trainer-notes-button {
+  font-weight: bold;
+  font-size: 0.9em !important;
+  margin-left: 0 !important;
+}
+
+.edit-trainer-notes-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 3;
+  transform: scale(0, 0);
+  transform-origin: top right;
+  transition: transform ease-in-out 100ms;
+}
+
+.edit-trainer-notes-popup:target {
+  transform: scale(1, 1);
+}
+
+.flex-start-center {
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  gap: 5px;
+}
+
+.reset-notes i {
+  font-size: 0.6rem;
+}
+
+/* #sidebar .edit-trainer-notes-popup {
+  display: none;
+} */
     </style>
   </head>
   <body>

_resources/.template/template.md

@@ -8,5 +8,6 @@ resource:
     difficulty:     #1-3, 1 is easyest
     cost: 1000      #in $ (dont leave empty, but type 0 instead)
     license: #e.g. CC BY-SA 4.0
+    author: #add the author/organisation name in here, use [markdown](URL) formatting to link to website/reference. You can add also multiple authors via '[author 1](link1), [author 2](link2)'
     # marker
 ---

_resources/EJN_5_Point_test_for_hate_speech_video.md

@@ -8,5 +8,6 @@ resource:
     difficulty: 1   
     cost: 0      
     license:
+    author: "[Ethical Journalism Network](https://ethicaljournalismnetwork.org/)"
     # marker
 ---

_resources/SafeDigitasSpaces.md

@@ -8,5 +8,6 @@ resource:
     difficulty: 2
     cost: 0 
     license: CC BY-SA 4.0
+    author: "[r0g_agency](https://openculture.agency/)"
     # marker
 ---

_resources/askotec.md

@@ -8,5 +8,6 @@ resource:
     difficulty: 
     cost: 1000
     license: 
+    author: "[r0g_agency](https://openculture.agency/)"
     # marker
 ---

_resources/askotecintro.md

@@ -8,5 +8,6 @@ resource:
     difficulty: 1
     cost: 1000
     license: CC-BY-SA 4.0
+    author: "[r0g_agency](https://openculture.agency/)"
     # marker
 ---

_resources/bmc.md

@@ -8,6 +8,7 @@ resource:
     difficulty: 1     #1-3, 1 is easyest
     cost: 0      #in $
     license: '[CC-BY-SA 4.0 International](https://choosealicense.com/licenses/cc-by-sa-4.0/) '
+    author: "[#ASKnet](https://asknet.community/)"
     # marker
 ---
 

_resources/code_of_conduct.md

@@ -8,5 +8,6 @@ resource:
     difficulty: 2
     cost: 0      #in $ (dont leave empty, but type 0 instead)
     license: CC BY-SA 4.0
+    author: "[#defyhatenow](https://defyhatenow.org/)"
     # marker
 ---

_resources/communityrepairsetup.md

@@ -8,5 +8,6 @@ resource:
     difficulty: 2     #1-3, 1 is easyest
     cost: 0      #in $ (dont leave empty, but type 0 instead)
     license: CC BY-SA 4.0 #e.g. CC BY-SA 4.0
+    author: "[#ASKnet](https://asknet.community/)"
     # marker
 ---