diff --git a/README.md b/README.md index 76514c8..728ac97 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,4 @@ Canadian Cyber Freedom is a [Libre Solutions Network](https://libresolutions.net - Document making changes - Improve list template - Create git demo videos -- Get & Teach one or two volunteers \ No newline at end of file +- Get & Teach some volunteers \ No newline at end of file diff --git a/content/_index.fr.md b/content/_index.fr.md index 488627d..857f20d 100644 --- a/content/_index.fr.md +++ b/content/_index.fr.md @@ -3,6 +3,4 @@ title: 'Canadian Cyber Freedom' weight: 3 --- - - -[Comment participier](/fr/how/getting-started/) \ No newline at end of file +[Aide](/how/translate/) \ No newline at end of file diff --git a/content/_index.md b/content/_index.md index d5ffcde..88c00f2 100644 --- a/content/_index.md +++ b/content/_index.md @@ -14,7 +14,9 @@ weight: 3 ### You've come to the right place! -*Currently, this project is in early phases of construction, help is needed to improve faster*. +*Currently, [this project](/about) is in early phases of construction, help is needed to improve faster*! It's a great time to [get involved](/how/getting-started) The goal is to build a world-class resource for Canadians who are eager to help make Canada the **most free country in Cyberspace**. It's a big dream, but many hands make light work! + + Learn how to [get started!](/how/getting-started/) Join the [matrix space](https://matrix.to/#/#canada:libresolutions.network) \ No newline at end of file diff --git a/content/bills/_BILL_FORMAT.md b/content/bills/_BILL_FORMAT.md index 5304fe7..402c678 100644 --- a/content/bills/_BILL_FORMAT.md +++ b/content/bills/_BILL_FORMAT.md @@ -3,13 +3,11 @@ title: "Bill Format" draft: True --- -# Bill +## Legislation -Link to bill: +|---|---|---|---| +|[Link to Bill]()|[Full Text]()|[Open Partliament]()|[Votes]()| -## Description -## Coverage - -## Criticism +### Coverage diff --git a/content/bills/c-11.fr.md b/content/bills/c-11.fr.md index ad5662e..27b961b 100644 --- a/content/bills/c-11.fr.md +++ b/content/bills/c-11.fr.md @@ -1,5 +1,6 @@ --- title: "C-11" +draft: true --- # C-11 \ No newline at end of file diff --git a/content/bills/c-11.md b/content/bills/c-11.md index 97b03de..463e234 100644 --- a/content/bills/c-11.md +++ b/content/bills/c-11.md @@ -1,11 +1,22 @@ --- title: "C-11" +description: "Online Streaming Act" +link: "https://www.parl.ca/LegisInfo/en/bill/44-1/c-11/" --- -# C-11 -[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/c-11) -[Full text](https://www.parl.ca/DocumentViewer/en/44-1/bill/C-11/royal-assent) +{{}} -## Description +|||| +|---|---|---|---| +|[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/c-11)|[Full Text](https://www.parl.ca/DocumentViewer/en/44-1/bill/C-11/royal-assent)|[Open Partliament](https://openparliament.ca/bills/44-1/C-11/)|[Votes](https://www.ourcommons.ca/Members/en/votes/44/1/164)| + + + + +### Coverage +- [A new streaming bill is close to becoming law in Canada. Here's how it works](https://www.cbc.ca/news/entertainment/bill-c-11-explained-1.6759878) +- [Controversial bill to regulate online streaming becomes law](https://www.cbc.ca/news/politics/c11-online-streaming-1.6824314) +[Canadian Digital Protectionism Gravely Threatens Free Speech](https://mises.org/wire/canadian-digital-protectionism-gravely-threatens-free-speech) +- [The Law Bytes Podcast, Episode 188: Consumers, Competition or Corporate Cash Grab? – My Bill C-11 Appearance at the CRTC](https://www.michaelgeist.ca/2023/12/law-bytes-podcast-episode-188/) \ No newline at end of file diff --git a/content/bills/c-18.md b/content/bills/c-18.md index 620c901..05e825e 100644 --- a/content/bills/c-18.md +++ b/content/bills/c-18.md @@ -1,5 +1,25 @@ --- title: "C-18" +description: "Online News Act" --- -# C-18 \ No newline at end of file +{{}} + +## Legislation + +|||| +|---|---|---|---| +||[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/c-18)|[Full Text](https://www.parl.ca/DocumentViewer/en/44-1/bill/C-18/)|[Open Partliament](https://openparliament.ca/bills/44-1/C-18/)|[Votes](https://www.ourcommons.ca/Members/en/votes/44/1/244)| + + +### Legislation +[Link to Bill]() +[Full text](royal-assent) +[Open Parliament]() +[Votes]() + + +### Coverage + +- [Canadian Digital Protectionism Gravely Threatens Free Speech](https://mises.org/wire/canadian-digital-protectionism-gravely-threatens-free-speech) +- [The Lose-Lose-Lose-Lose Bill C-18 Outcome: Meta Blocking News Links on Facebook and Instagram in Canada](https://www.michaelgeist.ca/2023/08/metablockslinks/) \ No newline at end of file diff --git a/content/bills/c-27.md b/content/bills/c-27.md index 98fcc2c..b100edb 100644 --- a/content/bills/c-27.md +++ b/content/bills/c-27.md @@ -1,5 +1,20 @@ --- title: "C-27" +description: "Digital Charter Implementation Act, 2022" +info: "https://www.parl.ca/LegisInfo/en/bill/44-1/c-27/json" --- -# C-27 \ No newline at end of file +{{}} + + + +## Legislation + +| | | | +|---|---|---| +|[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/c-27)|[Full Text](https://www.parl.ca/DocumentViewer/en/44-1/bill/C-27/first-reading)|[Open Partliament]()| + + +## Coverage + +[The Law Bytes Podcast, Episode 182: Inside the Hearings on Privacy and AI Reform – My Industry Committee Appearance on Bill C-27](https://www.michaelgeist.ca/2023/10/law-bytes-podcast-episode-182/) diff --git a/content/bills/s-210.fr.md b/content/bills/s-210.fr.md index f235b2c..bc2d833 100644 --- a/content/bills/s-210.fr.md +++ b/content/bills/s-210.fr.md @@ -1,5 +1,6 @@ --- title: "S-210" +draft: true --- # S-210 \ No newline at end of file diff --git a/content/bills/s-210.md b/content/bills/s-210.md index f235b2c..f115861 100644 --- a/content/bills/s-210.md +++ b/content/bills/s-210.md @@ -1,5 +1,19 @@ --- title: "S-210" +description: "An Act to restrict young persons’ online access to sexually explicit material" --- -# S-210 \ No newline at end of file + +{{}} + + +## Legislation + +|||| +|---|---|---| +|[Link to Bill](https://www.parl.ca/LegisInfo/en/bill/44-1/s-210)|[Full Text](https://www.parl.ca/documentviewer/en/44-1/bill/S-210/third-reading)|[Open Partliament](https://openparliament.ca/bills/44-1/S-210/)| + +### Coverage + +- [The Law Bytes Podcast, Episode 190: Debating Bill S-210 – Senator Julie Miville-Dechêne Defends Her Internet Age Verification Bill](https://www.michaelgeist.ca/2024/01/law-bytes-podcast-episode-190/) +- [Site Blocking and Age Verification for Twitter, Instagram, Snap and Twitch?: Age Verification Lobby Confirms it Wants Bill S-210 to Cover All Social Media Sites](https://www.michaelgeist.ca/2024/01/site-blocking-and-age-verification-for-twitter-instagram-snap-and-twitch-age-verification-lobby-confirms-it-wants-bill-s-210-to-cover-all-social-media-sites/) \ No newline at end of file diff --git a/content/how/_index.md b/content/how/_index.md index 400eedc..387804d 100644 --- a/content/how/_index.md +++ b/content/how/_index.md @@ -3,4 +3,3 @@ title: "Get involved" weight: 2 --- -Learn how to make changes to the project \ No newline at end of file diff --git a/content/how/getting-started.md b/content/how/getting-started.md index f57d377..60b0cb0 100644 --- a/content/how/getting-started.md +++ b/content/how/getting-started.md @@ -35,7 +35,12 @@ You may also find it helpful to join the [Matrix Space](/how/community) These are great links to help you research or compile information for making any change. +#### Legislation - [LEGISinfo](https://www.parl.ca/legisinfo/) +- [Open Parliament](https://openparliament.ca/) + + +### Coverage - [Justice Centre for Constitutional Freedoms](https://www.jccf.ca/) - [Michael Geist](https://www.michaelgeist.ca/) - [CCLA](https://ccla.org/our-work/privacy/) diff --git a/content/how/translate.md b/content/how/translate.md index 35a491c..40e94d8 100644 --- a/content/how/translate.md +++ b/content/how/translate.md @@ -4,9 +4,9 @@ description: "Parlez vous francais?" --- -Help translate this site. +## Help translate this site. -This site uses Hugo and its [multilingual support.](https://gohugo.io/content-management/multilingual/). Meaning that each page has its own **.md** file for english, and **.fr.md** file for french. +This site uses [hugo](https://gohugo.io) and its [multilingual support.](https://gohugo.io/content-management/multilingual/). Meaning that each page has its own **.md** file for english, and **.fr.md** file for french. It would be a huge help if someone with strong bilingual skills would be willing to keep changes in sync. diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index ab85719..6b3c010 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,8 +1,12 @@ \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index e5cddd0..973e470 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -2,4 +2,5 @@ {{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }} + \ No newline at end of file diff --git a/layouts/shortcodes/bill-information.html b/layouts/shortcodes/bill-information.html new file mode 100644 index 0000000..7f430b7 --- /dev/null +++ b/layouts/shortcodes/bill-information.html @@ -0,0 +1,15 @@ +{{ $i := .Get 0}} +{{ $info := data.GetJSON $i }} +{{ $bill := index $info 0}} + +{{if $bill.NumberCode }} +

{{$bill.NumberCode}}: {{$bill.ShortTitleEn}}

+
+

+ Status: {{$bill.StatusNameEn}}
as of {{$bill.LatestCompletedBillStageDateTime | time.Format "Jan 02 2006"}} +

+

Data provided by: LEGISinfo

+
+{{else}} +Error fetching data +{{end}} \ No newline at end of file diff --git a/themes/justice b/themes/justice index 1a8ce15..d02da6e 160000 --- a/themes/justice +++ b/themes/justice @@ -1 +1 @@ -Subproject commit 1a8ce154b6213cafae6e9504ede69329b3bddd86 +Subproject commit d02da6e6721686d4beb915f09059f6331d1754a5