From 214e0e2351cdaea2ef3e0513f5e053dccebafc38 Mon Sep 17 00:00:00 2001 From: Heiner Wolf Date: Tue, 10 Oct 2023 13:25:44 +0100 Subject: [PATCH] fixes & tweaks --- data/universes/Reality/20th Century/info.yaml | 5 +- data/universes/Reality/80s/info.yaml | 5 +- data/universes/Reality/Age of Sail/info.yaml | 5 +- data/universes/Reality/Bronze Age/info.yaml | 5 +- data/universes/Reality/Classic Age/info.yaml | 5 +- .../Reality/Industrialization/info.yaml | 5 +- data/universes/Reality/Middle Ages/info.yaml | 5 +- data/universes/Reality/Stone Age/info.yaml | 5 +- src/futr/Pages/Civilization.cshtml | 4 +- .../Pages/Shared/_BaseModelDescription.cshtml | 22 ++++++ .../Pages/Shared/_BaseModelProperties.cshtml | 68 ++++++++----------- src/futr/wwwroot/css/site.css | 12 ++++ 12 files changed, 87 insertions(+), 59 deletions(-) diff --git a/data/universes/Reality/20th Century/info.yaml b/data/universes/Reality/20th Century/info.yaml index 5af18a1..dfe3934 100644 --- a/data/universes/Reality/20th Century/info.yaml +++ b/data/universes/Reality/20th Century/info.yaml @@ -9,9 +9,10 @@ datapoints: min: 1.1e9 max: 1.2e9 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.65 min: 0.55 diff --git a/data/universes/Reality/80s/info.yaml b/data/universes/Reality/80s/info.yaml index 9a10987..51b1831 100644 --- a/data/universes/Reality/80s/info.yaml +++ b/data/universes/Reality/80s/info.yaml @@ -9,9 +9,10 @@ datapoints: min: 3.5e9 max: 4.5e9 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.7 min: 0.67 diff --git a/data/universes/Reality/Age of Sail/info.yaml b/data/universes/Reality/Age of Sail/info.yaml index a4d0e01..9191084 100644 --- a/data/universes/Reality/Age of Sail/info.yaml +++ b/data/universes/Reality/Age of Sail/info.yaml @@ -9,9 +9,10 @@ datapoints: min: 600e6 max: 1e9 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.54 min: 0.5 diff --git a/data/universes/Reality/Bronze Age/info.yaml b/data/universes/Reality/Bronze Age/info.yaml index 3dccd67..24b630e 100644 --- a/data/universes/Reality/Bronze Age/info.yaml +++ b/data/universes/Reality/Bronze Age/info.yaml @@ -9,9 +9,10 @@ datapoints: min: 10e6 max: 40e6 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.36 min: 0.3 diff --git a/data/universes/Reality/Classic Age/info.yaml b/data/universes/Reality/Classic Age/info.yaml index 08dacf8..fd716ba 100644 --- a/data/universes/Reality/Classic Age/info.yaml +++ b/data/universes/Reality/Classic Age/info.yaml @@ -10,9 +10,10 @@ datapoints: min: 70e6 max: 200e6 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.46 min: 0.4 diff --git a/data/universes/Reality/Industrialization/info.yaml b/data/universes/Reality/Industrialization/info.yaml index 272e916..aec65cb 100644 --- a/data/universes/Reality/Industrialization/info.yaml +++ b/data/universes/Reality/Industrialization/info.yaml @@ -9,9 +9,10 @@ datapoints: min: 0.8e9 max: 1.2e9 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.56 min: 0.5 diff --git a/data/universes/Reality/Middle Ages/info.yaml b/data/universes/Reality/Middle Ages/info.yaml index 8c02262..f84192a 100644 --- a/data/universes/Reality/Middle Ages/info.yaml +++ b/data/universes/Reality/Middle Ages/info.yaml @@ -11,9 +11,10 @@ datapoints: min: 150e6 max: 250e6 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.48 min: 0.4 diff --git a/data/universes/Reality/Stone Age/info.yaml b/data/universes/Reality/Stone Age/info.yaml index d703965..6612318 100644 --- a/data/universes/Reality/Stone Age/info.yaml +++ b/data/universes/Reality/Stone Age/info.yaml @@ -9,9 +9,10 @@ datapoints: min: 10000 max: 100000 confidence: canon # (canon, calculated, informedGuess, calculatedGuess, wildGuess) - comment: Quick Wikipedia reearch. Error bars guestimated. + comment: Quick Wikipedia research. Error bars guestimated. references: - - https://en.wikipedia.org/wiki/Prehistoric_demography + - link: https://en.wikipedia.org/wiki/Prehistoric_demography + text: Prehistoric Demography (Wikipedia) - metric: Kardashev value: 0.1 min: 0.05 diff --git a/src/futr/Pages/Civilization.cshtml b/src/futr/Pages/Civilization.cshtml index 07de0fd..344f89d 100644 --- a/src/futr/Pages/Civilization.cshtml +++ b/src/futr/Pages/Civilization.cshtml @@ -14,9 +14,9 @@

