splitted pages

3 files changed, 80 insertions, 81 deletions

diff --git a/css/default.css b/css/default.css
index 7225dbc..deeb562 100644
--- a/css/default.css
+++ b/css/default.css
@@ -1,3 +1,21 @@
+header {
+    width: 39rem;
+    margin: auto;
+}
+
+header p#logo {
+    font-size: 200%;
+}
+
+header p#nav a {
+    padding: .5rem;
+    font-size: 120%;
+}
+
+h1.title {
+    display: none;
+}
+
 div#content {
     width: 39rem;
     margin: auto;
diff --git a/pages/index.org b/pages/index.org
index 3dbff1c..c874ee6 100644
--- a/pages/index.org
+++ b/pages/index.org
@@ -1,94 +1,66 @@
-#+title: LibreAustralia
+#+title: About LibreAustralia
 
-LibreAustralia is a group advocating [[https://www.gnu.org/philosophy/free-sw.html][free software]] for Australia (and beyond). Founded in 2021, the goal of the group is to help everyone to be free from proprietary software and take their computing in their own hands, and to grow the free software community in Australia (and Asia-Pacific in general).
-
-* Weekly virtual meetings
-  :PROPERTIES:
-  :CUSTOM_ID: activities
-  :END:
-We meet every Monday online at 20:00-21:00 Australian Eastern Time (currently UTC+10) on [[https://jitsi.member.fsf.org/libreau][Jitsi]], unless otherwise specified. See [[#timezone-conversion][below]] for some handy GNU command to convert the time to your timezone.
-In the meeting we generally have free flow discussions, to share discoveries, experiences, resources, tips and issues related to free software.
-Sometimes we will watch a video about free software like a conference talk together.
-And sometimes we also try to be like a normal tech meetup group and host talks, workshops and what-have-you.
-You can find upcoming events [[#upcoming][below]], and past events [[#past][further below]].
-
-Everyone is welcome to join, whether you reside in Australia or not.
-
-Events will also be announced at [[https://hostux.social/@libreau][the mastodon account]].
-
-* Get in touch
+* About LibreAustralia
   :PROPERTIES:
-  :CUSTOM_ID: contact
-  :END:
-We have an IRC channel [[irc://libera.chat/libreau][#libreau at Libera Chat]]. You can also follow us on Mastodon at [[https://hostux.social/@libreau][@libreau@hostux.social]] or send emails to info@libreau.org. A mailing list is under construction.
-
-We are looking for collaborators and co-organisers. If you believe in free software values and would like to advance the free software movement, please email [[mailto:info@libreau.org][info@libreau.org]].
-
-* Commitment to free software
-  :PROPERTIES:
-  :CUSTOM_ID: freedom
-  :END:
-As a free software advocacy group, LibreAustralia is committed to freedom. We will not ask you to use proprietary software to communicate with LibreAustralia. This means you won't find us on Github, Meetup, Google etc.
-
-* Upcoming events
-  :PROPERTIES:
-  :CUSTOM_ID: upcoming
+  :CUSTOM_ID: title
   :END:
+LibreAustralia is a group advocating [[https://www.gnu.org/philosophy/free-sw.html][free software]] for Australia (and beyond). Founded in 2021, the goal of the group is to help everyone to be free from proprietary software and take their computing in their own hands, and to grow the free software community in Australia (and Asia-Pacific in general).
 
-** 23rd Aug 2021: Hurd watch party (NOTE different jitsi link)
+** Weekly virtual meetings
    :PROPERTIES:
-   :CUSTOM_ID: watch-party-hurd
+   :CUSTOM_ID: activities
    :END:
-- When :: 20:00-21:00 Monday 23th Aug UTC+10 ([[#timezone-conversion][what time in my timezone?]])
-- Where :: [[https://meet.jit.si/moderated/6205b20531336cb7e195243365d9081e18f3100b3ab60dcec83b38b3be022914][Jitsi]]
-- What ::  Bring your favourite drink and join us to watch a talk together.
+ We meet every Monday online at 20:00-21:00 Australian Eastern Time (currently UTC+10) on [[https://jitsi.member.fsf.org/libreau][Jitsi]], unless otherwise specified. See [[#timezone-conversion][below]] for some handy GNU commands to convert the time to your timezone.
+ In the meeting we generally have free flow discussions, to share discoveries, experiences, resources, tips and issues related to free software.
+ Sometimes we will watch a video about free software like a conference talk together.
+ And sometimes we also try to be like a normal tech meetup group and host talks, workshops and what-have-you.
+ Check out [[file:upcoming.org][upcoming events]]. There is also [[file:past.org][a page listing past events]].
 
-  We will watch [[https://archive.fosdem.org/2018/schedule/event/microkernel_hurd_pci_arbiter/][Hurd's PCI arbiter]], presented by Samuel Thibault at FOSDEM18. If you have been wondering what the [[https://www.gnu.org/software/hurd/][GNU microkernel]] is all about, this is the talk to start with. A discussion will ensue.
+ Everyone is welcome to join, whether you reside in Australia or not.
 
-* Past events
-  :PROPERTIES:
-  :CUSTOM_ID: past
-  :END:
+ Events will also be announced at [[https://hostux.social/@libreau][the mastodon account]].
 
-** Free software hangout
+** Get in touch
    :PROPERTIES:
-   :CUSTOM_ID: hangout
+   :CUSTOM_ID: contact
    :END:
+We have an IRC channel [[irc://libera.chat/libreau][#libreau at Libera Chat]]. You can also follow us on Mastodon [[https://hostux.social/@libreau][@libreau@hostux.social]] or send emails to info@libreau.org. A mailing list is under construction.
 
-- When :: 20:00-21:00 Monday 9th Aug UTC+10
-- Where :: [[https://meet.jit.si/moderated/6205b20531336cb7e195243365d9081e18f3100b3ab60dcec83b38b3be022914][jitsi]]
-- What :: Join us on jitsi for a free software hangout, an informal meeting of free flow discussions, where we get together to share discoveries, experiences, resources, tips and issues related to free software.
-
-** Online watch party
+** Call for collaborations and proposals
    :PROPERTIES:
-   :CUSTOM_ID: watch-party
+   :CUSTOM_ID: cfcp
    :END:
+We are looking for collaborators, co-organisers and speakers. 
 
-At 20:00 on Monday 19th July (UTC+10), bring your favourite drink and join us at [[https://jitsi.member.fsf.org/libreau][jitsi]] to watch a talk together.
-
-We will watch [[https://lca2021.linux.org.au/schedule/presentation/58/][A Comprehensive Strategic Plan for Copyleft Freedom on Linux]], presented by Bradley Kuhn at Linux Conf Au 2021. A discussion will ensue.
+If you would like to advance the free software movement in Australia and Asia-Pacific in general, if you are looking for a friendly community to hack free software together, or if you have some ideas for potential events or simply a talk to give, please get in touch at [[mailto:info@libreau.org][info@libreau.org]].
 
-* Timezone conversion
-  :PROPERTIES:
-  :CUSTOM_ID: timezone-conversion
-  :END:
-To convert time using GNU coreutils available in common GNU/Linux distributions, first check the timezone on your computer:
-#+begin_src sh
-$ ls -l /etc/localtime
-lrwxrwxrwx 1 root root 41 May  1 00:58 /etc/localtime -> ../usr/share/zoneinfo/Europe/Zurich
-#+end_src
-
-If you are happy with the output, invoke
-#+begin_src sh
-$ date -d '2021-08-23 20:00 UTC+10'
-Mon 23 Aug 11:00:00 CEST 2021
-#+end_src
+** Commitment to free software
+   :PROPERTIES:
+   :CUSTOM_ID: freedom
+   :END:
+ As a free software advocacy group, LibreAustralia is committed to freedom. We will not require you to use proprietary software to communicate with LibreAustralia. This means you won't find us on Github, Meetup, Google Groups etc.
 
-* Code of Conduct
-  :PROPERTIES:
-  :CUSTOM_ID: be-nice
-  :END:
-Be excellent to each other (h/t Bryan Lunduke).
+** Timezone conversion
+   :PROPERTIES:
+   :CUSTOM_ID: timezone-conversion
+   :END:
+ To convert time using GNU coreutils available in common GNU/Linux distributions, first check the timezone on your computer:
+ #+begin_src sh
+ $ ls -l /etc/localtime
+ lrwxrwxrwx 1 root root 41 May  1 00:58 /etc/localtime -> ../usr/share/zoneinfo/Europe/Zurich
+ #+end_src
+
+ If you are happy with the output, invoke
+ #+begin_src sh
+ $ date -d '2021-08-23 20:00 UTC+10'
+ Mon 23 Aug 11:00:00 CEST 2021
+ #+end_src
+
+** Code of Conduct
+   :PROPERTIES:
+   :CUSTOM_ID: be-nice
+   :END:
+ Be excellent to each other (h/t Bryan Lunduke).
 
-For more detailed guidelines, see [[https://libreplanet.org/wiki/LibrePlanet:Code_of_Conduct][LibrePlanet Code of Conduct]] and [[https://www.gnu.org/philosophy/kind-communication.html][GNU Kind Communications Guidelines]].
+ For more detailed guidelines, see [[https://libreplanet.org/wiki/LibrePlanet:Code_of_Conduct][LibrePlanet Code of Conduct]] and [[https://www.gnu.org/philosophy/kind-communication.html][GNU Kind Communications Guidelines]].
 
diff --git a/publish.el b/publish.el
index 9575451..7bfe116 100644
--- a/publish.el
+++ b/publish.el
@@ -2,6 +2,14 @@
 
 (require 'ox-publish)
 
+(defun me/html-preamble (plist)
+  (with-temp-buffer
+    (insert-file-contents "../html-templates/preamble.html") (buffer-string)))
+
+(defun me/html-postamble (plist)
+  (with-temp-buffer
+    (insert-file-contents "../html-templates/postamble.html") (buffer-string)))
+
 (setq org-publish-project-alist
       '(("pages"
          :base-directory "pages"
@@ -16,13 +24,14 @@
 	 :with-toc nil
 	 :section-numbers nil
 	 :html-self-link-headlines t
+	 :html-preamble me/html-preamble
 	 :html-postamble nil
 	 )	 
 	("css"
-          :base-directory "css"
-          :base-extension "css"
-          :publishing-directory "site/css"
-          :publishing-function org-publish-attachment
-          :recursive t
-	  )
+         :base-directory "css"
+         :base-extension "css"
+         :publishing-directory "site/css"
+         :publishing-function org-publish-attachment
+         :recursive t
+	 )
         ("all" :components ("pages" "css"))))