Merge branch 'creativecommons:main' into main

creativecommons · Mar 14, 2024 · 4acc167 · 4acc167
2 parents be9b646 + 390acb3
commit 4acc167
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 36 deletions.
diff --git a/docs/_data/languages.yml b/docs/_data/languages.yml
@@ -1,24 +1,15 @@
 - name: Arabic
   string: ar
 
-- name: Mandarin
-  string: cmn
-
 - name: German
   string: de
 
 - name: English
   string: en
-
-- name: Spanish
-  string: es
 
 - name: French
   string: fr
 
-- name: Hindi
-  string: hi
-
 - name: Armenian
   string: hy
 
@@ -51,6 +42,3 @@
 
 - name: Tagalog
   string: tl
-
-- name: Urdu
-  string: ur
diff --git a/docs/_layouts/listing.html b/docs/_layouts/listing.html
@@ -91,17 +91,13 @@ <h1>
 		{% for page in site.pages %}
 			{% if page.layout == 'resource' %}
 				{% if page.featured == i %}
-					{% if page.topic contains topicfilter or topicfilter == null %}
-					{% if page.medium contains mediumfilter or mediumfilter == null %}
-					{% if page.language contains languagefilter or languagefilter == null %}
-						<div class="thumbnailbox {{ page.topic }} {{ page.medium }} {{page.language}}">
-							<a class="thumbnailLink" href="{{ page.permalink }}" >
-								<div class="thumbnailtitle"><h3>{{ page.title }}</h3></div>
-								<div class="thumbnail" style="background-image: url('{{ page.image-thumb }}'); "></div>
-								<div class="thumbnailblurb" style="color: rgb(0, 0, 0)">{{ page.blurb }}</div>
-							</a>
-						</div>
-					{% endif %}{% endif %}{% endif %}
+					<div class="thumbnailbox {{ page.topic }} {{ page.medium }} {{page.language}}">
+						<a class="thumbnailLink" href="{{ page.permalink }}" >
+							<div class="thumbnailtitle"><h3>{{ page.title }}</h3></div>
+							<div class="thumbnail" style="background-image: url('{{ page.image-thumb }}'); "></div>
+							<div class="thumbnailblurb" style="color: rgb(0, 0, 0)">{{ page.blurb }}</div>
+						</a>
+					</div>
 				{% endif %}
 			{% endif %}
 		{% endfor %}
@@ -114,17 +110,13 @@ <h1>
 				{% if page.weight == i %}
 					{% unless page.featured %}
 						{% if page.paramfilter == page.paramvalue %}
-						{% if page.topic contains topicfilter or topicfilter == null %}
-						{% if page.medium contains mediumfilter or mediumfilter == null %}
-						{% if page.language contains languagefilter or languagefilter == null %}
-								<div class="thumbnailbox {{ page.topic }} {{ page.medium }} {{page.language}}">
-									<a class="thumbnailLink" href="{{ page.permalink }}">
-										<div class="thumbnailtitle"><h3>{{ page.title }}</h3></div>
-										<div class="thumbnail" style="background-image: url('{{ page.image-thumb }}'); "></div>
-										<div class="thumbnailblurb" style="color: rgb(0, 0, 0)">{{ page.blurb }}</div>
-									</a>
-								</div>
-						{% endif %}{% endif %}{% endif %}
+							<div class="thumbnailbox {{ page.topic }} {{ page.medium }} {{page.language}}">
+								<a class="thumbnailLink" href="{{ page.permalink }}">
+									<div class="thumbnailtitle"><h3>{{ page.title }}</h3></div>
+									<div class="thumbnail" style="background-image: url('{{ page.image-thumb }}'); "></div>
+									<div class="thumbnailblurb" style="color: rgb(0, 0, 0)">{{ page.blurb }}</div>
+								</a>
+							</div>
 						{% endif %}
 					{% endunless %}
 				{% endif %}

diff --git a/docs/creative-commons-kiwi.md b/docs/creative-commons-kiwi.md
@@ -12,8 +12,7 @@ medium: video
 permalink: /creative-commons-kiwi/
 blurb: A quick video on the basics of Creative Commons.
 downloadurl: https://vimeo.com/26118296
-embed: <iframe src="//player.vimeo.com/video/26118296" width="500" height="281" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> <p><a href="https://vimeo.com/26118296">Creative Commons Kiwi</a> from <a href="http://web.archive.org/web/20140404034906/http://vimeo.com/25684782
-">CreativeCommons AotearoaNZ</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
+embed: <iframe src="//player.vimeo.com/video/26118296" width="500" height="281" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> <p><a href="https://vimeo.com/26118296">Creative Commons Kiwi</a> from <a href="http://web.archive.org/web/20140404034906/http://vimeo.com/25684782">CreativeCommons AotearoaNZ</a> on <a href="https://vimeo.com">Vimeo</a>.</p>
 author: Creative Commons Aotearoa New Zealand
 license: CC BY 3.0
 ---