Merge pull request #37 from ASKnetCommunity/development

bug fixes, markdown support, license formatting
ASKnetCommunity · Mar 24, 2022 · d9eb0c3 · d9eb0c3
2 parents 350263d + c1ad896
commit d9eb0c3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/_modules/.template/template.md b/_modules/.template/template.md
@@ -4,7 +4,7 @@ module:
     id: 'template'      #can only contain small letters, numbers, minus and underscore. needs to be the same as the file name
     url: ''     #url that is linked in the table view, can be empty
     tag: ''     #list, just separated by blank space, e.g. 'Web Open_Source'
-    description: ''
+    description: ""
     pic-url: opentech.jpg
     duration: 30    #introduction time in minutes, the resources have their own time blocks
     max-participants: 10

diff --git a/_modules/bmc-ws.md b/_modules/bmc-ws.md
@@ -1,9 +1,9 @@
 ---
 module:
     name: 'Media Hub Business Model Canvas Workshop'
-    id: 'bmc'      #can only contain small letters, numbers, minus and underscore. needs to be the same as the file name
+    id: 'bmc-ws'      #can only contain small letters, numbers, minus and underscore. needs to be the same as the file name
     tag: 'Organizational_Development'     #list, just separated by blank space, e.g. 'Web Open_Source'
-    description: 'A Business Model Canvas is a structured summary of the most important aspects of any business: Which problem does the business solve for whom by doing what - and how does it generate revenue? The canvas is a representation of the business model and as such gives hub teams the opportunity to co-create and over time further adapt their media hub's business model.' #Craft the business model of your hub
+    description: "A Business Model Canvas is a structured summary of the most important aspects of any business: Which problem does the business solve for whom by doing what - and how does it generate revenue? The canvas is a representation of the business model and as such gives hub teams the opportunity to co-create and over time further adapt their media hub's business model." #Craft the business model of your hub
     pic-url: bmc-ws.jpg
     duration: 15    #introduction time in minutes, the resources have their own time blocks
     max-participants: 12

diff --git a/_resources/.template/template.md b/_resources/.template/template.md
@@ -2,6 +2,7 @@
 resource:
     name: ''
     id: 'template'      #can only contain small letters, numbers, minus and underscore. needs to be the same as the file name
+    description: ""
     url: ''
     duration: 0     #in minutes
     difficulty:     #1-3, 1 is easyest

diff --git a/_resources/bmc.md b/_resources/bmc.md
@@ -2,10 +2,11 @@
 resource:
     name: 'Media Hub Business Model Canvas'
     id: 'bmc'      #can only contain small letters, numbers, minus and underscore. needs to be the same as the file name
-    description: "Craft the business model of your hub, lincensed under CC-BY-SA 4.0 International" 
+    description: "Craft the business model of your hub" 
     url: 'https://miro.com/app/board/uXjVOXFWNYQ=/?invite_link_id=648015904412'
     duration: 90     #in minutes
     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/) '
     # marker
 ---
diff --git a/training.html b/training.html
@@ -69,7 +69,7 @@ <h3><i class="fas fa-filter"></i> Filter modules by tags</h3>
                     </div>
                     <h2>{{ module.module.name }}</h2>
                     <p class="intro">Introduction into the module</p>
-                    {% if module.module.license %}<p class="intro">License: {{ module.module.license }}</p>{% endif %}
+                    {% if module.module.license %}<p class="intro">License: {{ module.module.license | markdownify }}</p>{% endif %}
                     <div class="thumbnail"><img src="/assets/img/modules/{{ module.module.pic-url }}" class="thumbnail"></div>
                     <div class="module-meta">
                         <div class="module-meta">
@@ -78,7 +78,6 @@ <h2>{{ module.module.name }}</h2>
                             <p class="material-costs"><i class="fas fa-dollar-sign"></i>{{ module_cost }} $ material costs</p>
                         </div>
                     </div>
-                    <p class="intro">Introduction into the module</p>
                     <div class="resources">
                         <p class="sidebar">Resources included: 
 
@@ -130,9 +129,12 @@ <h2>{{ module.module.name }}</h2>
                                             </div>
                                             <div class="content">
                                                 {% if res.resource.url %}<a href="{{ res.resource.url }}" class="button" target="_blank">Source &nbsp; <i class="fas fa-external-link-alt"></i></a>{% endif %}
-                                                <div><strong>{{ res.resource.name }}</strong> | {{ diff_text }} | {{ res.resource.duration }} minutes | {{ res.resource.cost }} ${% if res.resource.license %} | License: {{ res.resource.license }}{% endif %}</div>
-                                                {% if res.resource.description %} 
-                                                    <p>{{ res.resource.description }}</p>
+                                                <div><strong>{{ res.resource.name }}</strong> | {{ diff_text }} | {{ res.resource.duration }} minutes | {{ res.resource.cost }} $</div>
+                                                {% if res.resource.description %}
+                                                    {{ res.resource.description | markdownify }}
+                                                {% endif %}
+                                                {% if res.resource.license %}
+                                                    {{ res.resource.license | prepend: "License: " | markdownify }}
                                                 {% endif %}
                                             </div>
                                             <div class="clearer"></div>