diff --git a/content/about/supporters/images/Surfshark.svg b/content/about/supporters/images/Surfshark.svg new file mode 100644 index 000000000..73b044271 --- /dev/null +++ b/content/about/supporters/images/Surfshark.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/content/about/supporters/index.md b/content/about/supporters/index.md index 48bce7c78..2e676d7b8 100644 --- a/content/about/supporters/index.md +++ b/content/about/supporters/index.md @@ -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 >}} diff --git a/content/post/2022-state-of-internet-censorship-vietnam/index.md b/content/post/2022-state-of-internet-censorship-vietnam/index.md index a26882694..8da9182c0 100644 --- a/content/post/2022-state-of-internet-censorship-vietnam/index.md +++ b/content/post/2022-state-of-internet-censorship-vietnam/index.md @@ -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) diff --git a/content/post/ethiopia-internet-shutdown-amidst-recent-protests.md b/content/post/ethiopia-internet-shutdown-amidst-recent-protests.md index 55c95e052..6d655b45f 100644 --- a/content/post/ethiopia-internet-shutdown-amidst-recent-protests.md +++ b/content/post/ethiopia-internet-shutdown-amidst-recent-protests.md @@ -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 diff --git a/content/support/faq.ar.md b/content/support/faq.ar.md index cf5a2a34d..97b45ff0d 100644 --- a/content/support/faq.ar.md +++ b/content/support/faq.ar.md @@ -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 تمكن **مراجعة مقترحات التعديل** قبل إحداثها، مما يعني مثلا أن لا مواقع خبيثة ستُضاف diff --git a/content/support/ooni-outreach-kit/index.es.md b/content/support/ooni-outreach-kit/index.es.md index 9c668f1de..cc5a8c991 100644 --- a/content/support/ooni-outreach-kit/index.es.md +++ b/content/support/ooni-outreach-kit/index.es.md @@ -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. diff --git a/layouts/shortcodes/supporter.html b/layouts/shortcodes/supporter.html index c84052729..f892895ef 100644 --- a/layouts/shortcodes/supporter.html +++ b/layouts/shortcodes/supporter.html @@ -6,5 +6,5 @@ {{ $name }} - \ No newline at end of file + style="height: {{ $imgHeight }}"> + diff --git a/layouts/shortcodes/tweet.html b/layouts/shortcodes/tweet.html new file mode 100644 index 000000000..eb41363fe --- /dev/null +++ b/layouts/shortcodes/tweet.html @@ -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 -}} + + {{- end -}} +{{- end -}}