From 7d9b1bb873fd833dc3098a860c8f6ed3133c1f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Skaaden?= Date: Sat, 21 Nov 2020 14:36:41 +0100 Subject: [PATCH] Restrucure of files --- _config.yml | 6 ++- _includes/bars/side.html | 4 +- _includes/components/lecture-meta.html | 2 +- _posts/2020-08-17-ntnu-files.md | 4 +- _posts/2020-08-25-lecture-testing.md | 3 +- files/ntnu/ntnu.md | 35 ------------ index.md | 51 ------------------ ntnu/files/files.md | 32 +++++++++++ {files/ntnu => ntnu/files}/h19/ttt4265/D6.pdf | Bin {files/ntnu => ntnu/files}/h19/ttt4265/D7.pdf | Bin {files/ntnu => ntnu/files}/h19/ttt4265/D8.pdf | Bin {files/ntnu => ntnu/files}/h19/ttt4265/D9.pdf | Bin .../files}/v19/tma4105/formelark.pdf | Bin {files/ntnu => ntnu/files}/v19/ttt4260/D1.pdf | Bin {files/ntnu => ntnu/files}/v19/ttt4260/D2.pdf | Bin {files/ntnu => ntnu/files}/v19/ttt4260/D3.pdf | Bin {files/ntnu => ntnu/files}/v19/ttt4260/D4.pdf | Bin ...lyu_fremtidens_fugletitter_elsys_v2020.pdf | Bin .../tfe4146/summary/figures/HallEffect.png | Bin .../summary/figures/carrierDensity.png | Bin .../tfe4146/summary/figures/conductivity.png | Bin .../tfe4146/summary/figures/continuityEq.png | Bin .../tfe4146/summary/figures/dos.png | Bin .../tfe4146/summary/figures/fermiDirac.png | Bin .../summary/figures/haynes-ShockleyExp.png | Bin .../summary/figures/haynes-ShockleyTheory.png | Bin .../tfe4146/summary/figures/intrinsic.png | Bin .../tfe4146/summary/figures/particleBox.png | Bin .../tfe4146/summary/figures/pnNatural.png | Bin .../summary/figures/steadyStateBar.png | Bin .../tfe4146/summary/figures/tetteBonds.png | Bin {courses => ntnu}/tfe4146/summary/summary.md | 1 - 32 files changed, 42 insertions(+), 96 deletions(-) delete mode 100644 files/ntnu/ntnu.md delete mode 100644 index.md create mode 100644 ntnu/files/files.md rename {files/ntnu => ntnu/files}/h19/ttt4265/D6.pdf (100%) rename {files/ntnu => ntnu/files}/h19/ttt4265/D7.pdf (100%) rename {files/ntnu => ntnu/files}/h19/ttt4265/D8.pdf (100%) rename {files/ntnu => ntnu/files}/h19/ttt4265/D9.pdf (100%) rename {files/ntnu => ntnu/files}/v19/tma4105/formelark.pdf (100%) rename {files/ntnu => ntnu/files}/v19/ttt4260/D1.pdf (100%) rename {files/ntnu => ntnu/files}/v19/ttt4260/D2.pdf (100%) rename {files/ntnu => ntnu/files}/v19/ttt4260/D3.pdf (100%) rename {files/ntnu => ntnu/files}/v19/ttt4260/D4.pdf (100%) rename {files/ntnu => ntnu/files}/v20/ttt4270/jolyu_fremtidens_fugletitter_elsys_v2020.pdf (100%) rename {courses => ntnu}/tfe4146/summary/figures/HallEffect.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/carrierDensity.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/conductivity.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/continuityEq.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/dos.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/fermiDirac.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/haynes-ShockleyExp.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/haynes-ShockleyTheory.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/intrinsic.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/particleBox.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/pnNatural.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/steadyStateBar.png (100%) rename {courses => ntnu}/tfe4146/summary/figures/tetteBonds.png (100%) rename {courses => ntnu}/tfe4146/summary/summary.md (99%) diff --git a/_config.yml b/_config.yml index 4a645d0..fd829b3 100644 --- a/_config.yml +++ b/_config.yml @@ -84,10 +84,14 @@ defaults: layout: defaults/list - scope: - path: "courses/*" + path: "ntnu/*" values: show_profile: false + show_toc: true layout: defaults/lecture + permalink: /:path + + github: is_project_page: true diff --git a/_includes/bars/side.html b/_includes/bars/side.html index 2320f3e..8747ec8 100644 --- a/_includes/bars/side.html +++ b/_includes/bars/side.html @@ -20,8 +20,8 @@ {% include components/project-meta.html %} {% endif %} -{% if page.path contains 'courses' %} - {% include components/project-meta.html %} +{% if page.show_toc %} + {% include components/lecture-meta.html %} {% endif %} {% if page.path contains '_posts' %} diff --git a/_includes/components/lecture-meta.html b/_includes/components/lecture-meta.html index 0c06f20..8c00a13 100644 --- a/_includes/components/lecture-meta.html +++ b/_includes/components/lecture-meta.html @@ -10,7 +10,7 @@ {% include entypo/arrow-left.svg %} - Back to the contents + Tilbake til forsiden diff --git a/_posts/2020-08-17-ntnu-files.md b/_posts/2020-08-17-ntnu-files.md index 438c81a..ee3b483 100644 --- a/_posts/2020-08-17-ntnu-files.md +++ b/_posts/2020-08-17-ntnu-files.md @@ -1,9 +1,7 @@ --- -layout: page title: "NTNU prosjekter og filer" description: Filer for prosjekter og stæsj på NTNU. -categories: ntnu files -permalink: /:categories/ +tags: ntnu files --- Vår 2020 diff --git a/_posts/2020-08-25-lecture-testing.md b/_posts/2020-08-25-lecture-testing.md index 785fbd0..774de61 100644 --- a/_posts/2020-08-25-lecture-testing.md +++ b/_posts/2020-08-25-lecture-testing.md @@ -1,8 +1,7 @@ --- -layout: lecture title: "Testing of lecture notes" description: Filer for prosjekter og stæsj på NTNU. -categories: ntnu lectures tdt4120 +tags: ntnu lectures tdt4120 math: true --- diff --git a/files/ntnu/ntnu.md b/files/ntnu/ntnu.md deleted file mode 100644 index fecb951..0000000 --- a/files/ntnu/ntnu.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -layout: page -title: "NTNU prosjekter og filer" -description: Filer for prosjekter og stæsj på NTNU. -permalink: /:path ---- - -Vår 2020 --------- -* TTT4270 - Elektronisk systemdesign, prosjekt - - [Teknisk notat. elsys prosjekt v20](/files/ntnu/v20/ttt4270/jolyu_fremtidens_fugletitter_elsys_v2020.pdf) - -Høst 2019 ---------- -* TTT4265 - Elektronisk systemdesign II - - Designprosjeter - * [Designnotat 6](/files/ntnu/h19/ttt4265/D6.pdf) - * [Designnotat 7](/files/ntnu/h19/ttt4265/D7.pdf) - * [Designnotat 8](/files/ntnu/h19/ttt4265/D8.pdf) - * [Designnotat 9](/files/ntnu/h19/ttt4265/D9.pdf) -* TDT4160 - Datamaskiner og digitalteknikk - - Alt av øvinger, forelesninger og eksamen på [git](https://git.glados.no/oyvindskaaden/TDT4160) - -Vår 2019 --------- -* TTT4260 - Elektronisk systemdesign I - - Designprosjeter - * [Designnotat 1](/files/ntnu/v19/ttt4260/D1.pdf) - * [Designnotat 2](/files/ntnu/v19/ttt4260/D2.pdf) - * [Designnotat 3](/files/ntnu/v19/ttt4260/D3.pdf) - * [Designnotat 4](/files/ntnu/v19/ttt4260/D4.pdf) -* TMA4105 - Matematikk 2 - - [Formelark](/files/ntnu/v19/tma4105/formelark.pdf) -* TDT4102 - Prosedyre- og objektorientert programmering - - Øvinger på [git](https://git.glados.no/oyvindskaaden/TDT4102-Ovinger) diff --git a/index.md b/index.md deleted file mode 100644 index 62b7444..0000000 --- a/index.md +++ /dev/null @@ -1,51 +0,0 @@ ---- -layout: default ---- - - -Prosjekter, dokumenter og annet -------------------------------- - - - - - - -Andre tjenester på *GLaDOS* ---------------------------- - - - diff --git a/ntnu/files/files.md b/ntnu/files/files.md new file mode 100644 index 0000000..fb51a2b --- /dev/null +++ b/ntnu/files/files.md @@ -0,0 +1,32 @@ +--- +title: "NTNU prosjekter og filer" +--- + +## Vår 2020 + +* TTT4270 - Elektronisk systemdesign, prosjekt + - [Teknisk notat. elsys prosjekt v20](./v20/ttt4270/jolyu_fremtidens_fugletitter_elsys_v2020.pdf) + +## Høst 2019 + +* TTT4265 - Elektronisk systemdesign II + - Designprosjeter + * [Designnotat 6](./h19/ttt4265/D6.pdf) + * [Designnotat 7](./h19/ttt4265/D7.pdf) + * [Designnotat 8](./h19/ttt4265/D8.pdf) + * [Designnotat 9](./h19/ttt4265/D9.pdf) +* TDT4160 - Datamaskiner og digitalteknikk + - Alt av øvinger, forelesninger og eksamen på [git](https://git.glados.no/oyvindskaaden/TDT4160) + +## Vår 2019 + +* TTT4260 - Elektronisk systemdesign I + - Designprosjeter + * [Designnotat 1](./v19/ttt4260/D1.pdf) + * [Designnotat 2](./v19/ttt4260/D2.pdf) + * [Designnotat 3](./v19/ttt4260/D3.pdf) + * [Designnotat 4](./v19/ttt4260/D4.pdf) +* TMA4105 - Matematikk 2 + - [Formelark](./v19/tma4105/formelark.pdf) +* TDT4102 - Prosedyre- og objektorientert programmering + - Øvinger på [git](https://git.glados.no/oyvindskaaden/TDT4102-Ovinger) diff --git a/files/ntnu/h19/ttt4265/D6.pdf b/ntnu/files/h19/ttt4265/D6.pdf similarity index 100% rename from files/ntnu/h19/ttt4265/D6.pdf rename to ntnu/files/h19/ttt4265/D6.pdf diff --git a/files/ntnu/h19/ttt4265/D7.pdf b/ntnu/files/h19/ttt4265/D7.pdf similarity index 100% rename from files/ntnu/h19/ttt4265/D7.pdf rename to ntnu/files/h19/ttt4265/D7.pdf diff --git a/files/ntnu/h19/ttt4265/D8.pdf b/ntnu/files/h19/ttt4265/D8.pdf similarity index 100% rename from files/ntnu/h19/ttt4265/D8.pdf rename to ntnu/files/h19/ttt4265/D8.pdf diff --git a/files/ntnu/h19/ttt4265/D9.pdf b/ntnu/files/h19/ttt4265/D9.pdf similarity index 100% rename from files/ntnu/h19/ttt4265/D9.pdf rename to ntnu/files/h19/ttt4265/D9.pdf diff --git a/files/ntnu/v19/tma4105/formelark.pdf b/ntnu/files/v19/tma4105/formelark.pdf similarity index 100% rename from files/ntnu/v19/tma4105/formelark.pdf rename to ntnu/files/v19/tma4105/formelark.pdf diff --git a/files/ntnu/v19/ttt4260/D1.pdf b/ntnu/files/v19/ttt4260/D1.pdf similarity index 100% rename from files/ntnu/v19/ttt4260/D1.pdf rename to ntnu/files/v19/ttt4260/D1.pdf diff --git a/files/ntnu/v19/ttt4260/D2.pdf b/ntnu/files/v19/ttt4260/D2.pdf similarity index 100% rename from files/ntnu/v19/ttt4260/D2.pdf rename to ntnu/files/v19/ttt4260/D2.pdf diff --git a/files/ntnu/v19/ttt4260/D3.pdf b/ntnu/files/v19/ttt4260/D3.pdf similarity index 100% rename from files/ntnu/v19/ttt4260/D3.pdf rename to ntnu/files/v19/ttt4260/D3.pdf diff --git a/files/ntnu/v19/ttt4260/D4.pdf b/ntnu/files/v19/ttt4260/D4.pdf similarity index 100% rename from files/ntnu/v19/ttt4260/D4.pdf rename to ntnu/files/v19/ttt4260/D4.pdf diff --git a/files/ntnu/v20/ttt4270/jolyu_fremtidens_fugletitter_elsys_v2020.pdf b/ntnu/files/v20/ttt4270/jolyu_fremtidens_fugletitter_elsys_v2020.pdf similarity index 100% rename from files/ntnu/v20/ttt4270/jolyu_fremtidens_fugletitter_elsys_v2020.pdf rename to ntnu/files/v20/ttt4270/jolyu_fremtidens_fugletitter_elsys_v2020.pdf diff --git a/courses/tfe4146/summary/figures/HallEffect.png b/ntnu/tfe4146/summary/figures/HallEffect.png similarity index 100% rename from courses/tfe4146/summary/figures/HallEffect.png rename to ntnu/tfe4146/summary/figures/HallEffect.png diff --git a/courses/tfe4146/summary/figures/carrierDensity.png b/ntnu/tfe4146/summary/figures/carrierDensity.png similarity index 100% rename from courses/tfe4146/summary/figures/carrierDensity.png rename to ntnu/tfe4146/summary/figures/carrierDensity.png diff --git a/courses/tfe4146/summary/figures/conductivity.png b/ntnu/tfe4146/summary/figures/conductivity.png similarity index 100% rename from courses/tfe4146/summary/figures/conductivity.png rename to ntnu/tfe4146/summary/figures/conductivity.png diff --git a/courses/tfe4146/summary/figures/continuityEq.png b/ntnu/tfe4146/summary/figures/continuityEq.png similarity index 100% rename from courses/tfe4146/summary/figures/continuityEq.png rename to ntnu/tfe4146/summary/figures/continuityEq.png diff --git a/courses/tfe4146/summary/figures/dos.png b/ntnu/tfe4146/summary/figures/dos.png similarity index 100% rename from courses/tfe4146/summary/figures/dos.png rename to ntnu/tfe4146/summary/figures/dos.png diff --git a/courses/tfe4146/summary/figures/fermiDirac.png b/ntnu/tfe4146/summary/figures/fermiDirac.png similarity index 100% rename from courses/tfe4146/summary/figures/fermiDirac.png rename to ntnu/tfe4146/summary/figures/fermiDirac.png diff --git a/courses/tfe4146/summary/figures/haynes-ShockleyExp.png b/ntnu/tfe4146/summary/figures/haynes-ShockleyExp.png similarity index 100% rename from courses/tfe4146/summary/figures/haynes-ShockleyExp.png rename to ntnu/tfe4146/summary/figures/haynes-ShockleyExp.png diff --git a/courses/tfe4146/summary/figures/haynes-ShockleyTheory.png b/ntnu/tfe4146/summary/figures/haynes-ShockleyTheory.png similarity index 100% rename from courses/tfe4146/summary/figures/haynes-ShockleyTheory.png rename to ntnu/tfe4146/summary/figures/haynes-ShockleyTheory.png diff --git a/courses/tfe4146/summary/figures/intrinsic.png b/ntnu/tfe4146/summary/figures/intrinsic.png similarity index 100% rename from courses/tfe4146/summary/figures/intrinsic.png rename to ntnu/tfe4146/summary/figures/intrinsic.png diff --git a/courses/tfe4146/summary/figures/particleBox.png b/ntnu/tfe4146/summary/figures/particleBox.png similarity index 100% rename from courses/tfe4146/summary/figures/particleBox.png rename to ntnu/tfe4146/summary/figures/particleBox.png diff --git a/courses/tfe4146/summary/figures/pnNatural.png b/ntnu/tfe4146/summary/figures/pnNatural.png similarity index 100% rename from courses/tfe4146/summary/figures/pnNatural.png rename to ntnu/tfe4146/summary/figures/pnNatural.png diff --git a/courses/tfe4146/summary/figures/steadyStateBar.png b/ntnu/tfe4146/summary/figures/steadyStateBar.png similarity index 100% rename from courses/tfe4146/summary/figures/steadyStateBar.png rename to ntnu/tfe4146/summary/figures/steadyStateBar.png diff --git a/courses/tfe4146/summary/figures/tetteBonds.png b/ntnu/tfe4146/summary/figures/tetteBonds.png similarity index 100% rename from courses/tfe4146/summary/figures/tetteBonds.png rename to ntnu/tfe4146/summary/figures/tetteBonds.png diff --git a/courses/tfe4146/summary/summary.md b/ntnu/tfe4146/summary/summary.md similarity index 99% rename from courses/tfe4146/summary/summary.md rename to ntnu/tfe4146/summary/summary.md index 47e790c..11e067b 100644 --- a/courses/tfe4146/summary/summary.md +++ b/ntnu/tfe4146/summary/summary.md @@ -2,7 +2,6 @@ title: "Oppsumering av TFE4146" description: Oppsummering av faget TFE4146 høsten 2020. math: true -permalink: /:path date: 2020-11-20 ---