From f09a5ec2ca0440bfc862be6debd0758055eb229a Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 27 Jul 2016 11:09:49 +0200 Subject: [PATCH] layout --- Yavsc/Views/Blogspot/Index.cshtml | 47 +++++-------------- .../Views/Command/CommandConfirmation.cshtml | 22 ++++----- Yavsc/Views/Estimate/Create.cshtml | 2 +- Yavsc/Views/Estimate/Delete.cshtml | 2 +- Yavsc/Views/Estimate/Details.cshtml | 2 +- Yavsc/Views/Estimate/Edit.cshtml | 2 +- Yavsc/Views/Estimate/Index.cshtml | 2 +- Yavsc/Views/FrontOffice/Book.cshtml | 2 +- Yavsc/Views/Shared/_Layout.cshtml | 2 + Yavsc/Views/Shared/_PerformerPartial.cshtml | 5 +- Yavsc/wwwroot/css/site.css | 7 ++- 11 files changed, 34 insertions(+), 61 deletions(-) diff --git a/Yavsc/Views/Blogspot/Index.cshtml b/Yavsc/Views/Blogspot/Index.cshtml index 40d0f735..a196b7ce 100644 --- a/Yavsc/Views/Blogspot/Index.cshtml +++ b/Yavsc/Views/Blogspot/Index.cshtml @@ -7,30 +7,15 @@

Index

@ViewData["StatusMessage"]

- Create New + @SR["Create a new article"]

