97 remaining

dotnet-7.0
Paul Schneider 2 years ago
parent c81f974ade
commit 64febe48b0
43 changed files with 103 additions and 168 deletions

@ -1,24 +1,21 @@
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System.Security.Claims; 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 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")] [Authorize(),Route("~/api/account")]
public class ApiAccountController : Controller public class ApiAccountController : Controller
{ {
private UserManager<ApplicationUser> _userManager; private UserManager<ApplicationUser> _userManager;
private readonly SignInManager<ApplicationUser> _signInManager; private readonly SignInManager<ApplicationUser> _signInManager;
readonly ApplicationDbContext _dbContext; readonly ApplicationDbContext _dbContext;
@ -31,6 +28,7 @@ namespace Yavsc.WebApi.Controllers
_signInManager = signInManager; _signInManager = signInManager;
_logger = loggerFactory.CreateLogger("ApiAuth"); _logger = loggerFactory.CreateLogger("ApiAuth");
_dbContext = dbContext; _dbContext = dbContext;
IViewComponentHelper h;
} }
public UserManager<ApplicationUser> UserManager public UserManager<ApplicationUser> UserManager

@ -9,13 +9,13 @@ using Yavsc.Services;
using Yavsc.ViewModels.Account; using Yavsc.ViewModels.Account;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using Newtonsoft.Json; using Newtonsoft.Json;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
using Yavsc.Helpers;
using Yavsc.Abstract.Manage;
namespace Yavsc.Controllers namespace Yavsc.Controllers
{ {
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
using Yavsc.Abstract.Manage;
using Yavsc.Helpers;
public class AccountController : Controller public class AccountController : Controller
{ {
@ -59,6 +59,8 @@ namespace Yavsc.Controllers
[Authorize(Roles = Constants.AdminGroupName)] [Authorize(Roles = Constants.AdminGroupName)]
public IActionResult Index() public IActionResult Index()
{ {
IViewComponentHelper h;
return View(); return View();
} }

@ -1,30 +0,0 @@
@{
ViewData["Title"] = "Authorization Server";
var identity = ViewData.Ticket != null ? ViewData.Ticket.Identity : null;
var scopes = (Request.QueryString.Get("scope") ?? "").Split(' ');
}
<h2>@ViewData["Title"].</h2>
<form method="POST">
<p>Hello, <%=identity.Name%></p>
<%if (ViewData["Message"]!=null) { %>
<p><%=Html.Encode(ViewData["Message"])%></p>
<% } %>
<p>A third party application want to do the following on your behalf:</p>
<ul>
<% foreach (var scope in scopes)
{ %>
<li><%=scope%></li>
<% } %>
</ul>
<p>
<a href="<%=ViewData["redirect_uri"]%>">Retour</a>
<%=Html.Hidden("redirect_uri",ViewData["redirect_uri"])%>
<input type="submit" name="submit.Grant" value="Grant" />
<input type="submit" name="submit.Login" value="Sign in as different user" />
</p>
</form>
</div>

@ -1,6 +1,6 @@
@model ForgotPasswordViewModel @model ForgotPasswordViewModel
@{ @{
ViewData["Title"] = SR["Forgot your password?"]; ViewData["Title"] = "Forgot your password?";
} }
<h2>@ViewData["Title"]</h2> <h2>@ViewData["Title"]</h2>

@ -1,5 +1,5 @@
@{ @{
ViewData["Title"] = Forgot Password Confirmation."]; ViewData["Title"] = "Forgot Password Confirmation";
} }
<h2>@ViewData["Title"].</h2> <h2>@ViewData["Title"].</h2>

@ -1,5 +1,5 @@
@{ @{
ViewData["Title"] = SR["Reset password confirmation"]; ViewData["Title"] = "Reset password confirmation";
} }
<h1>@ViewData["Title"].</h1> <h1>@ViewData["Title"].</h1>

@ -1,7 +1,7 @@
@model Yavsc.ViewModels.Account.LoginViewModel @model Yavsc.ViewModels.Account.LoginViewModel
@{ @{
ViewData["Title"] = SR["Log in"]; ViewData["Title"] = "Log in";
} }
<div class="jumbotron"> <div class="jumbotron">
@ -53,24 +53,12 @@
<hr/> <hr/>
<h2 class="lead text-left">Use another service to log in:</h2> <h2 class="lead text-left">Use another service to log in:</h2>
@if (Model.ExternalProviders?.Count() == 0)
{ <div>
<div> <p>
<p> There are no external authentication services configured. See <a href="http://go.microsoft.com/fwlink/?LinkID=532715">this article</a>
There are no external authentication services configured. See <a href="http://go.microsoft.com/fwlink/?LinkID=532715">this article</a> for details on setting up this ASP.NET application to support logging in via external services.
for details on setting up this ASP.NET application to support logging in via external services. </p>
</p> </div>
</div>
}
else
{
@foreach (var description in Model.ExternalProviders) {
<form action="@Constants.LoginPath" method="post">
<input type="hidden" name="Provider" value="@description.AuthenticationScheme" />
<input type="hidden" name="ReturnUrl" value="@Model.ReturnUrl" />
<button class="btn btn-lg btn-success" type="submit">Connect using @description.DisplayName</button>
@Html.AntiForgeryToken()
</form>
}
}
</div> </div>

@ -69,7 +69,7 @@
<td> <td>
@if (item.SettingsClassName!=null) { @if (item.SettingsClassName!=null) {
<text> <text>
@SR[item.SettingsClassName] @item.SettingsClassName
</text> </text>
} }
</td> </td>

@ -1,7 +1,7 @@
@model Yavsc.ViewModels.EnrolerViewModel @model Yavsc.ViewModels.EnrolerViewModel
@{  @{ 
ViewBag.Title = SR["Enroll"]+" : "+Model.RoleName; ViewBag.Title = "Enroll"+" : "+Model.RoleName;
} }
<form asp-action="Enroll"> <form asp-action="Enroll">

@ -1,7 +1,7 @@
@model Yavsc.ViewModels.FireViewModel @model Yavsc.ViewModels.FireViewModel
@{  @{ 
ViewBag.Title = SR["Fire"]+" : "+Model.RoleName; ViewBag.Title = "Fire"+" : "+Model.RoleName;
} }
<form asp-action="Fire"> <form asp-action="Fire">

@ -1,6 +1,6 @@
@model RoleUserCollection @model RoleUserCollection
@{  @{ 
ViewBag.Title = SR["Role"]+" "+Model.Name; ViewBag.Title = "Role"+" "+Model.Name;
} }
<h2>@ViewBag.Title</h2> <h2>@ViewBag.Title</h2>

@ -84,7 +84,7 @@ $('span.field-validation-valid[data-valmsg-for="Content"]').html(
@Html.DisplayFor(model => model.DateCreated) @Html.DisplayFor(model => model.DateCreated)
@Component.Invoke("Tagger",Model, null, null) @await Component.InvokeAsync("Tagger",Model)
</div> </div>
<div id="comments"> <div id="comments">
@ -112,7 +112,7 @@ $('span.field-validation-valid[data-valmsg-for="Content"]').html(
} }
</div> </div>
@if (await AuthorizationService.AuthorizeAsync(User, Model, new EditRequirement())) { @if ((await AuthorizationService.AuthorizeAsync(User, Model, new EditRequirement())).IsSuccess) {
<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-link">Edit</a> <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-link">Edit</a>
} }
<a asp-action="Index" class="btn btn-link">Back to List</a> <a asp-action="Index" class="btn btn-link">Back to List</a>

@ -1,7 +1,7 @@
@model BlogPost @model BlogPost
@{ @{
ViewData["Title"] = SR["Blog post edition"]; ViewData["Title"] = "Blog post edition";
} }
@section header { @section header {
@ -219,7 +219,7 @@
<div class="form-group"> <div class="form-group">
<label asp-for="ACL" class="col-md-2 control-label"></label> <label asp-for="ACL" class="col-md-2 control-label"></label>
<div class="col-md-10"> <div class="col-md-10">
@Component.Invoke("CirclesControl", Model, null, null) @await Component.InvokeAsync("CirclesControl", Model)
</div> </div>
</div> </div>

@ -41,12 +41,12 @@
</td> </td>
<td> <td>
<ul class="actiongroup"> <ul class="actiongroup">
@if (await AuthorizationService.AuthorizeAsync(User, item, new ViewRequirement())) { @if ((await AuthorizationService.AuthorizeAsync(User, item, new ViewRequirement())).IsSuccess) {
<li> <li>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-lg">Details</a> <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-lg">Details</a>
</li> </li>
} }
@if (await AuthorizationService.AuthorizeAsync(User, item, new EditRequirement())) { @if ((await AuthorizationService.AuthorizeAsync(User, item, new EditRequirement())).IsSuccess) {
<li><a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-default">Edit</a> <li><a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-default">Edit</a>
</li> </li>
<li><a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a> <li><a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>

@ -17,13 +17,13 @@
@Html.DisplayNameFor(model => model.Content) @Html.DisplayNameFor(model => model.Content)
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.Modified) @Html.DisplayNameFor(model => model.DateModified)
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.Photo) @Html.DisplayNameFor(model => model.Photo)
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.Posted) @Html.DisplayNameFor(model => model.UserModified)
</th> </th>
<th> <th>
@Html.DisplayNameFor(model => model.Rate) @Html.DisplayNameFor(model => model.Rate)
@ -49,13 +49,13 @@
<table> <table>
<tr> <tr>
<td> <td>
@Html.DisplayFor(modelItem => item.Modified) @Html.DisplayFor(modelItem => item.DateModified)
</td> </td>
<td> <td>
@Html.DisplayFor(modelItem => item.Photo) @Html.DisplayFor(modelItem => item.Photo)
</td> </td>
<td> <td>
@Html.DisplayFor(modelItem => item.Posted) @Html.DisplayFor(modelItem => item.UserModified)
</td> </td>
<td> <td>
@Html.DisplayFor(modelItem => item.Rate) @Html.DisplayFor(modelItem => item.Rate)

@ -17,12 +17,6 @@
<dd> <dd>
@Html.DisplayFor(model => model.CarePrice) @Html.DisplayFor(model => model.CarePrice)
</dd> </dd>
<dt>
@Html.DisplayNameFor(model => model.EndOfTheDay)
</dt>
<dd>
@Html.DisplayFor(model => model.EndOfTheDay)
</dd>
<dt> <dt>
@Html.DisplayNameFor(model => model.HalfBalayagePrice) @Html.DisplayNameFor(model => model.HalfBalayagePrice)
</dt> </dt>
@ -167,12 +161,6 @@
<dd> <dd>
@Html.DisplayFor(model => model.ShortPermanentPrice) @Html.DisplayFor(model => model.ShortPermanentPrice)
</dd> </dd>
<dt>
@Html.DisplayNameFor(model => model.StartOfTheDay)
</dt>
<dd>
@Html.DisplayFor(model => model.StartOfTheDay)
</dd>
<dt> <dt>
@Html.DisplayNameFor(model => model.WomenHalfCutPrice) @Html.DisplayNameFor(model => model.WomenHalfCutPrice)
</dt> </dt>

@ -13,16 +13,16 @@
<table class="table"> <table class="table">
<tr> <tr>
<td> <td>
@SR[Html.DisplayNameFor(model => model.Id)] @Html.DisplayNameFor(model => model.Id)
</td> </td>
<td> <td>
@SR[Html.DisplayNameFor(model => model.Title)] @Html.DisplayNameFor(model => model.Title)
</td> </td>
<th> <th>
@SR[Html.DisplayNameFor(model => model.FeatureId)] @Html.DisplayNameFor(model => model.FeatureId)
</th> </th>
<th> <th>
@SR[Html.DisplayNameFor(model => model.Status)] @Html.DisplayNameFor(model => model.Status)
</th> </th>
<th></th> <th></th>
</tr> </tr>
@ -40,7 +40,7 @@
</td> </td>
<td> <td>
@SR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status]] @typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status]
</td> </td>
<td> <td>
<a asp-action="Edit" asp-route-id="@item.Id">Edit</a> | <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |

@ -26,7 +26,7 @@
Status"] Status"]
</dt> </dt>
<dd> <dd>
@SR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)Model.Status]] @typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)Model.Status]
</dd> </dd>
</dl> </dl>

