diff options
| -rw-r--r-- | README.org | 6 | ||||
| -rw-r--r-- | about.org | 2 | ||||
| -rw-r--r-- | apps/index.org | 9 | ||||
| -rw-r--r-- | index.org | 7 | ||||
| -rw-r--r-- | publish-mlnp.org | 37 | ||||
| -rw-r--r-- | wiki/engineering/index.org | 13 | ||||
| -rw-r--r-- | wiki/index.org | 3 |
7 files changed, 37 insertions, 40 deletions
@@ -6,7 +6,7 @@ #+DATE: <2022-01-23 Sun> #+OPTIONS: num:nil toc:nil title:nil -#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/> +#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/> #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/> #+INCLUDE: resources/topnav.html export html # +TOC: headlines 1 @@ -61,7 +61,7 @@ The website's structure is described in the following sections. │ ├── favicon.png │ ├── favicon.xcf │ ├── fonts -│ ├── mlnp.css +│ ├── global.css │ └── topnav.html ├── sitemap.org └── wiki @@ -96,7 +96,7 @@ the website publishing process. This file contains the entire website's styling information. During publication, this file's sections are tangled to a single stylesheet -=resources/mlnp.css=. This reduces website load times, as only a +=resources/global.css=. This reduces website load times, as only a single HTTP request is required to obtain styling rules for the entire website. Albeit negligible, this optimization is [[https://stackoverflow.com/questions/2336302/single-huge-css-file-vs-multiple-smaller-specific-css-files][recommended]] across the web. @@ -4,7 +4,7 @@ #+DATE: <2022-01-28 Fri> #+OPTIONS: num:nil toc:nil -#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/> +#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/> #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/> #+INCLUDE: resources/topnav.html export html diff --git a/apps/index.org b/apps/index.org index 9eb9879..9d15683 100644 --- a/apps/index.org +++ b/apps/index.org @@ -1,4 +1,5 @@ -#+TITLE: Welcome to my web apps! +#+TITLE: Apps +#+SUBTITLE: Welcome to my web apps! #+AUTHOR: Marius Peter #+DATE: <2022-07-03 Sun> #+EMAIL: mlnp@tuta.io @@ -9,6 +10,6 @@ This part is under heavy development. Check again soon for new web apps! -- =mdl= downloader \rarr [[https://apps.mlnp.fr/mdl/index.html]] -- =fapg= ERP -- Online Org editor? +- =mdl= downloader :: [[https://apps.mlnp.fr/mdl]] +- =fapg= ERP :: [[https://apps.mlnp.fr/fapg]] +- Online Org editor? :: TODO @@ -11,14 +11,14 @@ #+DESCRIPTION: and other subjects. Created with Emacs Org mode. #+KEYWORDS: mlnp, personal, website, blog, wiki, linux, emacs, engineering, aerospace, typography -#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/> +#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/> #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/> #+INCLUDE: resources/topnav.html export html # Not using #+ATTR_LATEX because text-align would be overridden. #+HTML: <style> -#+HTML: .abstract p { font-size: 40px; line-height: 1.5; font-family: Jost; text-align: start } +#+HTML: .abstract p { font-size: 40px; line-height: 1.5; font-family: Jost; text-align: start; font-style: normal; } #+HTML: </style> @@ -26,9 +26,6 @@ I am passionate about aerospace, open source software, and typography. #+end_abstract -#+ATTR_HTML: :alt Grumman F-14D 'Tomcat' -[[https://live.staticflickr.com/5801/21787648405_2f4c74d268_b.jpg]] - * Main content :PROPERTIES: diff --git a/publish-mlnp.org b/publish-mlnp.org index 7b81406..32d82e3 100644 --- a/publish-mlnp.org +++ b/publish-mlnp.org @@ -6,7 +6,7 @@ #+DATE: <2022-01-26 Wed> #+OPTIONS: toc:nil -#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/> +#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/> #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/> #+INCLUDE: resources/topnav.html export html @@ -21,7 +21,7 @@ logic, making it possible to efficiently revisit and upgrade this website at a later date. #+end_abstract -#+TOC: headlines 3 +#+TOC: headlines 2 * Introduction @@ -74,7 +74,7 @@ uncorrelated content. │ ├── favicon.png │ ├── favicon.xcf │ ├── fonts/ -│ ├── mlnp.css +│ ├── global.css │ └── topnav.html ├── sitemap.org └── wiki/ @@ -293,7 +293,7 @@ on locally published pages. :publishing-function org-publish-attachment) ("mlnp-resources" :base-directory "resources/" - :base-extension "css\\|js\\|png" + :base-extension "css\\|js\\|png\\|jpg" :publishing-directory ,(concat org-publish-location-local "mlnp.fr/resources/") :publishing-function org-publish-attachment) ("resources-pages" @@ -368,7 +368,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/") :recursive t ; Encompass all wiki pages. - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-title "Full sitemap for [[https://wiki.mlnp.fr][wiki.mlnp.fr]]" @@ -385,7 +385,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/") :recursive nil ; Only top-level wiki pages. - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap nil :publishing-function org-html-publish-to-html) @@ -401,7 +401,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/engineering") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -420,7 +420,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/emacs") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -439,7 +439,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/languages") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -458,7 +458,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/linux") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -477,7 +477,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/programming") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -496,7 +496,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/fitness") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -515,7 +515,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/typography") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -538,7 +538,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://blog.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" @@ -571,7 +571,7 @@ dashes when exported to the sitemap titles. :base-extension "org" :publishing-directory ,(concat org-publish-location-local "apps.mlnp.fr/") :recursive t - :html-head "<link rel='stylesheet' type='text/css' href='https://apps.mlnp.fr/resources/mlnp.css'/> + :html-head "<link rel='stylesheet' type='text/css' href='https://apps.mlnp.fr/resources/global.css'/> <link rel='icon' type='image/png' href='https://apps.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "sitemap.org" @@ -609,7 +609,8 @@ to build the entire website. ;; (org-publish-remove-all-timestamps) ;; Prepare resources: - (org-babel-tangle-file "resources/css.org") + (org-babel-tangle-file "resources/css-global.org") + (org-babel-tangle-file "resources/css-cv.org") (save-window-excursion (find-file "cv.org") (org-ascii-export-to-ascii)) @@ -619,7 +620,7 @@ to build the entire website. (let* ((local org-publish-location-local) (local-websites (concat local "*mlnp.fr")) (remote org-publish-location-remote) - (sync-command (format "rsync -azvP %s %s" local-websites remote))) + (sync-command (format "rsync -azvP %s %s --chown=mpeter:www-data" local-websites remote))) (if (not (yes-or-no-p "Push local changes to remote target? ")) (message "Didn't publish remotely to %s." remote) (message @@ -628,7 +629,7 @@ to build the entire website. #+END_SRC #+RESULTS: main -: #<window 257 on *Async Shell Command*> +: #<window 69 on *Async Shell Command*> The following links to the locally built homepages are useful after building the website locally, to check that everything proceeded smoothly. diff --git a/wiki/engineering/index.org b/wiki/engineering/index.org index fc4237d..92198bf 100644 --- a/wiki/engineering/index.org +++ b/wiki/engineering/index.org @@ -7,9 +7,10 @@ - [[file:v-model.org][V-model]] - aerospace - [[file:aerospace/designing-aircraft.org][Designing aircraft]] - - protocols - - [[file:aerospace/protocols/ARINC-429.org][ARINC 429]] - - [[file:aerospace/protocols/CAN-bus.org][CAN bus]] - - standards - - [[file:aerospace/standards/ARP4754.org][ARP4754]] - - [[file:aerospace/standards/DO-160.org][DO-160]]
\ No newline at end of file +- protocols + - [[file:protocols/ARINC-429.org][ARINC 429]] + - [[file:protocols/CAN-bus.org][CAN bus]] + - [[file:protocols/SIP.org][Foundations of SIP]] +- standards + - [[file:standards/ARP4754.org][ARP4754]] + - [[file:standards/DO-160.org][DO-160]]
\ No newline at end of file diff --git a/wiki/index.org b/wiki/index.org index 53b0bc9..3c1d9d8 100644 --- a/wiki/index.org +++ b/wiki/index.org @@ -29,9 +29,6 @@ about. All unoriginal content credited [[https://mlnp.fr/about.html#Credits][her ** Engineering -:PROPERTIES: -:CUSTOM_ID: table-of-contents -:END: Engineering has been my career's focus so far. |