- - - - - @@ -38,34 +23,24 @@ @foreach (var item in Model) { - - - - -
- @SR["Author"] - - @Html.DisplayNameFor(model => model.title) - - @Html.DisplayNameFor(model => model.modified) - - @Html.DisplayNameFor(model => model.photo) - - @Html.DisplayNameFor(model => model.posted) - - @Html.DisplayNameFor(model => model.rate) + @SR[Html.DisplayNameFor(model => model.title)] - @Html.DisplayNameFor(model => model.visible) + @SR["Author"]
- @item.Author?.UserName - + @Html.DisplayFor(modelItem => item.photo) @item.title - @Html.DisplayFor(modelItem => item.modified) - - @Html.DisplayFor(modelItem => item.photo) - - @Html.DisplayFor(modelItem => item.posted) - - @Html.DisplayFor(modelItem => item.rate) - - @Html.DisplayFor(modelItem => item.visible) + @item.Author?.UserName +
+ @Html.DisplayFor(modelItem => item.posted) + @Html.DisplayFor(modelItem => item.modified) + @Html.DisplayFor(modelItem => item.rate) 		diff --git a/Yavsc/Views/Command/CommandConfirmation.cshtml b/Yavsc/Views/Command/CommandConfirmation.cshtml index 894ec51c..bac76129 100644 --- a/Yavsc/Views/Command/CommandConfirmation.cshtml +++ b/Yavsc/Views/Command/CommandConfirmation.cshtml @@ -43,22 +43,16 @@ $(document).ready(function(){
@Html.DisplayFor(m => m.EventDate) @Html.DisplayFor(m => m.Location) -

@SR["Notifications sent to its devices"]

-
@if (ViewBag.GooglePayload !=null) { - - @if (ViewBag.GooglePayload.results !=null) { - @:success: @ViewBag.GooglePayload.success - @:failure: @ViewBag.GooglePayload.failure -
- - @foreach (MessageWithPayloadResponse.Result mr in ViewBag.GooglePayload.results) { - @:message_id: @mr.message_id - @:registration_id: @mr.registration_id - @:error: @mr.error -
- } + @if (ViewBag.GooglePayload.success>0) { +

@SR["GCM Notifications sent"]

+ } + else { + if (ViewBag.GooglePayload.failure>0) + { +

@SR["GCM Notification sending failed"]

+ } } } diff --git a/Yavsc/Views/Estimate/Create.cshtml b/Yavsc/Views/Estimate/Create.cshtml index 9e09cf20..caf8a9aa 100644 --- a/Yavsc/Views/Estimate/Create.cshtml +++ b/Yavsc/Views/Estimate/Create.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = SR["Estimate"]; diff --git a/Yavsc/Views/Estimate/Delete.cshtml b/Yavsc/Views/Estimate/Delete.cshtml index 9165fdc3..17c57de7 100644 --- a/Yavsc/Views/Estimate/Delete.cshtml +++ b/Yavsc/Views/Estimate/Delete.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = "Delete"; diff --git a/Yavsc/Views/Estimate/Details.cshtml b/Yavsc/Views/Estimate/Details.cshtml index 79293514..384dab3b 100644 --- a/Yavsc/Views/Estimate/Details.cshtml +++ b/Yavsc/Views/Estimate/Details.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = "Details"; diff --git a/Yavsc/Views/Estimate/Edit.cshtml b/Yavsc/Views/Estimate/Edit.cshtml index 2f996506..2e14961d 100644 --- a/Yavsc/Views/Estimate/Edit.cshtml +++ b/Yavsc/Views/Estimate/Edit.cshtml @@ -1,4 +1,4 @@ -@model Yavsc.Models.Estimate +@model Estimate @{ ViewData["Title"] = "Edit"; diff --git a/Yavsc/Views/Estimate/Index.cshtml b/Yavsc/Views/Estimate/Index.cshtml index 4ef300a2..f7ed5930 100644 --- a/Yavsc/Views/Estimate/Index.cshtml +++ b/Yavsc/Views/Estimate/Index.cshtml @@ -1,4 +1,4 @@ -@model IEnumerable +@model IEnumerable @{ ViewData["Title"] = SR["My estimates"]; diff --git a/Yavsc/Views/FrontOffice/Book.cshtml b/Yavsc/Views/FrontOffice/Book.cshtml index 892bd66a..695d0848 100644 --- a/Yavsc/Views/FrontOffice/Book.cshtml +++ b/Yavsc/Views/FrontOffice/Book.cshtml @@ -8,7 +8,7 @@ @foreach (var profile in Model) { await Html.RenderPartialAsync("_PerformerPartial", profile) ;
- +
} diff --git a/Yavsc/Views/Shared/_Layout.cshtml b/Yavsc/Views/Shared/_Layout.cshtml index 97d70fa5..2013471c 100755 --- a/Yavsc/Views/Shared/_Layout.cshtml +++ b/Yavsc/Views/Shared/_Layout.cshtml @@ -39,12 +39,14 @@ + @SiteSettings.Value.Title
diff --git a/Yavsc/Views/Shared/_PerformerPartial.cshtml b/Yavsc/Views/Shared/_PerformerPartial.cshtml index 243b696b..568f10dd 100644 --- a/Yavsc/Views/Shared/_PerformerPartial.cshtml +++ b/Yavsc/Views/Shared/_PerformerPartial.cshtml @@ -1,8 +1,10 @@ @model PerformerProfile
- @Model.Performer?.UserName (rating: @Model.Rate%) + @if (Model.Performer != null) { +
    +
  • @Model.Performer.UserName (rating: @Model.Rate%)
    • @if (Model.MinDailyCost != null) {
  • @SR["MinDailyCost"]: @Model.MinDailyCost€
    • } @@ -29,4 +31,5 @@ }
+ }
diff --git a/Yavsc/wwwroot/css/site.css b/Yavsc/wwwroot/css/site.css index 65a2cedb..31770497 100755 --- a/Yavsc/wwwroot/css/site.css +++ b/Yavsc/wwwroot/css/site.css @@ -15,13 +15,12 @@ textarea { /* Set widths on image and video, since otherwise they use their native resolution */ -img, -video { - max-width: 100%; -} /* .navbar-reac */ /* Carousel */ +.carousel, .carousel img { + min-height: 15em; +} .carousel-caption p { font-family: "jubilat"; font-weight: 600;