@ -13,16 +13,16 @@
<table class="table"> <table class="table">
<tr> <tr>
<td> <td>
@SR[Html.DisplayNameFor(model => model.Id)] @Html.DisplayNameFor(model => model.Id)
</td> </td>
<td> <td>
@SR[Html.DisplayNameFor(model => model.Title)] @Html.DisplayNameFor(model => model.Title)
</td> </td>
<th> <th>
@SR[Html.DisplayNameFor(model => model.FeatureId)] @Html.DisplayNameFor(model => model.FeatureId)
</th> </th>
<th> <th>
@SR[Html.DisplayNameFor(model => model.Status)] @Html.DisplayNameFor(model => model.Status)
</th> </th>
<th></th> <th></th>
</tr> </tr>
@ -40,7 +40,7 @@
</td> </td>
<td> <td>
@SR[typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status]] @typeof(Yavsc.Models.IT.Fixing.BugStatus).GetEnumNames()[(int)item.Status]
</td> </td>
<td> <td>
<a asp-action="Edit" asp-route-id="@item.Id">Edit</a> | <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |

@ -12,6 +12,6 @@
@Html.DisplayFor(m=>Model.Member) @Html.DisplayFor(m=>Model.Member)
</div> </div>
<p> <p>
@Html.ActionLink(SR["Delete"], "Delete", new { id = Model.CircleId }) | @Html.ActionLink("Delete", "Delete", new { id = Model.CircleId }) |
<a asp-action="Index">Back to List</a> <a asp-action="Index">Back to List</a>
</p> </p>

