diff --git a/src/Yavsc/Controllers/HomeController.cs b/src/Yavsc/Controllers/HomeController.cs
index 265ad19d..c363ffbe 100644
--- a/src/Yavsc/Controllers/HomeController.cs
+++ b/src/Yavsc/Controllers/HomeController.cs
@@ -7,7 +7,6 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Diagnostics;
using Microsoft.Extensions.Options;
using Yavsc.Server.Helpers;
-using Org.BouncyCastle.Asn1.X509.Qualified;
namespace Yavsc.Controllers
{
@@ -79,7 +78,7 @@ namespace Yavsc.Controllers
public IActionResult Contact()
{
- return View();
+ return View(siteSettings);
}
public IActionResult Dash()
{
diff --git a/src/Yavsc/Views/Home/Contact.cshtml b/src/Yavsc/Views/Home/Contact.cshtml
index a00d092d..8de81335 100755
--- a/src/Yavsc/Views/Home/Contact.cshtml
+++ b/src/Yavsc/Views/Home/Contact.cshtml
@@ -1,17 +1,15 @@
+@model SiteSettings
@{
ViewData["Title"] = "Contact";
}
@ViewData["Title"].
@ViewData["Message"]
-
- Paul Schneider
- 2 Boulevard Aristide Briand -
- 92150 Suresnes (France)
- P: +33 6 51 14 15 64
-
+
+@Model.Owner.Name
+@Html.DisplayFor(m=>m.Owner.PostalAddress)
- Support: contact@pschneider.fr
- Marketing: paul@pschneider.fr
+ Support: @(Model.Admin.Name)<@(Model.Admin.EMail)>
+ Marketing: @(Model.Owner.Name)<@(Model.Owner.EMail)>
diff --git a/src/Yavsc/Views/Shared/DisplayTemplates/PostalAddress.cshtml b/src/Yavsc/Views/Shared/DisplayTemplates/PostalAddress.cshtml
new file mode 100644
index 00000000..30aa772a
--- /dev/null
+++ b/src/Yavsc/Views/Shared/DisplayTemplates/PostalAddress.cshtml
@@ -0,0 +1,8 @@
+@model PostalAddress
+
+
+@Model.Street1
+@Model.Street2
+@Model.PostalCode, @Model.City
+@Model.Province @Model.State @Model.Country
+
diff --git a/src/Yavsc/wwwroot/css/site.css b/src/Yavsc/wwwroot/css/site.css
index fee9c81f..a8260ce8 100644
--- a/src/Yavsc/wwwroot/css/site.css
+++ b/src/Yavsc/wwwroot/css/site.css
@@ -30,17 +30,15 @@ input[type='checkbox'] {
min-height: 1em; }
.container {
- background-color: #000000;
- color: #fff;
padding: .5em;
margin: .5em; }
.post {
background-color: #290505;
- color: #d1d1d1;
- padding: 2.3em;
+ color: #c4fbff;
+ padding: .7em;
border-radius: 2em;
- border: solid #5d7f0ca4 2pt; }
+ border: solid #b29e9e 2pt; }
.actiongroup {
float: right;
@@ -56,6 +54,10 @@ a {
a.close {
cursor: pointer; }
+address {
+ padding: .2em;
+ margin: .2em; }
+
.grants-page .card {
margin-top: 20px;
border-bottom: 1px solid lightgray; }
@@ -92,7 +94,7 @@ input[type='checkbox'] {
.container {
background-color: #000000;
- color: #ffffffab;
+ color: #e0e0e0;
padding: 0;
margin: 0; }
@@ -117,7 +119,7 @@ input[type='checkbox'] {
body {
font: 1rem/1.5 var(--font-family-sans-serif);
- color: #ffffffab;
+ color: #e0e0e0;
background-color: #000000; }
.card {
@@ -130,3 +132,11 @@ body {
max-width: 30em; }
.card .index-post-title {
display: inline; }
+
+.display-label {
+ display: inline;
+ font-style: italic;
+ font-weight: 300; }
+
+.display-field {
+ display: inline; }
diff --git a/src/Yavsc/wwwroot/css/site.min.css b/src/Yavsc/wwwroot/css/site.min.css
index c69a4942..36276184 100644
--- a/src/Yavsc/wwwroot/css/site.min.css
+++ b/src/Yavsc/wwwroot/css/site.min.css
@@ -1,10 +1,11 @@
.grants-page.card{margin-top:20px;border-bottom:1px solid#fd8134;}.grants-page.card.card-title{font-size:120%;font-weight:bold;}.grants-page.card.card-title img{width:100px;height:100px;}.grants-page.card label{font-weight:bold;}.navbar-dark.navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");}
div.carousel-inner>div.item>div.carousel-caption-s{margin:.5em;background-color:#11415faa;color:#ffffc8;font-weight:bold;padding:.5em;}
img.blogphoto{max-width:100%;max-height:100%;}
-input[type='checkbox']{appearance:auto;min-width:1em;min-height:1em;}.container{background-color:#000000;color:#fff;padding:.5em;margin:.5em;}.post{background-color:#290505;color:#d1d1d1;padding:2.3em;border-radius:2em;border:solid#5d7f0ca4 2pt;}.actiongroup{float:right;margin:.5em;}.float-left{float:left;margin:.5em;}
+input[type='checkbox']{appearance:auto;min-width:1em;min-height:1em;}.container{padding:.5em;margin:.5em;}.post{background-color:#290505;color:#c4fbff;padding:.7em;border-radius:2em;border:solid#b29e9e 2pt;}.actiongroup{float:right;margin:.5em;}.float-left{float:left;margin:.5em;}
a{color:var(--blue);}
-a.close{cursor:pointer;}.grants-page.card{margin-top:20px;border-bottom:1px solid lightgray;}.grants-page.card.card-title{font-size:120%;font-weight:bold;}.grants-page.card.card-title img{width:100px;height:100px;}.grants-page.card label{font-weight:bold;}.navbar-dark.navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");}
+a.close{cursor:pointer;}
+address{padding:.2em;margin:.2em;}.grants-page.card{margin-top:20px;border-bottom:1px solid lightgray;}.grants-page.card.card-title{font-size:120%;font-weight:bold;}.grants-page.card.card-title img{width:100px;height:100px;}.grants-page.card label{font-weight:bold;}.navbar-dark.navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");}
div.carousel-inner>div.item>div.carousel-caption-s{margin:.5em;background-color:#11415faa;color:#ffffc8;font-weight:bold;padding:.5em;}
img.blogphoto{max-width:100%;max-height:100%;}
-input[type='checkbox']{appearance:auto;min-width:1em;min-height:1em;}.container{background-color:#000000;color:#ffffffab;padding:0;margin:0;}.post{background-color:#290505;color:#c4fbff;padding:.3em;margin:.3em;border-radius:2em;border:solid#b29e9e 2pt;}.post.photo{max-height:100%;max-width:100%;}.actiongroup{float:right;margin:.5em;}.float-left{float:left;margin:.5em;}
-body{font:1rem/1.5 var(--font-family-sans-serif);color:#ffffffab;background-color:#000000;}.card{max-height:20em;max-width:30em;display:inline-table;}.card.card-photo{border:solid 1px#ffffffd4;max-height:15em;max-width:30em;}.card.index-post-title{display:inline;}
\ No newline at end of file
+input[type='checkbox']{appearance:auto;min-width:1em;min-height:1em;}.container{background-color:#000000;color:#e0e0e0;padding:0;margin:0;}.post{background-color:#290505;color:#c4fbff;padding:.3em;margin:.3em;border-radius:2em;border:solid#b29e9e 2pt;}.post.photo{max-height:100%;max-width:100%;}.actiongroup{float:right;margin:.5em;}.float-left{float:left;margin:.5em;}
+body{font:1rem/1.5 var(--font-family-sans-serif);color:#e0e0e0;background-color:#000000;}.card{max-height:20em;max-width:30em;display:inline-table;}.card.card-photo{border:solid 1px#ffffffd4;max-height:15em;max-width:30em;}.card.index-post-title{display:inline;}.display-label{display:inline;font-style:italic;font-weight:300;}.display-field{display:inline;}
\ No newline at end of file
diff --git a/src/Yavsc/wwwroot/css/site.scss b/src/Yavsc/wwwroot/css/site.scss
index 3af0fe63..be91e946 100644
--- a/src/Yavsc/wwwroot/css/site.scss
+++ b/src/Yavsc/wwwroot/css/site.scss
@@ -1,4 +1,4 @@
-$color: #ffffffab;
+$color: #e0e0e0;
$background-color: #000000;
$post-color: #c4fbff;
$post-background-color: #290505;
@@ -55,18 +55,16 @@ input[type='checkbox'] {
}
.container {
- background-color: $background-color;
- color: #fff;
padding: .5em;
margin: .5em;
}
.post {
background-color: $post-background-color;
- color: #d1d1d1;
- padding: 2.3em;
+ color: $post-color;
+ padding: .7em;
border-radius: 2em;
- border: solid #5d7f0ca4 2pt;
+ border: solid $post-border-color 2pt;
}
.actiongroup {
@@ -88,7 +86,12 @@ a {
a.close {
cursor: pointer;
}
+address {
+ padding:.2em;
+ margin:.2em;
+
+}
.grants-page .card {
margin-top: 20px;
border-bottom: 1px solid lightgray;
@@ -186,3 +189,12 @@ body {
display: inline;
}
}
+
+ .display-label {
+ display: inline;
+ font-style: italic;
+ font-weight: 300;
+ }
+ .display-field {
+ display: inline;
+ }