Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix markdown #1553

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions content/about/supporters/images/Surfshark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions content/about/supporters/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,16 @@ Below we share a [list of current and past OONI funders](#funders).

{{< /supporter-section >}}

{{< supporter-section title="Seahorse Supporters" classExtra="grid-cols-6" >}}
{{< supporter-section title="Seahorse Supporters" classExtra="grid-cols-5" >}}

{{< supporter img="images/DigitalOcean.svg" name="Digital Ocean Hub for Good" link="https://www.digitalocean.com/community/pages/hollies-hub-for-good" imgHeight="40px" >}}
{{< supporter img="images/DigitalOcean.svg" name="Digital Ocean Hub for Good" link="https://www.digitalocean.com/community/pages/hollies-hub-for-good" imgHeight="60px" >}}

{{< supporter img="images/Greenhost.svg" name="Greenhost eclips.is platform" link="https://greenhost.net/" imgHeight="40px" >}}

{{< supporter img="images/Netlify.svg" name="Netlify" link="https://www.netlify.com/" imgHeight="40px" >}}

{{< supporter img="images/Surfshark.svg" name="Surfshark" link="https://surfshark.com/" imgHeight="40px" >}}

{{< supporter img="images/VPNCompare.svg" name="VPN Compare" link="https://www.vpncompare.co.uk/" imgHeight="40px" >}}

{{< /supporter-section >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,13 @@ We choose three sites with a similar number of blocking time for further analysi



* [Doan Trang page]([http://www.phamdoantrang.com/](http://www.phamdoantrang.com/))[^46],
* [Doan Trang page](http://www.phamdoantrang.com/)[^46],


* [Ba Sam]([https://anhbasam.wordpress.com/](https://anhbasam.wordpress.com/))[^47] and
* [Ba Sam](https://anhbasam.wordpress.com/)[^47] and


* [Viet Nam Times]([https://vietnamthoibao.org/](https://vietnamthoibao.org/))[^48]
* [Viet Nam Times](https://vietnamthoibao.org/)[^48]
The Doan Trang page is completely blocked by FPT Telecom and Viettel networks. However, VNPT opened for access from 16 June to 21 June 2022. At that time, there is an event on Human Rights Council to Hold its Fiftieth Regular Session from 13 June to 8 July 2022. The VNPT provider may have changed the moderation policy of this site and opened access to users. Until now they are still open access.

![](images/image4.png)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ tweet 762388008666591232
is no longer available
-->

{{% tweet 762569928205533184 %}}
{{< tweet user="horn__observer" id="762569928205533184" >}}


But Ethiopia is not the only country restricting access to the internet during
Expand Down
2 changes: 1 addition & 1 deletion content/support/faq.ar.md
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ OONI Probe، أيْ مِسْبار أوني، [برمجية حُرَّة مفت

* تضم مختارات من **المواقع الهامة على مستوى العالم** (قائمة الفحص العالمية)
* تضم مختارات من **المواقع الهامة على مستوى الدولة التي يقيم فيها مُشغِّل الاختبار** (قوائم الفحص الدولية)
* تتصف **بالتنوع**، إذ تضم مواقع وِب تنتمي إلى [30 تصنيفًا]((https://github.com/citizenlab/test-lists/blob/master/lists/00-LEGEND-new_category_codes.csv))، مما يزيد احتمال الكشف عن ممارسات الرقابة
* تتصف **بالتنوع**، إذ تضم مواقع وِب تنتمي إلى [30 تصنيفًا](https://github.com/citizenlab/test-lists/blob/master/lists/00-LEGEND-new_category_codes.csv)، مما يزيد احتمال الكشف عن ممارسات الرقابة
* تتصف بالعلنية، و هو ما يعني أنَّ **المستخدمين بوسعهم معرفة مواقع الوِب التي سيجرون الاختبارات** عليها، و ذلك قبل إجراء الاختبارات فعليًّا
* هي مستضافة في موقع GitHub مما **يشجّع مجتمع المعنيين بمراجعتها و المشاركة** في تحسينها
* لكونها مستضافة على GitHub تمكن **مراجعة مقترحات التعديل** قبل إحداثها، مما يعني مثلا أن لا مواقع خبيثة ستُضاف
Expand Down
2 changes: 1 addition & 1 deletion content/support/ooni-outreach-kit/index.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Con este folleto, proporcionamos algunos conceptos básicos acerca de la censura

Ofrecemos las diapositivas para un taller que puedes descargar y adaptar dependiendo de las necesidades de tu audiencia. Estas diapositivas son una plantilla, por favor no las considere como una presentación final. Los invitamos a adaptarlas según el contexto local del país donde realizará un evento, y las necesidades de la audiencia.

* **[Diapositivas completas del taller]([https://docs.google.com/presentation/d/1_WB2YvIKZJCSwpTN1LKCd0mlFC9srFZLr2Ycdye6hrQ/edit?usp=sharing)**
* **[Diapositivas completas del taller](https://docs.google.com/presentation/d/1_WB2YvIKZJCSwpTN1LKCd0mlFC9srFZLr2Ycdye6hrQ/edit?usp=sharing)**

Gracias a los esfuerzos de Advocacy Assembly podemos proporcionar las diapositivas y también notas útiles para el ponente de la presentación. Esperamos que estas notas le faciliten la preparación del taller, y que las diapositivas sean más accesibles para la audiencia.

Expand Down
4 changes: 2 additions & 2 deletions layouts/shortcodes/supporter.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

<a href="{{ $link }}">
<img class="col-span-1 w-full object-contain" src="{{ $img.RelPermalink}}" alt="{{ $name }}"
height="{{ $imgHeight }}">
</a>
style="height: {{ $imgHeight }}">
</a>
48 changes: 48 additions & 0 deletions layouts/shortcodes/tweet.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{{- $pc := .Page.Site.Config.Privacy.Twitter -}}
{{- $sc := .Page.Site.Config.Services.Twitter -}}
{{- if not $pc.Disable -}}
{{- $id := or (.Get "id") "" -}}
{{- $user := or (.Get "user") "" -}}
{{- if and $id $user -}}
{{- template "render-simple-tweet" (dict "id" $id "user" $user "dnt" $pc.EnableDNT "name" .Name "position" .Position) -}}
{{- else -}}
{{- errorf "The %q shortcode requires two named parameters: user and id. See %s" .Name .Position -}}
{{- end -}}
{{- end -}}

{{- define "render-simple-tweet" -}}
{{- $url := printf "https://twitter.com/%v/status/%v" .user .id -}}
{{- $query := querify "url" $url "dnt" .dnt "omit_script" true -}}
{{- $request := printf "https://publish.twitter.com/oembed?%s" $query -}}
{{- with resources.GetRemote $request -}}
{{- with .Err -}}
{{- errorf "%s" . -}}
{{- else -}}
{{- (. | transform.Unmarshal).html | safeHTML -}}
{{- end -}}
{{- else -}}
{{- end -}}
{{- end -}}

{{- define "__h_simple_twitter_css" -}}
{{- if not (.Page.Scratch.Get "__h_simple_twitter_css") -}}
{{/* Only include once */}}
{{- .Page.Scratch.Set "__h_simple_twitter_css" true -}}
<style type="text/css">
.twitter-tweet {
font: 14px/1.45 -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
border-left: 4px solid #2b7bb9;
padding-left: 1.5em;
color: #555;
}
.twitter-tweet a {
color: #2b7bb9;
text-decoration: none;
}
blockquote.twitter-tweet a:hover,
blockquote.twitter-tweet a:focus {
text-decoration: underline;
}
</style>
{{- end -}}
{{- end -}}