@ -1,6 +1,5 @@
@{ ViewData["Title"] = "Proposition de rendez-vous "+ @{ ViewData["Title"] = "Proposition de rendez-vous ["+ViewBag.Activity.Code+"]"; }
to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
<script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script> <script src="https://maps.googleapis.com/maps/api/js?key=@ViewBag.GoogleSettings.BrowserApiKey"></script>
<script type="text/javascript" src="~/lib/moment/moment-with-locales.min.js"></script> <script type="text/javascript" src="~/lib/moment/moment-with-locales.min.js"></script>
@ -144,8 +143,7 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
}); });
}); });
</script> </script>
<span asp-validation-for="EventDate" class="text-danger"> <span asp-validation-for="EventDate" class="text-danger" ></span>
</span>
</div> </div>
</div> </div>
</div> </div>
@ -157,8 +155,8 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
<div class="row"> <div class="row">
<div class='col-sm-6'> <div class='col-sm-6'>
<div > <div >
<input asp-for="Location.Address" type="text" name="Location.Address" id="Location_Address" class="form-control" data-val-required=@SR[ <input asp-for="Location.Address" type="text" name="Location.Address" id="Location_Address"
"SpecifyPlace"] data-val-remote= "GoogleDidntGeoLocalized"> class="form-control" data-val-required="SpecifyPlace" data-val-remote= "GoogleDidntGeoLocalized">
<span asp-validation-for="Location.Address" class="text-danger" id="valloc"></span> <span asp-validation-for="Location.Address" class="text-danger" id="valloc"></span>
<ul id="loccomb"> <ul id="loccomb">
</ul> </ul>
@ -181,8 +179,8 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
<div id='reason1'> <div id='reason1'>
<textarea rows="15" asp-for="Reason" type="text" name="Reason" id="Reason" maxlength="4096" class="form-control"></textarea> <textarea rows="15" asp-for="Reason" type="text" name="Reason" id="Reason" maxlength="4096" class="form-control"></textarea>
<span asp-validation-for="Reason" class="text-danger"></span> <span asp-validation-for="Reason" class="text-danger"></span>
@Html.HiddenFor(model=>model.Location.Latitude) @Html.HiddenFor("Latitude")
@Html.HiddenFor(model=>model.Location.Longitude) @Html.HiddenFor("Longitude")
</div> </div>
</div> </div>
</div> </div>
@ -196,8 +194,8 @@ to"]+" " ["+SR[ViewBag.Activity.Code]+"]"; }
</div> </div>
</div> </div>
@Html.HiddenFor("ClientId") @Html.HiddenFor("ClientId")
@Html.HiddenFor(model=>model.PerformerId) @Html.HiddenFor("PerformerId")
@Html.HiddenFor(model=>model.ActivityCode) @Html.HiddenFor("ActivityCode")
</div> </div>

