updates and getting legisinfo to work

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
+- Get & Teach some volunteers

content/_index.fr.md

@@ -3,6 +3,4 @@ title: 'Canadian Cyber Freedom'
 weight: 3
 ---
 
-
+[Aide](/how/translate/)
-
-[Comment participier](/fr/how/getting-started/)

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)

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
+### Coverage
-
-## Criticism
 

content/bills/c-11.fr.md

@@ -1,5 +1,6 @@
 ---
 title: "C-11"
+draft: true
 ---
 
 # C-11

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)   
+{{<bill-information "https://www.parl.ca/LegisInfo/en/bill/44-1/c-11/json">}}
-[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/)

content/bills/c-18.md

@@ -1,5 +1,25 @@
 ---
 title: "C-18"
+description: "Online News Act"
 ---
 
-# C-18
+{{<bill-information "https://www.parl.ca/LegisInfo/en/bill/44-1/c-18/json">}}
+
+## 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/)

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
+{{<bill-information "https://www.parl.ca/LegisInfo/en/bill/44-1/c-27/json">}}
+
+
+
+## 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/)

content/bills/s-210.fr.md

@@ -1,5 +1,6 @@
 ---
 title: "S-210"
+draft: true
 ---
 
 # S-210 

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 
+
+{{<bill-information "https://www.parl.ca/LegisInfo/en/bill/44-1/s-210/json">}}
+
+
+## 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/)

content/how/_index.md

@@ -3,4 +3,3 @@ title: "Get involved"
 weight: 2
 ---
 
-Learn how to make changes to the project

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/)

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.
 
 

layouts/partials/footer.html

@@ -1,8 +1,12 @@
 <footer style="justify-content: center; padding:5px;">
     <p style="margin:15px;">Canadian Cyber Freedom © 2024 is licensed under <a href="http://creativecommons.org/licenses/by-sa/4.0">CC-BY-SA 4.0</a>
     </p>
-    <a style="margin-left:5rem;margin-right:5rem;" href="https://libresolutions.network"><strong>Libre Solutions Network</strong></a>
+    <div style="margin-right:2rem;margin-left:2rem;display:flex;flex-direction: column;justify-content: center;">
+        <a style="text-align:center;" href="https://libresolutions.network"><strong>Libre Solutions Network</strong></a>
+        <a style="text-align:center;" href="https://code.gabe.rocks/gabriel/cyberfreedom">Repository</a>
+    </div>
     <p style="margin:15px;">
+        
         This site is a resource for educational purposes for constituents.<br> Nothing on this site constitutes legal advice, nor is suitable for regulatory compliance.
     </p>
 </footer>

layouts/partials/head.html

@@ -2,4 +2,5 @@
 <meta name="viewport" content="width=device-width">
 <title>{{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }}</title>
 <link rel="stylesheet" href="/theme.css?d={{time.Now.Unix}}">
+<link rel="icon" href="/logo.webp">
 <script defer data-domain="cyberfreedom.ca" src="https://plausible.libresolutions.network/js/script.js"></script>

layouts/shortcodes/bill-information.html

@@ -0,0 +1,15 @@
+{{ $i := .Get 0}}
+{{ $info := data.GetJSON $i }}
+{{ $bill := index $info 0}}
+
+{{if $bill.NumberCode }}
+<h2>{{$bill.NumberCode}}: {{$bill.ShortTitleEn}}</h2>
+<div style="border: 1px solid var(--theme-accent);margin:1rem;padding:0.5rem;">
+    <p>
+        <strong>Status:</strong> {{$bill.StatusNameEn}} <br>as of {{$bill.LatestCompletedBillStageDateTime | time.Format "Jan 02 2006"}}
+    </p>
+    <p><i>Data provided by: </i><a href="https://www.parl.ca/legisinfo/en/overview">LEGIS<i>info</i></a></p>
+</div>
+{{else}}
+Error fetching data
+{{end}}

themes/justice

@@ -1 +1 @@
-Subproject commit 1a8ce154b6213cafae6e9504ede69329b3bddd86
+Subproject commit d02da6e6721686d4beb915f09059f6331d1754a5