refactor: add new links for office hours

Signed-off-by: ankitm123 <ankitmohapatra123@gmail.com>

content/en/community/_index.md

@@ -9,7 +9,6 @@ menu:
     name: "Community"
 type: docs
 no_list: true
-
 ---
 
 Welcome to the Jenkins X community!
@@ -22,37 +21,35 @@ Upcoming [events and webinars](/community/#events--webinars) are shown on our [E
 <!-- {{< figure src="/images/community/GoCommunity-background.png" class="img-thumbnail" >}}
 image by Ashley McNamara, [creative commons license](https://github.com/ashleymcnamara/gophers/blob/master/GoCommunity.png) -->
 
-
-### Slack 
+### Slack
 
 We'd love to talk with you about Jenkins X and are happy to help if you have any questions.
 
 Talk to us on our slack channels, which are part of the Kubernetes slack.
 Join Kubernetes slack [here](https://slack.k8s.io/) and find us on our channels:
 
-* [\#jenkins-x-user](https://kubernetes.slack.com/messages/C9MBGQJRH) for users of Jenkins X
-* [\#jenkins-x-dev](https://kubernetes.slack.com/messages/C9LTHT2BB) for developers of Jenkins X
+- [\#jenkins-x-user](https://kubernetes.slack.com/messages/C9MBGQJRH) for users of Jenkins X
+- [\#jenkins-x-dev](https://kubernetes.slack.com/messages/C9LTHT2BB) for developers of Jenkins X
 
 ### Office Hours
 
 During office hours we demo the latest features, answer questions, and share knowledge together.
 
-We meet for office hours **every other Tuesday** at 15:00 UTC (*See your timezone [here](https://time.is/1600_in_UTC)*).
-
-<a href="https://us02web.zoom.us/j/89081347704?pwd=U2lob3JVamsxQ1RyK1hSa0prMWczdz09" class="btn btn-lg bg-primary text-white">join the Office Hours meeting</a>
+We meet for office hours **every other Tuesday** at 16:00 UTC (_See your timezone [here](https://time.is/1600_in_UTC)_).
 
-We'd love to hear your feedback or show some of the work you are doing with Jenkins X!
-Feel free to [add your comments and questions to the doc](https://docs.google.com/document/d/1wHdBlZAN-ndPELuBoM5HBnYiQLvcz92-euXne2mKOEI/edit) or ask your questions in person.
+<a href="https://us04web.zoom.us/j/78274076398?pwd=UGZwTDlLRDh1Yng2S09rNm1LZjY0dz09" class="btn btn-lg bg-primary text-white">join the Office Hours meeting</a>
 
-You can save Jenkins X office hours to your calendar by [clicking here](https://calendar.google.com/event?action=TEMPLATE&tmeid=NDFhNDVyNGdzMW9nZnBpNzhpdGZsMG5qZWpfMjAyMDA1MTlUMTUwMDAwWiAwMzJwcDVlMDJqMjJiMHFqdGs2YTRxc21lY0Bn&tmsrc=032pp5e02j22b0qjtk6a4qsmec%40group.calendar.google.com&scp=ALL). 
+You can save Jenkins X office hours to your calendar by [clicking here](https://calendar.google.com/event?action=TEMPLATE&tmeid=aDFkamY5YXRpMnVocGV2Z2hybXBzMjVwOXNfMjAyMjAxMDRUMTYwMDAwWiByNnE4OW91MzI3MHExZXBnYnI2dWpqMjgxNEBn&tmsrc=r6q89ou3270q1epgbr6ujj2814%40group.calendar.google.com&scp=ALL).
 
 {{< calendar >}}
 
+Office hour meeting notes can be found [here](https://docs.google.com/document/d/1gQIIVYboInUTpb2v5ZxC80suBPJ6T2Z18Ba1EL7YPOI/edit?usp=sharing)
+
 Previous office hour recordings can be found on our [Jenkins X YouTube channel](https://www.youtube.com/channel/UCN2kblPjXKMcjjVYmwvquvg/playlists) in the Office Hours playlist.
 Alternatively, see our office hours [archives](/community/office_hours/).
 
-
 ### Newsletter
+
 Our newsletter is filled with various topics and relevant content for people just starting, or folks who have been using the platform for a while.
 
 {{< mailchimp >}}
@@ -63,7 +60,7 @@ The previous newsletters are also available there.
 ### Events & Webinars
 
 Our community likes to share! Join us during [Office Hours](/community/office_hours).
-Find out about upcoming events on our [Event Calendar](/community/calendar) or announced on [Twitter](https://twitter.com/jenkinsxio). 
+Find out about upcoming events on our [Event Calendar](/community/calendar) or announced on [Twitter](https://twitter.com/jenkinsxio).
 
 We have a curated list of [Jenkins X talks](/docs/resources/demos-talks-posts/talks/) and [articles](/docs/resources/demos-talks-posts/articles/) from our community to check out in our [Resources](/docs/resources/demos-talks-posts/) section.
 

content/en/community/calendar.md

@@ -6,15 +6,13 @@ type: docs
 no_list: true
 weight: 60
 aliases:
-    - /docs/community/calendar/
+  - /docs/community/calendar/
 ---
 
-<iframe src="https://calendar.google.com/calendar/embed?height=600&amp;wkst=1&amp;bgcolor=%23ffffff&amp;ctz=Europe%2FLondon&amp;src=MDMycHA1ZTAyajIyYjBxanRrNmE0cXNtZWNAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&amp;color=%23EF6C00&amp;showTz=1" style="border:solid 1px #777" width="800" height="600" frameborder="0" scrolling="no"></iframe>
-
+{{< calendar >}}
 
 ### Add Events or Make Changes
 
 Please create a documentation issue using the link on the right hand menu, or [click here](https://github.com/jenkins-x/jx-docs/issues/new?title=Event%20Calendar).
 
 You should then be at a page for creating an issue on the `jenkins-x/jx-docs` repo, with the issue title as "Event Calendar". Please describe your event, with meeting links, and the time in UTC. Thank you!
-

content/en/community/office_hours/_index.md

@@ -4,19 +4,3 @@ linktitle: Office Hours
 type: docs
 weight: 70
 ---
-
-During office hours we demo the latest features, answer questions, and share knowledge together.
-
-We meet for office hours **every other Tuesday** at 16:00 UTC (*See your timezone [here](https://time.is/1600_in_UTC)*).
-
-<a href="https://us02web.zoom.us/j/89081347704?pwd=U2lob3JVamsxQ1RyK1hSa0prMWczdz09" class="btn btn-lg bg-primary text-white">join the Office Hours meeting</a>
-
-We'd love to hear your feedback or show some of the work you are doing with Jenkins X! Feel free to [add your comments and questions to the doc](https://docs.google.com/document/d/1wHdBlZAN-ndPELuBoM5HBnYiQLvcz92-euXne2mKOEI/edit) or ask your questions in person.
-
-You can save Jenkins X office hours to your calendar by [clicking here](https://calendar.google.com/event?action=TEMPLATE&tmeid=NDFhNDVyNGdzMW9nZnBpNzhpdGZsMG5qZWpfMjAyMDA1MTlUMTUwMDAwWiAwMzJwcDVlMDJqMjJiMHFqdGs2YTRxc21lY0Bn&tmsrc=032pp5e02j22b0qjtk6a4qsmec%40group.calendar.google.com&scp=ALL). 
-
-<a target="_blank" href="https://calendar.google.com/event?action=TEMPLATE;tmeid=NDFhNDVyNGdzMW9nZnBpNzhpdGZsMG5qZWpfMjAyMDA1MTlUMTUwMDAwWiAwMzJwcDVlMDJqMjJiMHFqdGs2YTRxc21lY0Bn;tmsrc=032pp5e02j22b0qjtk6a4qsmec%40group.calendar.google.com;scp=ALL"><img border="0" src="https://www.google.com/calendar/images/ext/gc_button1_en-GB.gif"></a>
-
-<iframe src="https://calendar.google.com/calendar/embed?height=600&amp;wkst=1&amp;bgcolor=%23ffffff&amp;ctz=Europe%2FLondon&amp;src=MDMycHA1ZTAyajIyYjBxanRrNmE0cXNtZWNAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&amp;color=%23EF6C00&amp;showTz=1" style="border:solid 1px #777" width="800" height="600" frameborder="0" scrolling="no"></iframe>
-
-Previous office hour recordings can be found on our [Jenkins X YouTube channel](https://www.youtube.com/channel/UCN2kblPjXKMcjjVYmwvquvg/playlists) in the Office Hours playlist. Alternatively, past office hours are listed below.

layouts/shortcodes/calendar.html

@@ -1,3 +1,10 @@
-{{/* <a target="_blank" rel="noopener noreferrer" href="https://calendar.google.com/event?action=TEMPLATE;tmeid=NDFhNDVyNGdzMW9nZnBpNzhpdGZsMG5qZWpfMjAyMDA1MTlUMTUwMDAwWiAwMzJwcDVlMDJqMjJiMHFqdGs2YTRxc21lY0Bn;tmsrc=032pp5e02j22b0qjtk6a4qsmec%40group.calendar.google.com;scp=ALL"><img border="0" src="https://www.google.com/calendar/images/ext/gc_button1_en-GB.gif"></a> */}}
-
-<iframe src="https://calendar.google.com/calendar/embed?height=600&amp;wkst=1&amp;bgcolor=%23ffffff&amp;ctz=Europe%2FLondon&amp;src=MDMycHA1ZTAyajIyYjBxanRrNmE0cXNtZWNAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&amp;color=%23EF6C00&amp;showTz=1" style="border:solid 1px #777" width="800" height="600" frameborder="0" scrolling="no"></iframe>
+<iframe
+  title="Jenkins X events calender"
+  src="https://calendar.google.com/calendar/embed?height=600&wkst=1&bgcolor=%23ffffff&ctz=America%2FNew_York&src=cjZxODlvdTMyNzBxMWVwZ2JyNnVqajI4MTRAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&src=ZW4udXNhI2hvbGlkYXlAZ3JvdXAudi5jYWxlbmRhci5nb29nbGUuY29t&src=Y190MXJhaHZuYTVtY2hpcnZncnQzNWVpNW83Z0Bncm91cC5jYWxlbmRhci5nb29nbGUuY29t&color=%234285F4&color=%237986CB&color=%23B39DDB"
+  style="border: solid 1px #777"
+  width="800"
+  height="600"
+  frameborder="0"
+  scrolling="no"
+  alt="Jenkins X events calender"
+></iframe>