@ -1,7 +1,7 @@
@model RdvQuery @model RdvQuery
@using Yavsc.Models.Google.Messaging @using Yavsc.Models.Google.Messaging
@{ @{
ViewData["Title"] = SR["Command confirmation"]+" "+ViewBag.Activity.Name; ViewData["Title"] = "Command confirmation"+" "+ViewBag.Activity.Name;
} }
<h2>@ViewData["Title"]</h2> <h2>@ViewData["Title"]</h2>
<div class="form-horizontal"> <div class="form-horizontal">
@ -29,7 +29,7 @@
@if (ViewBag.EmailSent!=null) @if (ViewBag.EmailSent!=null)
{ {
if (ViewBag.EmailSent.Sent) { if (ViewBag.EmailSent.Sent) {
<h4>@String.Format(SR["EmailSentToPerformer"],User.GetUserName())</h4> <h4>@String.Format("EmailSentToPerformer",User.GetUserName())</h4>
} else { } else {
var sent = ViewBag.EmailSent; var sent = ViewBag.EmailSent;

@ -1,23 +1,9 @@
@model Instrumentation @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 });
} <h2>@Model.Intrument.Name</h2>
<ul>
@foreach (var instrument in Model)
{
<li>@instrument.Name
<a asp-action="RemoveInstrument" asp-controller="Instrumentation" asp-action-id="Model.UserId" asp-action-name="@instrument.Name" />
</li> <a asp-action="RemoveInstrument" asp-controller="Instrumentation" asp-action-id="Model.UserId" asp-action-name="@Model.Intrument.Name" >
<form asp-action="AddInstrument" asp-controller="Instrumentation" asp-action-id="Model.UserId" >
} <select name="Name" value="" placeholder="Séléctionnez votre instrument" ></select>
</ul> </form>
<form asp-action="AddInstrument" asp-controller="Instrumentation" asp-action-id="Model.UserId" >
<select name="Name" value="" placeholder="Séléctionnez votre instrument" asp-items=@ViewBag.YetAvailableInstruments>
</select>
</form>

@ -1,7 +1,7 @@
@model IEnumerable<Estimate> @model IEnumerable<Estimate>
@{ @{
ViewData["Title"] = SR["My estimates"]; ViewData["Title"] = "My estimates";
} }
<h2>Index</h2> <h2>Index</h2>

@ -1,7 +1,7 @@
@model IEnumerable<PerformerProfileViewModel> @model IEnumerable<PerformerProfileViewModel>
@{ @{
ViewData["Title"] = (ViewBag.Activity?.Name ?? SR["Any"]) ; ViewData["Title"] = (ViewBag.Activity?.Name ?? "Any") ;
} }
<h1>@ViewData["Title"]</h1> <h1>@ViewData["Title"]</h1>
<em>@ViewBag.Activity.Description</em> <em>@ViewBag.Activity.Description</em>

@ -1,6 +1,6 @@
@model HairCutQuery @model HairCutQuery
@{ @{
ViewData["Title"] = SR["Command confirmation"]+" "+ViewBag.Activity.Name; ViewData["Title"] = "Command confirmation"+" "+ViewBag.Activity.Name;
} }
@section header { @section header {
<script src="https://www.paypalobjects.com/api/checkout.js"></script> <script src="https://www.paypalobjects.com/api/checkout.js"></script>
@ -83,11 +83,11 @@
<dt>La facture <dt>La facture
</dt> </dt>
<dd>@await Component.InvokeAsync("Bill", "Brush", Model, OutputFormat.Html, false ) <dd>@await Component.InvokeAsync("Bill", Model)
</dd> </dd>
<dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt> <dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt>
<dd> @Component.Invoke("PayPalButton", Model, "haircut", "HairCutCommand" ) <dd> @await Component.InvokeAsync("PayPalButton", Model)
</dd> </dd>
</dl> </dl>

@ -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";
} }
<h2>@ViewData["Title"]</h2> <h2>@ViewData["Title"]</h2>

@ -1,5 +1,5 @@
@{ @{
ViewData["Title"] = About+" "+@SiteSettings.Value.Title; ViewData["Title"] = "About "+ SiteSettings.Title;
} }
<h1>@ViewData["Title"]</h1> <h1>@ViewData["Title"]</h1>
<environment names="Development"> <environment names="Development">

@ -37,6 +37,6 @@
</dl> </dl>
</div> </div>
<p> <p>
@Html.ActionLink(SR["Edit"], "Edit", new { /* id = Model.PrimaryKey */ }) | @Html.ActionLink("Edit", "Edit", new { /* id = Model.PrimaryKey */ }) |
<a asp-action="Index">Back to List</a> <a asp-action="Index">Back to List</a>
</p> </p>

@ -41,9 +41,9 @@
@Html.DisplayFor(modelItem => item.Rel) @Html.DisplayFor(modelItem => item.Rel)
</td> </td>
<td> <td>
@Html.ActionLink(SR["Edit"], "Edit", new { hRef=item.HRef, method = item.Method }) | @Html.ActionLink("Edit", "Edit", new { hRef=item.HRef, method = item.Method }) |
@Html.ActionLink(SR["Details"], "Details", new { hRef=item.HRef, method = item.Method }) | @Html.ActionLink("Details", "Details", new { hRef=item.HRef, method = item.Method }) |
@Html.ActionLink(SR["Delete"], "Delete", new { hRef=item.HRef, method = item.Method }) @Html.ActionLink("Delete", "Delete", new { hRef=item.HRef, method = item.Method })
</td> </td>
</tr> </tr>
} }

