diff --git a/data/common/android-chrome-192x192.png b/data/common/android-chrome-192x192.png index 6b59b36..1854137 100644 Binary files a/data/common/android-chrome-192x192.png and b/data/common/android-chrome-192x192.png differ diff --git a/data/common/android-chrome-512x512.png b/data/common/android-chrome-512x512.png index 0eece2d..b8164b6 100644 Binary files a/data/common/android-chrome-512x512.png and b/data/common/android-chrome-512x512.png differ diff --git a/data/common/apple-touch-icon.png b/data/common/apple-touch-icon.png index 5c4b1ed..3299b43 100644 Binary files a/data/common/apple-touch-icon.png and b/data/common/apple-touch-icon.png differ diff --git a/data/common/favicon-16x16.png b/data/common/favicon-16x16.png index eb5e0e5..3a8b06f 100644 Binary files a/data/common/favicon-16x16.png and b/data/common/favicon-16x16.png differ diff --git a/data/common/favicon-32x32.png b/data/common/favicon-32x32.png index 7296b2e..756c2c1 100644 Binary files a/data/common/favicon-32x32.png and b/data/common/favicon-32x32.png differ diff --git a/data/common/favicon.ico b/data/common/favicon.ico index cef4411..0073e43 100644 Binary files a/data/common/favicon.ico and b/data/common/favicon.ico differ diff --git a/data/common/site.webmanifest b/data/common/site.webmanifest index 45dc8a2..70cd74a 100644 --- a/data/common/site.webmanifest +++ b/data/common/site.webmanifest @@ -1 +1 @@ -{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file +{"name":"Scientific Programming Centre","short_name":"SPC","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file diff --git a/data/home/content/consulting/index.md b/data/home/content/consulting/index.md index 7da51b4..e2233a8 100644 --- a/data/home/content/consulting/index.md +++ b/data/home/content/consulting/index.md @@ -1,6 +1,7 @@ --- type: page title: Consulting +pageName: SPC.consulting transformation: snark.basic language: en --- diff --git a/data/home/content/consulting/research.md b/data/home/content/consulting/research.md index 36a2ca1..73cc2f5 100644 --- a/data/home/content/consulting/research.md +++ b/data/home/content/consulting/research.md @@ -1,6 +1,7 @@ --- type: page title: Research +pageName: SPC.research language: en --- diff --git a/data/home/content/education/index.md b/data/home/content/education/index.md index 5b4933d..f76d912 100644 --- a/data/home/content/education/index.md +++ b/data/home/content/education/index.md @@ -1,6 +1,7 @@ --- type: page title: Education +pageName: SPC.education transformation: snark.basic language: en --- @@ -21,25 +22,32 @@ language: en ## Courses in 2022-2023: -* Scientific literature seminar +### Scientific literature seminar curated by Aleksandr Svetlichnyi -* [Statistical methods and data analysis](https://t.me/mipt_statmethods) ([SPC-A-6](https://npm.mipt.ru/youtrack/articles/SPC-A-6)) +### [Statistical methods and data analysis](https://t.me/mipt_statmethods) +Program: [SPC-A-6](https://npm.mipt.ru/youtrack/articles/SPC-A-6) by Alexander Nozik and Vladimir Palmin -* Численные методы ([SPC-A-3](https://npm.mipt.ru/youtrack/articles/SPC-A-3)) +### Численные методы +Program: [SPC-A-3](https://npm.mipt.ru/youtrack/articles/SPC-A-3) by Konstantin Tikhonov and Rolan Grinis -* Instruments of development ([SPC-A-5](https://npm.mipt.ru/youtrack/articles/SPC-A-5)) +### Instruments of development +Program: [SPC-A-5](https://npm.mipt.ru/youtrack/articles/SPC-A-5) + + curated by Alexander Nozik -* [Advanced Python](https://t.me/mipt_npm_python) ([SPC-A-4](https://npm.mipt.ru/youtrack/articles/SPC-A-4)) +### [Advanced Python](https://t.me/mipt_npm_python) +Program: [SPC-A-4](https://npm.mipt.ru/youtrack/articles/SPC-A-4) by Mikhail Zelenyy -* Computational finance ([SPC-A-10](https://npm.mipt.ru/youtrack/articles/SPC-A-10)) +### Computational finance +Program: [SPC-A-10](https://npm.mipt.ru/youtrack/articles/SPC-A-10) by Rolan Grinis \ No newline at end of file diff --git a/data/home/content/research.md b/data/home/content/research.md index 32f97b0..c26d171 100644 --- a/data/home/content/research.md +++ b/data/home/content/research.md @@ -1,6 +1,7 @@ --- type: page title: Research +pageName: SPC.research language: en --- diff --git a/data/home/content/ru/consulting.md b/data/home/content/ru/consulting.md index 491b12f..30e8399 100644 --- a/data/home/content/ru/consulting.md +++ b/data/home/content/ru/consulting.md @@ -1,6 +1,7 @@ --- type: page title: Консалтинг +pageName: ЦНП.консалтинг language: ru published: false --- diff --git a/data/home/content/team.md b/data/home/content/team.md index 2a314f0..cabc458 100644 --- a/data/home/content/team.md +++ b/data/home/content/team.md @@ -1,5 +1,6 @@ --- type: page title: Team +pageName: SPC.team language: en --- diff --git a/src/main/kotlin/ru/mipt/spc/spcCollection.kt b/src/main/kotlin/ru/mipt/spc/spcCollection.kt index 151da92..2ccb3a7 100644 --- a/src/main/kotlin/ru/mipt/spc/spcCollection.kt +++ b/src/main/kotlin/ru/mipt/spc/spcCollection.kt @@ -97,8 +97,9 @@ internal fun SiteBuilder.spcSpotlight( val meta = body.meta page(name) { - val title = meta["title"].string ?: SPC_TITLE - spcHead(title) + val title by meta.string { SPC_TITLE } + val pageName by meta.string { title } + spcHead(pageName) body("is-preload") { wrapper { spcSpotlightContent(body, content) diff --git a/src/main/kotlin/ru/mipt/spc/spcHome.kt b/src/main/kotlin/ru/mipt/spc/spcHome.kt index 9f03e05..4b32da3 100644 --- a/src/main/kotlin/ru/mipt/spc/spcHome.kt +++ b/src/main/kotlin/ru/mipt/spc/spcHome.kt @@ -16,10 +16,11 @@ import kotlin.reflect.typeOf context(WebPage) internal fun HTML.spcPageContent( meta: Meta, - title: String = meta["title"].string ?: SPC_TITLE, fragment: FlowContent.() -> Unit, ) { - spcHead(title) + val title by meta.string { SPC_TITLE } + val pageName by meta.string { title } + spcHead(pageName) body("is-preload") { wrapper { div("alt") { @@ -73,7 +74,9 @@ context(WebPage) private fun HTML.spcHome() { id = "banner" div("inner") { header("major") { - h1 { +"""Scientific Programming Centre""" } + h1 { + +"""Scientific Programming Centre""" + } } div("content") { p { @@ -103,8 +106,8 @@ context(WebPage) private fun HTML.spcHome() { img { src = "images/FPMI.jpg" alt = "FPMI" - height = "60" - width = "60" + height = "60dp" + width = "60dp" } } } diff --git a/src/main/kotlin/ru/mipt/spc/spcMisc.kt b/src/main/kotlin/ru/mipt/spc/spcMisc.kt index 00807f2..0b01dd2 100644 --- a/src/main/kotlin/ru/mipt/spc/spcMisc.kt +++ b/src/main/kotlin/ru/mipt/spc/spcMisc.kt @@ -60,8 +60,8 @@ context(WebPage) internal fun FlowContent.spcHomeMenu() { } li { a { - href = resolvePageRef("magprog.index") - +"""Master""" + href = resolvePageRef("education.index") + +"""Education""" } } li {