fixes & tweaks

wolfspelz · Oct 10, 2023 · 214e0e2 · 214e0e2
1 parent 79b905b
commit 214e0e2
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 59 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -14,9 +14,9 @@
     <h1>@Model.Item.Title</h1>
 
     <div class="my-textblock">
-        <span>Universe</span>:
+        <span>Parent universe</span>:
         <span>
-            <a asp-page="Universe" asp-route-id="@Model.Item.Universe.SeoName">@Model.Item.Universe.Title</a>
+            <a asp-page="Universe" asp-route-id="@Model.Item.Universe.SeoName">@Model.Item.Universe.Title <span class='my-up-arrow' /></a>
         </span>
     </div>
 

diff --git 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) {
+        <div class="my-textblock">
+            @if (model.Editors.Count > 0) {
+                <div>
+                    <span>Edited</span>:
+                    @foreach (var editor in model.Editors) {
+                        <a class="my-editor" href="@("http://github.com/" + editor)">@editor</a>
+                    }
+                </div>
+            }
+
+            @if (model.Approvers.Count > 0) {
+                <div>
+                    <span>Approved</span>:
+                    @foreach (var approver in model.Approvers) {
+                        <a class="my-approver" href="@("http://github.com/" + approver)">@approver</a>
+                    }
+                </div>
+            }
+        </div>
+    }
+
 }
diff --git a/src/futr/Pages/Shared/_BaseModelProperties.cshtml b/src/futr/Pages/Shared/_BaseModelProperties.cshtml
@@ -1,53 +1,39 @@
 @if (Model is Models.BaseModel model) {
 
-    <div class="my-textblock">
-
-        @if (model.Tags.Count > 0) {
-            <div>
-                <span>Tags</span>:
-                @foreach (var tag in model.Tags) {
-                    <span class="my-tag">@tag</span>
-                }
-            </div>
-        }
-
-        @if (model.Editors.Count > 0) {
-            <div>
-                <span>Edited</span>:
-                @foreach (var editor in model.Editors) {
-                    <a class="my-editor" href="@("http://github.com/" + editor)">@editor</a>
-                }
-            </div>
-        }
-
-        @if (model.Approvers.Count > 0) {
-            <div>
-                <span>Approved</span>:
-                @foreach (var approver in model.Approvers) {
-                    <a class="my-approver" href="@("http://github.com/" + approver)">@approver</a>
-                }
-            </div>
-        }
-
-        @if (model.Links.Count > 0) {
-            <div>
-                <span>Links</span>:
-                <ul>
-                    @foreach (var link in model.Links.Take(20)) {
-                        <li><a class="my-link" href="@link.Link">@link.Text</a></li>
+    @if (model.Tags.Count > 0 || model.Links.Count > 0) {
+        <div class="my-textblock">
+
+            @if (model.Tags.Count > 0) {
+                <div>
+                    <span>Tags</span>:
+                    @foreach (var tag in model.Tags) {
+                        <span class="my-tag">@tag</span>
                     }
-                </ul>
-            </div>
-        }
+                </div>
+            }
 
-    </div>
+            @if (model.Links.Count > 0) {
+                <div>
+                    <span>Links</span>:
+                    <ul>
+                        @foreach (var link in model.Links.Take(20)) {
+                            <li><a class="my-link" href="@link.Link">@link.Text</a></li>
+                        }
+                    </ul>
+                </div>
+            }
+
+        </div>
+    }
 
     @if (model.Images.Count > 0) {
         <div class="my-gallery">
             @foreach (var image in model.Images.Take(10)) {
                 <div class="my-frame">
-                    <a href="@image.Page"><img src="@image.Link" alt="@image.Text" title="@image.Text
-@image.Page" /></a>
+                    <a href="@image.Page">
+                        <img src="@image.Link" alt="@image.Text" title="@image.Text
+@image.Page" />
+                    </a>
                     <div class="my-caption">@image.Text</div>
                 </div>
             }

diff --git 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%;