@ -2,8 +2,8 @@
@model Instrumentation @model Instrumentation
@{ @{
ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation";
ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Set"] + "]" ; ViewData["Title"] = ViewBag.SettingLabel + "[" +"Set" + "]" ;
} }
<h2>@ViewData["Title"]</h2> <h2>@ViewData["Title"]</h2>
@ -17,7 +17,7 @@
<input asp-for="UserId" type="hidden"> <input asp-for="UserId" type="hidden">
<div class="form-group"> <div class="form-group">
<div class="col-md-10"> <div class="col-md-10">
@System.Globalization.CultureInfo.CurrentUICulture.TextInfo.ToTitleCase(SR["nouvel instrument"]) @System.Globalization.CultureInfo.CurrentUICulture.TextInfo.ToTitleCase("nouvel instrument")
<select asp-for="InstrumentId" asp-items=@ViewBag.YetAvailableInstruments> <select asp-for="InstrumentId" asp-items=@ViewBag.YetAvailableInstruments>
</select> </select>

@ -2,8 +2,8 @@
@{ @{
ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation";
ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Delete"] + "]" ; ViewData["Title"] = ViewBag.SettingLabel + "[" +"Delete" + "]" ;
} }
<h2>Delete</h2> <h2>Delete</h2>

@ -2,8 +2,8 @@
@{ @{
ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation";
ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Details"] + "]" ; ViewData["Title"] = ViewBag.SettingLabel + "[" +"Details" + "]" ;
} }
@{ @{
bool existingInstrument = Model. bool existingInstrument = Model.

@ -1,8 +1,8 @@
@model Instrumentation @model Instrumentation
@{ @{
ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation";
ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Edit"] + "]" ; ViewData["Title"] = ViewBag.SettingLabel + "[" +"Edit" + "]" ;
} }
<h2>Edit</h2> <h2>Edit</h2>

@ -2,8 +2,8 @@
@{ @{
ViewBag.SettingLabel = SR["Yavsc.Models.Musical.Profiles.Instrumentation"]; ViewBag.SettingLabel = "Yavsc.Models.Musical.Profiles.Instrumentation";
ViewData["Title"] = SR[ViewBag.SettingLabel] + "[" +SR["Index"] + "]" ; ViewData["Title"] = ViewBag.SettingLabel + "[" +"Index" + "]" ;
} }
<h2>Index</h2> <h2>Index</h2>

@ -1,6 +1,6 @@
@model Yavsc.Models.Bank.BankIdentity @model Yavsc.Models.Bank.BankIdentity
@{ @{
ViewData["Title"] = SR["Fill in your Bank Info"]; ViewData["Title"] = "Fill in your Bank Info";
} }
<h2>@ViewData["Title"].</h2> <h2>@ViewData["Title"].</h2>

@ -1,5 +1,5 @@
@model PerformerProfile @model PerformerProfile
@{ ViewData["Title"] = SR["Your performer profile"]; } @{ ViewData["Title"] = "Your performer profile"; }
@section header { @section header {
<style> <style>
#map { #map {

@ -1,5 +1,5 @@
@model PerformerProfile @model PerformerProfile
@{ ViewData["Title"] = SR["Edit your avatar"]; } @{ ViewData["Title"] = "Edit your avatar"; }
@section header{ @section header{
<link href="~/css/main/dropzone.css" rel="stylesheet"> <link href="~/css/main/dropzone.css" rel="stylesheet">
} }

@ -1,6 +1,6 @@
@model SetFullNameViewModel @model SetFullNameViewModel
@{ ViewData["Title"] = SR["Your full name"]; } @{ ViewData["Title"] = "Your full name"; }
<h2>@ViewData["Title"]</h2> <h2>@ViewData["Title"]</h2>

@ -22,11 +22,11 @@
</dd> </dd>
<dt>La facture <dt>La facture
</dt> </dt>
<dd>@await Component.InvokeAsync("Bill", "Brush", Model, OutputFormat.Html, true) <dd>@await Component.InvokeAsync("Bill", Model)
</dd> </dd>
<dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt> <dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt>
<dd> <dd>
@Component.Invoke("PayPalButton", Model, "haircut", "HairCutCommand" ) @await Component.InvokeAsync("PayPalButton", Model)
</dd> </dd>
</dl> </dl>

@ -9,7 +9,7 @@
<dt> <dt>
@Html.DisplayNameFor(model => model.Gender) @Html.DisplayNameFor(model => model.Gender)
</dt> </dt>
<dd>@SR[Model.Gender.ToString()]</dd> <dd>@Model.Gender.ToString()</dd>
@if ((int)Model.Gender<1) { @if ((int)Model.Gender<1) {
<dt> <dt>
@Html.DisplayNameFor(model => model.Length) @Html.DisplayNameFor(model => model.Length)
@ -33,7 +33,7 @@
@Html.DisplayNameFor(model => model.Tech) @Html.DisplayNameFor(model => model.Tech)
</dt> </dt>
<dd> <dd>
@SR[Model.Tech.ToString()] @Model.Tech.ToString()
</dd> </dd>
<dt> <dt>
@Html.DisplayNameFor(model => model.Dressing) @Html.DisplayNameFor(model => model.Dressing)

@ -3,7 +3,7 @@
@using Yavsc.ViewModels.Account @using Yavsc.ViewModels.Account
@model SignInViewModel @model SignInViewModel
@{ @{
ViewData["Title"] = SR["Log in"]; ViewData["Title"] = "Log in";
} }
<div class="jumbotron"> <div class="jumbotron">

@ -21,6 +21,11 @@
@using Yavsc.ViewModels.Calendar; @using Yavsc.ViewModels.Calendar;
@using Yavsc.ViewModels.Relationship; @using Yavsc.ViewModels.Relationship;
@using Yavsc.ViewModels.Workflow; @using Yavsc.ViewModels.Workflow;
@using Yavsc.ViewModels.Auth;
@using Microsoft.AspNetCore.Authorization;;
@using Microsoft.AspNetCore.Mvc;
@using Microsoft.AspNetCore.Html;
@using Yavsc.Helpers;
@using PayPal.PayPalAPIInterfaceService.Model; @using PayPal.PayPalAPIInterfaceService.Model;

Loading…