@Model.Item.Title

- Universe: + Parent universe: - @Model.Item.Universe.Title + @Model.Item.Universe.Title
diff --git a/src/futr/Pages/Shared/_BaseModelDescription.cshtml b/src/futr/Pages/Shared/_BaseModelDescription.cshtml index 67142a3..00200fa 100644 --- a/src/futr/Pages/Shared/_BaseModelDescription.cshtml +++ b/src/futr/Pages/Shared/_BaseModelDescription.cshtml @@ -8,4 +8,26 @@ @await Html.PartialAsync("_MarkdownConverterPartial", new Shared._MarkdownConverterPartial.Model() { Source = "iDescriptionSource", Target = "iDescription"}) } + @if (model.Editors.Count > 0 || model.Approvers.Count > 0) { +
+ @if (model.Editors.Count > 0) { +
+ Edited: + @foreach (var editor in model.Editors) { + @editor + } +
+ } + + @if (model.Approvers.Count > 0) { +
+ Approved: + @foreach (var approver in model.Approvers) { + @approver + } +
+ } +
+ } + } diff --git a/src/futr/Pages/Shared/_BaseModelProperties.cshtml b/src/futr/Pages/Shared/_BaseModelProperties.cshtml index 6b098ec..0a1f6ea 100644 --- a/src/futr/Pages/Shared/_BaseModelProperties.cshtml +++ b/src/futr/Pages/Shared/_BaseModelProperties.cshtml @@ -1,53 +1,39 @@ @if (Model is Models.BaseModel model) { -
- - @if (model.Tags.Count > 0) { -
- Tags: - @foreach (var tag in model.Tags) { - @tag - } -
- } - - @if (model.Editors.Count > 0) { -
- Edited: - @foreach (var editor in model.Editors) { - @editor - } -
- } - - @if (model.Approvers.Count > 0) { -
- Approved: - @foreach (var approver in model.Approvers) { - @approver - } -
- } - - @if (model.Links.Count > 0) { -
- Links: -
    - @foreach (var link in model.Links.Take(20)) { -
  • @link.Text
    • + @if (model.Tags.Count > 0 || model.Links.Count > 0) { +
    + + @if (model.Tags.Count > 0) { +
    + Tags: + @foreach (var tag in model.Tags) { + @tag } -
-
- } +
+ } - + @if (model.Links.Count > 0) { +
+ Links: + +
+ } + + + } @if (model.Images.Count > 0) {
@foreach (var image in model.Images.Take(10)) {
- @image.Text + + @image.Text +
@image.Text
} diff --git a/src/futr/wwwroot/css/site.css b/src/futr/wwwroot/css/site.css index d69fcca..6cec601 100644 --- a/src/futr/wwwroot/css/site.css +++ b/src/futr/wwwroot/css/site.css @@ -168,6 +168,14 @@ span.my-next-arrow { background-size: contain; } +span.my-up-arrow { + display: inline-block; + width: 0.7em; + height: 0.7em; + background-image: url('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="16" height="16" viewBox="0 0 16 16"%3E%3Cpath fill="currentColor" fill-rule="evenodd" d="M7.022 1.566a1.13 1.13 0 0 1 1.96 0l6.857 11.667c.457.778-.092 1.767-.98 1.767H1.144c-.889 0-1.437-.99-.98-1.767L7.022 1.566z"%2F%3E%3C%2Fsvg%3E'); + background-size: contain; +} + div.my-gallery { margin: 0 -0.3em 1em -0.3em; } @@ -388,6 +396,10 @@ div.my-card-body ol { margin-block-end: 0.7em; } +div.my-card-body a { + overflow-wrap: anywhere; +} + @media (max-width: 800px) { div .my-card { width: 50%;