cleanings & circle links
This commit is contained in:
@ -9,7 +9,6 @@ using System.Net.Mime;
|
|||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
using Microsoft.AspNet.Http;
|
using Microsoft.AspNet.Http;
|
||||||
using Yavsc.ApiControllers;
|
|
||||||
using Yavsc.Models;
|
using Yavsc.Models;
|
||||||
using Yavsc.Models.FileSystem;
|
using Yavsc.Models.FileSystem;
|
||||||
using Yavsc.ViewModels;
|
using Yavsc.ViewModels;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using Microsoft.Data.Entity;
|
using Microsoft.Data.Entity;
|
||||||
using Microsoft.Data.Entity.Infrastructure;
|
using Microsoft.Data.Entity.Infrastructure;
|
||||||
using Microsoft.Data.Entity.Metadata;
|
|
||||||
using Microsoft.Data.Entity.Migrations;
|
using Microsoft.Data.Entity.Migrations;
|
||||||
using Yavsc.Models;
|
using Yavsc.Models;
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using Microsoft.Data.Entity;
|
using Microsoft.Data.Entity;
|
||||||
using Microsoft.Data.Entity.Infrastructure;
|
using Microsoft.Data.Entity.Infrastructure;
|
||||||
using Microsoft.Data.Entity.Metadata;
|
|
||||||
using Microsoft.Data.Entity.Migrations;
|
using Microsoft.Data.Entity.Migrations;
|
||||||
using Yavsc.Models;
|
using Yavsc.Models;
|
||||||
|
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Microsoft.Data.Entity.Migrations;
|
using Microsoft.Data.Entity.Migrations;
|
||||||
|
|
||||||
namespace Yavsc.Migrations
|
namespace Yavsc.Migrations
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using Microsoft.Data.Entity;
|
using Microsoft.Data.Entity;
|
||||||
using Microsoft.Data.Entity.Infrastructure;
|
using Microsoft.Data.Entity.Infrastructure;
|
||||||
using Microsoft.Data.Entity.Metadata;
|
|
||||||
using Microsoft.Data.Entity.Migrations;
|
|
||||||
using Yavsc.Models;
|
using Yavsc.Models;
|
||||||
|
|
||||||
namespace Yavsc.Migrations
|
namespace Yavsc.Migrations
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNet.Mvc;
|
using Microsoft.AspNet.Mvc;
|
||||||
using Yavsc.Helpers;
|
using Yavsc.Helpers;
|
||||||
using Yavsc.Models;
|
using Yavsc.Models;
|
||||||
@ -13,7 +12,7 @@ namespace Yavsc.ViewComponents
|
|||||||
this.dbContext = dbContext;
|
this.dbContext = dbContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<IViewComponentResult> InvokeAsync ( string userId, string imgFmt )
|
public IViewComponentResult Invoke ( string userId, string imgFmt )
|
||||||
{
|
{
|
||||||
return View ( "Default", dbContext.AvatarUri(userId, imgFmt));
|
return View ( "Default", dbContext.AvatarUri(userId, imgFmt));
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNet.Mvc;
|
using Microsoft.AspNet.Mvc;
|
||||||
using Microsoft.AspNet.Mvc.Rendering;
|
using Microsoft.AspNet.Mvc.Rendering;
|
||||||
using Yavsc.Models;
|
using Yavsc.Models;
|
||||||
@ -18,7 +17,7 @@ namespace Yavsc.ViewComponents
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<IViewComponentResult> InvokeAsync (ICircleAuthorized target)
|
public IViewComponentResult Invoke (ICircleAuthorized target)
|
||||||
{
|
{
|
||||||
var oid = target.GetOwnerId();
|
var oid = target.GetOwnerId();
|
||||||
ViewBag.ACL = dbContext.Circle.Where(
|
ViewBag.ACL = dbContext.Circle.Where(
|
||||||
|
@ -203,7 +203,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">
|
||||||
@await Component.InvokeAsync("CirclesControl",Model)
|
@Component.Invoke("CirclesControl",Model)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -49,11 +49,16 @@
|
|||||||
<dt>@SR["Avatar"]:</dt>
|
<dt>@SR["Avatar"]:</dt>
|
||||||
<dd>
|
<dd>
|
||||||
|
|
||||||
@await Component.InvokeAsync("Avatar", User.GetUserId(), ".s")
|
@Component.Invoke("Avatar", User.GetUserId(), ".s")
|
||||||
[<a asp-controller="Manage" asp-action="SetAvatar"
|
[<a asp-controller="Manage" asp-action="SetAvatar"
|
||||||
>@SR["Modify"]</a>]
|
>@SR["Modify"]</a>]
|
||||||
</dd>
|
</dd>
|
||||||
|
|
||||||
|
<dt>@SR["Vos cercles"]</dt>
|
||||||
|
<dd> (WIP) <a asp-action="Index" asp-controller="Circle">[@SR["Ajouter suprimer des cercles"]]</a>
|
||||||
|
<a asp-action="Index" asp-controller="CircleMembers">[@SR["Gérer les membres de vos cercles"]]</a>
|
||||||
|
</dd>
|
||||||
|
|
||||||
<dt>@SR["Professional settings"]:</dt>
|
<dt>@SR["Professional settings"]:</dt>
|
||||||
<dd>
|
<dd>
|
||||||
@Html.DisplayFor(model => model.HaveProfessionalSettings)
|
@Html.DisplayFor(model => model.HaveProfessionalSettings)
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<ul class="nav navbar-nav navbar-right">
|
<ul class="nav navbar-nav navbar-right">
|
||||||
<li>
|
<li>
|
||||||
<a asp-controller="Manage" class="navbar-link" asp-action="Index" title="Manage">
|
<a asp-controller="Manage" class="navbar-link" asp-action="Index" title="Manage">
|
||||||
@await Component.InvokeAsync("Avatar", User.GetUserId(), ".xs")
|
@Component.Invoke("Avatar", User.GetUserId(), ".xs")
|
||||||
@SR["Hello"] @User.GetUserName()!</a>
|
@SR["Hello"] @User.GetUserName()!</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
|
Reference in New Issue
Block a user