From 64febe48b02e23ccb28113e8e9015d7878116c78 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Mon, 20 Mar 2023 19:38:50 +0000 Subject: [PATCH] 97 remaining --- .../accounting/AccountController.cs | 18 +++++------ .../Accounting/AccountController.cs | 10 ++++--- src/Yavsc/Views/Account/Authorize.cshtml | 30 ------------------- src/Yavsc/Views/Account/ForgotPassword.cshtml | 2 +- .../Account/ForgotPasswordConfirmation.cshtml | 2 +- .../Account/ResetPasswordConfirmation.cshtml | 2 +- src/Yavsc/Views/Account/legacyLogin.cshtml | 30 ++++++------------- src/Yavsc/Views/Activity/Index.cshtml | 2 +- src/Yavsc/Views/Administration/Enroll.cshtml | 2 +- src/Yavsc/Views/Administration/Fire.cshtml | 2 +- src/Yavsc/Views/Administration/Role.cshtml | 2 +- src/Yavsc/Views/Blogspot/Details.cshtml | 4 +-- src/Yavsc/Views/Blogspot/Edit.cshtml | 4 +-- src/Yavsc/Views/Blogspot/Title.cshtml | 4 +-- src/Yavsc/Views/Blogspot/userposts.cshtml | 8 ++--- src/Yavsc/Views/BrusherProfile/Delete.cshtml | 12 -------- src/Yavsc/Views/Bug/DeleteAllLike.cshtml | 10 +++---- src/Yavsc/Views/Bug/Details.cshtml | 2 +- src/Yavsc/Views/Bug/Index.cshtml | 10 +++---- src/Yavsc/Views/CircleMembers/Details.cshtml | 2 +- .../Views/Command/BookHaircutStar.cshtml | 18 +++++------ .../Views/Command/CommandConfirmation.cshtml | 4 +-- ...s.Booking.MusicianSettingsEditor.fr.cshtml | 24 ++++----------- src/Yavsc/Views/Estimate/Index.cshtml | 2 +- src/Yavsc/Views/FrontOffice/Profiles.cshtml | 2 +- .../HairCutCommand/CommandConfirmation.cshtml | 6 ++-- src/Yavsc/Views/HairCutCommand/Details.cshtml | 2 +- src/Yavsc/Views/Home/About.cshtml | 2 +- src/Yavsc/Views/HyperLink/Details.cshtml | 2 +- src/Yavsc/Views/HyperLink/Index.cshtml | 6 ++-- src/Yavsc/Views/Instrumentation/Create.cshtml | 6 ++-- src/Yavsc/Views/Instrumentation/Delete.cshtml | 4 +-- .../Views/Instrumentation/Details.cshtml | 4 +-- src/Yavsc/Views/Instrumentation/Edit.cshtml | 4 +-- src/Yavsc/Views/Instrumentation/Index.cshtml | 4 +-- src/Yavsc/Views/Manage/AddBankInfo.cshtml | 2 +- src/Yavsc/Views/Manage/SetActivity.cshtml | 2 +- src/Yavsc/Views/Manage/SetAvatar.cshtml | 2 +- src/Yavsc/Views/Manage/SetFullName.cshtml | 2 +- .../DisplayTemplates/HairCutQuery.cshtml | 4 +-- .../DisplayTemplates/HairPrestation.cshtml | 4 +-- src/Yavsc/Views/Shared/SignIn.cshtml | 2 +- src/Yavsc/Views/_ViewImports.cshtml | 5 ++++ 43 files changed, 103 insertions(+), 168 deletions(-) delete mode 100644 src/Yavsc/Views/Account/Authorize.cshtml diff --git a/src/Yavsc/ApiControllers/accounting/AccountController.cs b/src/Yavsc/ApiControllers/accounting/AccountController.cs index f3c58e36..d5066d5c 100644 --- a/src/Yavsc/ApiControllers/accounting/AccountController.cs +++ b/src/Yavsc/ApiControllers/accounting/AccountController.cs @@ -1,24 +1,21 @@ using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; using System.Security.Claims; -using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; + +using Yavsc.Models; +using Yavsc.Models.Account; +using Yavsc.ViewModels.Account; +using Yavsc.Helpers; +using Yavsc.Abstract.Identity; namespace Yavsc.WebApi.Controllers { - using Models; - using Models.Account; - using ViewModels.Account; - using Yavsc.Helpers; - using System.Linq; - using Yavsc.Abstract.Identity; - using Microsoft.EntityFrameworkCore; [Authorize(),Route("~/api/account")] public class ApiAccountController : Controller { - private UserManager _userManager; private readonly SignInManager _signInManager; readonly ApplicationDbContext _dbContext; @@ -31,6 +28,7 @@ namespace Yavsc.WebApi.Controllers _signInManager = signInManager; _logger = loggerFactory.CreateLogger("ApiAuth"); _dbContext = dbContext; + IViewComponentHelper h; } public UserManager UserManager diff --git a/src/Yavsc/Controllers/Accounting/AccountController.cs b/src/Yavsc/Controllers/Accounting/AccountController.cs index cc8d0131..f0172228 100644 --- a/src/Yavsc/Controllers/Accounting/AccountController.cs +++ b/src/Yavsc/Controllers/Accounting/AccountController.cs @@ -9,13 +9,13 @@ using Yavsc.Services; using Yavsc.ViewModels.Account; using Microsoft.Extensions.Localization; using Newtonsoft.Json; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Options; +using Yavsc.Helpers; +using Yavsc.Abstract.Manage; namespace Yavsc.Controllers { - using Microsoft.EntityFrameworkCore; - using Microsoft.Extensions.Options; - using Yavsc.Abstract.Manage; - using Yavsc.Helpers; public class AccountController : Controller { @@ -59,6 +59,8 @@ namespace Yavsc.Controllers [Authorize(Roles = Constants.AdminGroupName)] public IActionResult Index() { + IViewComponentHelper h; + return View(); } diff --git a/src/Yavsc/Views/Account/Authorize.cshtml b/src/Yavsc/Views/Account/Authorize.cshtml deleted file mode 100644 index ef806f86..00000000 --- a/src/Yavsc/Views/Account/Authorize.cshtml +++ /dev/null @@ -1,30 +0,0 @@ -@{ - ViewData["Title"] = "Authorization Server"; - var identity = ViewData.Ticket != null ? ViewData.Ticket.Identity : null; - var scopes = (Request.QueryString.Get("scope") ?? "").Split(' '); -} - -

@ViewData["Title"].

- -
-

Hello, <%=identity.Name%>

- - <%if (ViewData["Message"]!=null) { %> -

<%=Html.Encode(ViewData["Message"])%>

- <% } %> -

A third party application want to do the following on your behalf:

-
    - <% foreach (var scope in scopes) - { %> -
  • <%=scope%>
    • - <% } %> -
-

- ">Retour - <%=Html.Hidden("redirect_uri",ViewData["redirect_uri"])%> - - -

-
- - diff --git a/src/Yavsc/Views/Account/ForgotPassword.cshtml b/src/Yavsc/Views/Account/ForgotPassword.cshtml index 88ea5f66..3d69901c 100755 --- a/src/Yavsc/Views/Account/ForgotPassword.cshtml +++ b/src/Yavsc/Views/Account/ForgotPassword.cshtml @@ -1,6 +1,6 @@ @model ForgotPasswordViewModel @{ - ViewData["Title"] = SR["Forgot your password?"]; + ViewData["Title"] = "Forgot your password?"; }

@ViewData["Title"]

diff --git a/src/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml b/src/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml index 6627284b..621104df 100755 --- a/src/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml +++ b/src/Yavsc/Views/Account/ForgotPasswordConfirmation.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = Forgot Password Confirmation."]; + ViewData["Title"] = "Forgot Password Confirmation"; }

@ViewData["Title"].

diff --git a/src/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml b/src/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml index 10a6d4f4..bedabfcd 100755 --- a/src/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml +++ b/src/Yavsc/Views/Account/ResetPasswordConfirmation.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = SR["Reset password confirmation"]; + ViewData["Title"] = "Reset password confirmation"; }

@ViewData["Title"].

diff --git a/src/Yavsc/Views/Account/legacyLogin.cshtml b/src/Yavsc/Views/Account/legacyLogin.cshtml index 9e5bb805..9f331405 100755 --- a/src/Yavsc/Views/Account/legacyLogin.cshtml +++ b/src/Yavsc/Views/Account/legacyLogin.cshtml @@ -1,7 +1,7 @@ @model Yavsc.ViewModels.Account.LoginViewModel @{ - ViewData["Title"] = SR["Log in"]; + ViewData["Title"] = "Log in"; }
@@ -53,24 +53,12 @@

Use another service to log in:

- @if (Model.ExternalProviders?.Count() == 0) - { -
-

- There are no external authentication services configured. See this article - for details on setting up this ASP.NET application to support logging in via external services. -

-
- } - else - { - @foreach (var description in Model.ExternalProviders) { -
- - - - @Html.AntiForgeryToken() -
- } - } + +
+

+ There are no external authentication services configured. See this article + for details on setting up this ASP.NET application to support logging in via external services. +

+
+
diff --git a/src/Yavsc/Views/Activity/Index.cshtml b/src/Yavsc/Views/Activity/Index.cshtml index 1d2a12ec..25b99320 100644 --- a/src/Yavsc/Views/Activity/Index.cshtml +++ b/src/Yavsc/Views/Activity/Index.cshtml @@ -69,7 +69,7 @@ @if (item.SettingsClassName!=null) { - @SR[item.SettingsClassName] + @item.SettingsClassName } diff --git a/src/Yavsc/Views/Administration/Enroll.cshtml b/src/Yavsc/Views/Administration/Enroll.cshtml index 4cb5d434..314b1d56 100644 --- a/src/Yavsc/Views/Administration/Enroll.cshtml +++ b/src/Yavsc/Views/Administration/Enroll.cshtml @@ -1,7 +1,7 @@ @model Yavsc.ViewModels.EnrolerViewModel @{  - ViewBag.Title = SR["Enroll"]+" : "+Model.RoleName; + ViewBag.Title = "Enroll"+" : "+Model.RoleName; }
diff --git a/src/Yavsc/Views/Administration/Fire.cshtml b/src/Yavsc/Views/Administration/Fire.cshtml index 2db4fe34..9dc0f80e 100644 --- a/src/Yavsc/Views/Administration/Fire.cshtml +++ b/src/Yavsc/Views/Administration/Fire.cshtml @@ -1,7 +1,7 @@ @model Yavsc.ViewModels.FireViewModel @{  - ViewBag.Title = SR["Fire"]+" : "+Model.RoleName; + ViewBag.Title = "Fire"+" : "+Model.RoleName; } diff --git a/src/Yavsc/Views/Administration/Role.cshtml b/src/Yavsc/Views/Administration/Role.cshtml index 0556cf7a..94bc15ab 100644 --- a/src/Yavsc/Views/Administration/Role.cshtml +++ b/src/Yavsc/Views/Administration/Role.cshtml @@ -1,6 +1,6 @@ @model RoleUserCollection @{  - ViewBag.Title = SR["Role"]+" "+Model.Name; + ViewBag.Title = "Role"+" "+Model.Name; }

@ViewBag.Title

diff --git a/src/Yavsc/Views/Blogspot/Details.cshtml b/src/Yavsc/Views/Blogspot/Details.cshtml index 3c90e2ca..26aa1d24 100644 --- a/src/Yavsc/Views/Blogspot/Details.cshtml +++ b/src/Yavsc/Views/Blogspot/Details.cshtml @@ -84,7 +84,7 @@ $('span.field-validation-valid[data-valmsg-for="Content"]').html( @Html.DisplayFor(model => model.DateCreated) - @Component.Invoke("Tagger",Model, null, null) + @await Component.InvokeAsync("Tagger",Model)
@@ -112,7 +112,7 @@ $('span.field-validation-valid[data-valmsg-for="Content"]').html( }
-@if (await AuthorizationService.AuthorizeAsync(User, Model, new EditRequirement())) { +@if ((await AuthorizationService.AuthorizeAsync(User, Model, new EditRequirement())).IsSuccess) { Edit } Back to List diff --git a/src/Yavsc/Views/Blogspot/Edit.cshtml b/src/Yavsc/Views/Blogspot/Edit.cshtml index d68d7ae3..d08c52d4 100644 --- a/src/Yavsc/Views/Blogspot/Edit.cshtml +++ b/src/Yavsc/Views/Blogspot/Edit.cshtml @@ -1,7 +1,7 @@ @model BlogPost @{ - ViewData["Title"] = SR["Blog post edition"]; + ViewData["Title"] = "Blog post edition"; } @section header { @@ -219,7 +219,7 @@
- @Component.Invoke("CirclesControl", Model, null, null) + @await Component.InvokeAsync("CirclesControl", Model)
diff --git a/src/Yavsc/Views/Blogspot/Title.cshtml b/src/Yavsc/Views/Blogspot/Title.cshtml index 659a6161..e1c1e3e8 100644 --- a/src/Yavsc/Views/Blogspot/Title.cshtml +++ b/src/Yavsc/Views/Blogspot/Title.cshtml @@ -41,12 +41,12 @@
    - @if (await AuthorizationService.AuthorizeAsync(User, item, new ViewRequirement())) { + @if ((await AuthorizationService.AuthorizeAsync(User, item, new ViewRequirement())).IsSuccess) {
  • Details
    • } - @if (await AuthorizationService.AuthorizeAsync(User, item, new EditRequirement())) { + @if ((await AuthorizationService.AuthorizeAsync(User, item, new EditRequirement())).IsSuccess) {
  • Edit
  • Delete diff --git a/src/Yavsc/Views/Blogspot/userposts.cshtml b/src/Yavsc/Views/Blogspot/userposts.cshtml index c35cfc1f..a73fcb98 100644 --- a/src/Yavsc/Views/Blogspot/userposts.cshtml +++ b/src/Yavsc/Views/Blogspot/userposts.cshtml @@ -17,13 +17,13 @@ @Html.DisplayNameFor(model => model.Content) - @Html.DisplayNameFor(model => model.Modified) + @Html.DisplayNameFor(model => model.DateModified) @Html.DisplayNameFor(model => model.Photo) - @Html.DisplayNameFor(model => model.Posted) + @Html.DisplayNameFor(model => model.UserModified) @Html.DisplayNameFor(model => model.Rate) @@ -49,13 +49,13 @@
    - @Html.DisplayFor(modelItem => item.Modified) + @Html.DisplayFor(modelItem => item.DateModified) @Html.DisplayFor(modelItem => item.Photo) - @Html.DisplayFor(modelItem => item.Posted) + @Html.DisplayFor(modelItem => item.UserModified) @Html.DisplayFor(modelItem => item.Rate) diff --git a/src/Yavsc/Views/BrusherProfile/Delete.cshtml b/src/Yavsc/Views/BrusherProfile/Delete.cshtml index 26047402..83f60ee2 100644 --- a/src/Yavsc/Views/BrusherProfile/Delete.cshtml +++ b/src/Yavsc/Views/BrusherProfile/Delete.cshtml @@ -17,12 +17,6 @@
    @Html.DisplayFor(model => model.CarePrice)
    -
    - @Html.DisplayNameFor(model => model.EndOfTheDay) -
    -
    - @Html.DisplayFor(model => model.EndOfTheDay) -
    @Html.DisplayNameFor(model => model.HalfBalayagePrice)
    @@ -167,12 +161,6 @@
    @Html.DisplayFor(model => model.ShortPermanentPrice)
    -
    - @Html.DisplayNameFor(model => model.StartOfTheDay) -
    -
    - @Html.DisplayFor(model => model.StartOfTheDay) -
    @Html.DisplayNameFor(model => model.WomenHalfCutPrice)
    diff --git a/src/Yavsc/Views/Bug/DeleteAllLike.cshtml b/src/Yavsc/Views/Bug/DeleteAllLike.cshtml index 59357e5e..04e8a695 100644 --- a/src/Yavsc/Views/Bug/DeleteAllLike.cshtml +++ b/src/Yavsc/Views/Bug/DeleteAllLike.cshtml @@ -13,16 +13,16 @@ @@ -40,7 +40,7 @@
    - @SR[Html.DisplayNameFor(model => model.Id)] + @Html.DisplayNameFor(model => model.Id) - @SR[Html.DisplayNameFor(model => model.Title)] + @Html.DisplayNameFor(model => model.Title) - @SR[Html.DisplayNameFor(model => model.FeatureId)] + @Html.DisplayNameFor(model => model.FeatureId) - @SR[Html.DisplayNameFor(model => model.Status)] + @Html.DisplayNameFor(model => model.Status)
    - @SR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status]] + @typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status] Edit | diff --git a/src/Yavsc/Views/Bug/Details.cshtml b/src/Yavsc/Views/Bug/Details.cshtml index b3a9fa87..2145e0ad 100644 --- a/src/Yavsc/Views/Bug/Details.cshtml +++ b/src/Yavsc/Views/Bug/Details.cshtml @@ -26,7 +26,7 @@ Status"]
    - @SR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)Model.Status]] + @typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)Model.Status]
    diff --git a/src/Yavsc/Views/Bug/Index.cshtml b/src/Yavsc/Views/Bug/Index.cshtml index 5d3da466..fe4368ab 100644 --- a/src/Yavsc/Views/Bug/Index.cshtml +++ b/src/Yavsc/Views/Bug/Index.cshtml @@ -13,16 +13,16 @@ @@ -40,7 +40,7 @@ } diff --git a/src/Yavsc/Views/Instrumentation/Create.cshtml b/src/Yavsc/Views/Instrumentation/Create.cshtml index 4a3c48db..385113b8 100644 --- a/src/Yavsc/Views/Instrumentation/Create.cshtml +++ b/src/Yavsc/Views/Instrumentation/Create.cshtml @@ -2,8 +2,8 @@ @model Instrumentation @{ - ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; - ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Set"] + "]" ; + ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation"; + ViewData["Title"] = ViewBag.SettingLabel + "[" +"Set" + "]" ; }

    @ViewData["Title"]

    @@ -17,7 +17,7 @@
    - @System.Globalization.CultureInfo.CurrentUICulture.TextInfo.ToTitleCase(SR["nouvel instrument"]) + @System.Globalization.CultureInfo.CurrentUICulture.TextInfo.ToTitleCase("nouvel instrument") diff --git a/src/Yavsc/Views/Instrumentation/Delete.cshtml b/src/Yavsc/Views/Instrumentation/Delete.cshtml index c1a5ce71..5f0e2bb9 100644 --- a/src/Yavsc/Views/Instrumentation/Delete.cshtml +++ b/src/Yavsc/Views/Instrumentation/Delete.cshtml @@ -2,8 +2,8 @@ @{ - ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; - ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Delete"] + "]" ; + ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation"; + ViewData["Title"] = ViewBag.SettingLabel + "[" +"Delete" + "]" ; }

    Delete

    diff --git a/src/Yavsc/Views/Instrumentation/Details.cshtml b/src/Yavsc/Views/Instrumentation/Details.cshtml index beb4368f..3a1a08ee 100644 --- a/src/Yavsc/Views/Instrumentation/Details.cshtml +++ b/src/Yavsc/Views/Instrumentation/Details.cshtml @@ -2,8 +2,8 @@ @{ - ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; - ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Details"] + "]" ; + ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation"; + ViewData["Title"] = ViewBag.SettingLabel + "[" +"Details" + "]" ; } @{ bool existingInstrument = Model. diff --git a/src/Yavsc/Views/Instrumentation/Edit.cshtml b/src/Yavsc/Views/Instrumentation/Edit.cshtml index 47c9085a..261457f5 100644 --- a/src/Yavsc/Views/Instrumentation/Edit.cshtml +++ b/src/Yavsc/Views/Instrumentation/Edit.cshtml @@ -1,8 +1,8 @@ @model Instrumentation @{ - ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; - ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Edit"] + "]" ; + ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation"; + ViewData["Title"] = ViewBag.SettingLabel + "[" +"Edit" + "]" ; }

    Edit

    diff --git a/src/Yavsc/Views/Instrumentation/Index.cshtml b/src/Yavsc/Views/Instrumentation/Index.cshtml index 5fa072fe..424dc996 100644 --- a/src/Yavsc/Views/Instrumentation/Index.cshtml +++ b/src/Yavsc/Views/Instrumentation/Index.cshtml @@ -2,8 +2,8 @@ @{ - ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; - ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Index"] + "]" ; + ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation"; + ViewData["Title"] = ViewBag.SettingLabel + "[" +"Index" + "]" ; }

    Index

    diff --git a/src/Yavsc/Views/Manage/AddBankInfo.cshtml b/src/Yavsc/Views/Manage/AddBankInfo.cshtml index 1206f587..a3a83310 100644 --- a/src/Yavsc/Views/Manage/AddBankInfo.cshtml +++ b/src/Yavsc/Views/Manage/AddBankInfo.cshtml @@ -1,6 +1,6 @@ @model Yavsc.Models.Bank.BankIdentity @{ - ViewData["Title"] = SR["Fill in your Bank Info"]; + ViewData["Title"] = "Fill in your Bank Info"; }

    @ViewData["Title"].

    diff --git a/src/Yavsc/Views/Manage/SetActivity.cshtml b/src/Yavsc/Views/Manage/SetActivity.cshtml index 7ed1cd07..f80aed56 100644 --- a/src/Yavsc/Views/Manage/SetActivity.cshtml +++ b/src/Yavsc/Views/Manage/SetActivity.cshtml @@ -1,5 +1,5 @@ @model PerformerProfile -@{ ViewData["Title"] = SR["Your performer profile"]; } +@{ ViewData["Title"] = "Your performer profile"; } @section header {
    - @SR[Html.DisplayNameFor(model => model.Id)] + @Html.DisplayNameFor(model => model.Id) - @SR[Html.DisplayNameFor(model => model.Title)] + @Html.DisplayNameFor(model => model.Title) - @SR[Html.DisplayNameFor(model => model.FeatureId)] + @Html.DisplayNameFor(model => model.FeatureId) - @SR[Html.DisplayNameFor(model => model.Status)] + @Html.DisplayNameFor(model => model.Status)
    - @SR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status]] + @typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status] Edit | diff --git a/src/Yavsc/Views/CircleMembers/Details.cshtml b/src/Yavsc/Views/CircleMembers/Details.cshtml index ecb0ecc4..54609c35 100644 --- a/src/Yavsc/Views/CircleMembers/Details.cshtml +++ b/src/Yavsc/Views/CircleMembers/Details.cshtml @@ -12,6 +12,6 @@ @Html.DisplayFor(m=>Model.Member)

    - @Html.ActionLink(SR["Delete"], "Delete", new { id = Model.CircleId }) | + @Html.ActionLink("Delete", "Delete", new { id = Model.CircleId }) | Back to List

    diff --git a/src/Yavsc/Views/Command/BookHaircutStar.cshtml b/src/Yavsc/Views/Command/BookHaircutStar.cshtml index 865c8752..c42eb9f8 100644 --- a/src/Yavsc/Views/Command/BookHaircutStar.cshtml +++ b/src/Yavsc/Views/Command/BookHaircutStar.cshtml @@ -1,6 +1,5 @@ -@{ ViewData["Title"] = "Proposition de rendez-vous "+ -to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; } +@{ ViewData["Title"] = "Proposition de rendez-vous ["+ViewBag.Activity.Code+"]"; } @@ -144,8 +143,7 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; } }); }); - - + @@ -157,8 +155,8 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
    - +
    @@ -181,8 +179,8 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
    -@Html.HiddenFor(model=>model.Location.Latitude) - @Html.HiddenFor(model=>model.Location.Longitude) +@Html.HiddenFor("Latitude") + @Html.HiddenFor("Longitude")
    @@ -196,8 +194,8 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
    @Html.HiddenFor("ClientId") -@Html.HiddenFor(model=>model.PerformerId) -@Html.HiddenFor(model=>model.ActivityCode) +@Html.HiddenFor("PerformerId") +@Html.HiddenFor("ActivityCode") diff --git a/src/Yavsc/Views/Command/CommandConfirmation.cshtml b/src/Yavsc/Views/Command/CommandConfirmation.cshtml index c97a27d8..09b55895 100644 --- a/src/Yavsc/Views/Command/CommandConfirmation.cshtml +++ b/src/Yavsc/Views/Command/CommandConfirmation.cshtml @@ -1,7 +1,7 @@ @model RdvQuery @using Yavsc.Models.Google.Messaging @{ - ViewData["Title"] = SR["Command confirmation"]+" "+ViewBag.Activity.Name; + ViewData["Title"] = "Command confirmation"+" "+ViewBag.Activity.Name; }

    @ViewData["Title"]

    @@ -29,7 +29,7 @@ @if (ViewBag.EmailSent!=null) { if (ViewBag.EmailSent.Sent) { -

    @String.Format(SR["EmailSentToPerformer"],User.GetUserName())

    +

    @String.Format("EmailSentToPerformer",User.GetUserName())

    } else { var sent = ViewBag.EmailSent; diff --git a/src/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml b/src/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml index 0ca02e84..8a2d3b2b 100644 --- a/src/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml +++ b/src/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml @@ -1,23 +1,9 @@ @model Instrumentation -@{ - ViewBag.YetAvailableInstruments = _context.Instrument.Where(i=> !_context.MusicianSettings.Any(s=>s.UserId==id && s.Instrumentation.Any(j=>j.Id == i.Id))) - .Select(k=>new SelectListItem { Text = k.Name }); -} - - - - - - +
    + +
    diff --git a/src/Yavsc/Views/Estimate/Index.cshtml b/src/Yavsc/Views/Estimate/Index.cshtml index 6f27aa02..e1e535e1 100644 --- a/src/Yavsc/Views/Estimate/Index.cshtml +++ b/src/Yavsc/Views/Estimate/Index.cshtml @@ -1,7 +1,7 @@ @model IEnumerable @{ - ViewData["Title"] = SR["My estimates"]; + ViewData["Title"] = "My estimates"; }

    Index

    diff --git a/src/Yavsc/Views/FrontOffice/Profiles.cshtml b/src/Yavsc/Views/FrontOffice/Profiles.cshtml index a7cc8770..36dbd87a 100644 --- a/src/Yavsc/Views/FrontOffice/Profiles.cshtml +++ b/src/Yavsc/Views/FrontOffice/Profiles.cshtml @@ -1,7 +1,7 @@ @model IEnumerable @{ - ViewData["Title"] = (ViewBag.Activity?.Name ?? SR["Any"]) ; + ViewData["Title"] = (ViewBag.Activity?.Name ?? "Any") ; }

    @ViewData["Title"]

    @ViewBag.Activity.Description diff --git a/src/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml b/src/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml index fee07ab8..7d14f57b 100644 --- a/src/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml +++ b/src/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml @@ -1,6 +1,6 @@ @model HairCutQuery @{ - ViewData["Title"] = SR["Command confirmation"]+" "+ViewBag.Activity.Name; + ViewData["Title"] = "Command confirmation"+" "+ViewBag.Activity.Name; } @section header { @@ -83,11 +83,11 @@
    La facture
    -
    @await Component.InvokeAsync("Bill", "Brush", Model, OutputFormat.Html, false ) +
    @await Component.InvokeAsync("Bill", Model)
    @Html.DisplayNameFor(m=>m.Regularisation)
    -
    @Component.Invoke("PayPalButton", Model, "haircut", "HairCutCommand" ) +
    @await Component.InvokeAsync("PayPalButton", Model)
    diff --git a/src/Yavsc/Views/HairCutCommand/Details.cshtml b/src/Yavsc/Views/HairCutCommand/Details.cshtml index bdff2841..b39ff5e7 100644 --- a/src/Yavsc/Views/HairCutCommand/Details.cshtml +++ b/src/Yavsc/Views/HairCutCommand/Details.cshtml @@ -4,7 +4,7 @@ } @{ - ViewData["Title"] = Le detail de votre commande de prestation en coiffure à domicile"]; + ViewData["Title"] = "Le detail de votre commande de prestation en coiffure à domicile"; }

    @ViewData["Title"]

    diff --git a/src/Yavsc/Views/Home/About.cshtml b/src/Yavsc/Views/Home/About.cshtml index f4348b14..2cf27b7f 100755 --- a/src/Yavsc/Views/Home/About.cshtml +++ b/src/Yavsc/Views/Home/About.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = About+" "+@SiteSettings.Value.Title; + ViewData["Title"] = "About "+ SiteSettings.Title; }

    @ViewData["Title"]

    diff --git a/src/Yavsc/Views/HyperLink/Details.cshtml b/src/Yavsc/Views/HyperLink/Details.cshtml index 3bbff2d5..1bea9635 100644 --- a/src/Yavsc/Views/HyperLink/Details.cshtml +++ b/src/Yavsc/Views/HyperLink/Details.cshtml @@ -37,6 +37,6 @@

    - @Html.ActionLink(SR["Edit"], "Edit", new { /* id = Model.PrimaryKey */ }) | + @Html.ActionLink("Edit", "Edit", new { /* id = Model.PrimaryKey */ }) | Back to List

    diff --git a/src/Yavsc/Views/HyperLink/Index.cshtml b/src/Yavsc/Views/HyperLink/Index.cshtml index 3a68f217..34d7bbdd 100644 --- a/src/Yavsc/Views/HyperLink/Index.cshtml +++ b/src/Yavsc/Views/HyperLink/Index.cshtml @@ -41,9 +41,9 @@ @Html.DisplayFor(modelItem => item.Rel)     		- @Html.ActionLink(SR["Edit"], "Edit", new { hRef=item.HRef, method = item.Method }) | - @Html.ActionLink(SR["Details"], "Details", new { hRef=item.HRef, method = item.Method }) | - @Html.ActionLink(SR["Delete"], "Delete", new { hRef=item.HRef, method = item.Method }) + @Html.ActionLink("Edit", "Edit", new { hRef=item.HRef, method = item.Method }) | + @Html.ActionLink("Details", "Details", new { hRef=item.HRef, method = item.Method }) | + @Html.ActionLink("Delete", "Delete", new { hRef=item.HRef, method = item.Method })