This commit is contained in:
Paul Schneider 2017-10-10 20:50:05 +02:00
commit 8a0539be4d
39 changed files with 28108 additions and 155 deletions

View file

@ -0,0 +1,55 @@
@model Yavsc.Models.Messaging.Announce
@{
ViewData["Title"] = "Create";
}
<h2>Create</h2>
<form asp-action="Create">
<div class="form-horizontal">
<h4>Announce</h4>
<hr />
<div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
<div class="form-group">
<label asp-for="For" class="col-md-2 control-label"></label>
<div class="col-md-10">
<select asp-for="For" class="form-control" asp-items="@ViewBag.For"></select>
<span asp-validation-for="For" class="text-danger" />
</div>
</div>
<div class="form-group">
<label asp-for="Message" class="col-md-2 control-label"></label>
<div class="col-md-10">
<input asp-for="Message" class="form-control" />
<span asp-validation-for="Message" class="text-danger" />
</div>
</div>
<div class="form-group">
<label asp-for="Sender" class="col-md-2 control-label"></label>
<div class="col-md-10">
<input asp-for="Sender" class="form-control" />
<span asp-validation-for="Sender" class="text-danger" />
</div>
</div>
<div class="form-group">
<label asp-for="Topic" class="col-md-2 control-label"></label>
<div class="col-md-10">
<input asp-for="Topic" class="form-control" />
<span asp-validation-for="Topic" class="text-danger" />
</div>
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<input type="submit" value="Create" class="btn btn-default" />
</div>
</div>
</div>
</form>
<div>
<a asp-action="Index">Back to List</a>
</div>

View file

@ -0,0 +1,46 @@
@model Yavsc.Models.Messaging.Announce
@{
ViewData["Title"] = "Delete";
}
<h2>Delete</h2>
<h3>Are you sure you want to delete this?</h3>
<div>
<h4>Announce</h4>
<hr />
<dl class="dl-horizontal">
<dt>
@Html.DisplayNameFor(model => model.For)
</dt>
<dd>
@Html.DisplayFor(model => model.For)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Message)
</dt>
<dd>
@Html.DisplayFor(model => model.Message)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Sender)
</dt>
<dd>
@Html.DisplayFor(model => model.Sender)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Topic)
</dt>
<dd>
@Html.DisplayFor(model => model.Topic)
</dd>
</dl>
<form asp-action="Delete">
<div class="form-actions no-color">
<input type="submit" value="Delete" class="btn btn-default" /> |
<a asp-action="Index">Back to List</a>
</div>
</form>
</div>

View file

@ -0,0 +1,42 @@
@model Yavsc.Models.Messaging.Announce
@{
ViewData["Title"] = "Details";
}
<h2>Details</h2>
<div>
<h4>Announce</h4>
<hr />
<dl class="dl-horizontal">
<dt>
@Html.DisplayNameFor(model => model.For)
</dt>
<dd>
@Html.DisplayFor(model => model.For)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Message)
</dt>
<dd>
@Html.DisplayFor(model => model.Message)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Sender)
</dt>
<dd>
@Html.DisplayFor(model => model.Sender)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Topic)
</dt>
<dd>
@Html.DisplayFor(model => model.Topic)
</dd>
</dl>
</div>
<p>
<a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
<a asp-action="Index">Back to List</a>
</p>

View file

@ -0,0 +1,54 @@
@model Yavsc.Models.Messaging.Announce
@{
ViewData["Title"] = "Edit";
}
<h2>Edit</h2>
<form asp-action="Edit">
<div class="form-horizontal">
<h4>Announce</h4>
<hr />
<div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
<input type="hidden" asp-for="Id" />
<div class="form-group">
<label asp-for="For" class="col-md-2 control-label"></label>
<div class="col-md-10">
<select asp-for="For" class="form-control"></select>
<span asp-validation-for="For" class="text-danger" />
</div>
</div>
<div class="form-group">
<label asp-for="Message" class="col-md-2 control-label"></label>
<div class="col-md-10">
<input asp-for="Message" class="form-control" />
<span asp-validation-for="Message" class="text-danger" />
</div>
</div>
<div class="form-group">
<label asp-for="Sender" class="col-md-2 control-label"></label>
<div class="col-md-10">
<input asp-for="Sender" class="form-control" />
<span asp-validation-for="Sender" class="text-danger" />
</div>
</div>
<div class="form-group">
<label asp-for="Topic" class="col-md-2 control-label"></label>
<div class="col-md-10">
<input asp-for="Topic" class="form-control" />
<span asp-validation-for="Topic" class="text-danger" />
</div>
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<input type="submit" value="Save" class="btn btn-default" />
</div>
</div>
</div>
</form>
<div>
<a asp-action="Index">Back to List</a>
</div>

View file

@ -0,0 +1,50 @@
@model IEnumerable<Yavsc.Models.Messaging.Announce>
@{
ViewData["Title"] = "Index";
}
<h2>Index</h2>
<p>
<a asp-action="Create">Create New</a>
</p>
<table class="table">
<tr>
<th>
@Html.DisplayNameFor(model => model.For)
</th>
<th>
@Html.DisplayNameFor(model => model.Message)
</th>
<th>
@Html.DisplayNameFor(model => model.Sender)
</th>
<th>
@Html.DisplayNameFor(model => model.Topic)
</th>
<th></th>
</tr>
@foreach (var item in Model) {
<tr>
<td>
@Html.DisplayFor(modelItem => item.For)
</td>
<td>
@Html.DisplayFor(modelItem => item.Message)
</td>
<td>
@Html.DisplayFor(modelItem => item.Sender)
</td>
<td>
@Html.DisplayFor(modelItem => item.Topic)
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
<a asp-action="Details" asp-route-id="@item.Id">Details</a> |
<a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
</td>
</tr>
}
</table>

View file

@ -1,84 +0,0 @@
@model BlogPost
@{
ViewData["Title"]=Model.Title;
}
<!--
@section scripts {
<script src="~/js/comment.js" asp-append-version="true"></script>
<script>
$(document).ready() {
var doComment = new function(ctrlr, receiverid, comment) {
console.log('commentting:' + comment);
$.post(ctrlr, { Content: comment, Receiver: @Model.Id })
};
}
</script>
}
-->
<div class="container">
<h1 class="blogtitle" ismarkdown>@Model.Title</h1>
<img class="blogphoto" alt="" src="@Model.Photo" >
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="blogpost">
<div markdown="@Model.Content" class="blog"></div>
<hr/>
<div class="meta">
@Html.DisplayFor(model => model.Author)
@Html.DisplayNameFor(model => model.DateModified) :
@Html.DisplayFor(model => model.DateModified)
@Html.DisplayNameFor(model => model.DateCreated) :
@Html.DisplayFor(model => model.DateCreated)
@Component.Invoke("Tagger",Model)
</div>
</div>
<div class="comments">
<!-- @foreach (var comment in model=>model.Comments) {
<div markdown="@Model.Content" class="blogcomment">
</div>
<div markdown="@Model.Content" class="commentauthor">
@Html.Display("ApplicationUser",c.Author)
</div>
}
<form>
<div class="form-horizontal">
<div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>
<div class="input-group" >
<input asp-for="Content" class="form-control" placeholder="@SR["DoCommentPlaceHolder"]"/>
<span class="input-group-btn">
<input type="button" value="@SR["DoComment"]" class="btn btn-secondary"
onclick="doComment('@ViewData["apictlr"]',@Model.PostId,$('#Content').val())"
/>
</span>
</div>
</div>
<span asp-validation-for="Content" class="text-danger" >
</span>
<input type="hidden" name="PostId" value="@Model.PostId"/>
<input type="hidden" name="Id" value="@Model.Id"/>
</form>
</div>
-->
</div>
@if (await AuthorizationService.AuthorizeAsync(User, Model, new EditRequirement())) {
<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-link">@SR["Edit"]</a>
}
<a asp-action="Index" class="btn btn-link">@SR["Back to List"]</a>

View file

@ -4,10 +4,11 @@
}
@section header {
<script>
$.psc.blogcomment.prototype.options.lang = '@System.Globalization.CultureInfo.CurrentUICulture.Name';
$.psc.blogcomment.prototype.options.apictrlr = '@ViewData["apicmtctlr"]';
$(document).ready(function() {
$('#cmtBtn').click(function() {
var receiverid = $(this).data('receiverid');
var comment = $('#Comment').val();
var data = {
Id:0,
@ -16,8 +17,6 @@
UserCreated: '@User.GetUserId()',
Visible:true
};
console.log('sending:');
console.log(data);
$.ajax({
async: true,
@ -29,7 +28,6 @@
error: function(xhr,data) {
if (xhr.status=400)
{
console.log(xhr.responseJSON);
$('span.field-validation-valid[data-valmsg-for="Content"]').html(
xhr.responseJSON.Content);
} else {
@ -40,15 +38,25 @@ $('span.field-validation-valid[data-valmsg-for="Content"]').html(
}
},
success: function () {
$('#Comment').val("");
success: function (data) {
var comment = $('#Comment').val();
$('#Comment').val('');
$('span.field-validation-valid[data-valmsg-for="Content"]').empty();
var htmlcmt = htmlize(comment);
var nnode = '<div data-type="blogcomment" data-id="'+data.Id+'" data-allow-edit="True" data-allow-moderate="@ViewData["moderatoFlag"]" data-date="'+data.DateCreated+'" data-username="@User.GetUserName()">'+htmlcmt+'</div>';
$('#comments').append($(nnode).blogcomment())
},
url:'@ViewData["apicmtctlr"]'
});
});
})
</script>
<style>
.avatar, .commentmeta, .blogcomment p , .blogcomment {
display: inline-block;
}
</style>
}
<div class="container">
<h1 class="blogtitle" ismarkdown>@Model.Title</h1>
@ -71,21 +79,15 @@ $('span.field-validation-valid[data-valmsg-for="Content"]').html(
@Component.Invoke("Tagger",Model)
</div>
@if (Model.Comments.Count>0) {
<div class="comments">
@foreach (Comment comment in Model.Comments) {
<div class="blogcomment" >
<div class="commentmeta" style="display: inline-block">
@Html.DisplayFor(c=>c.Author,"ApplicationUserLink","cmtauth",comment)
<div><i>@Html.DisplayFor(c=>c.DateCreated,null,"dteCmt",comment)</i></div>
</div>
<div markdown="@comment.Content" style="display: inline-block;">
</div>
</div>
}
<form>
<div id="comments">
@if (Model.Comments.Count>0) { foreach (Comment comment in Model.Comments) {
<div data-type="blogcomment" data-id="@comment.Id" data-allow-edit="@(User.GetUserId()==comment.UserCreated?"true":"false")" data-allow-moderate="@ViewData["moderatoFlag"]"
data-date="@Html.Raw(comment.DateCreated)" data-username="@comment.Author.UserName" markdown="@comment.Content"
>
</div>
} }
</div>
<div class="form-horizontal">
<div class="input-group" >
<input id="Comment" class="form-control" placeholder="@SR["DoCommentPlaceHolder"]"/>
@ -95,12 +97,8 @@ $('span.field-validation-valid[data-valmsg-for="Content"]').html(
/>
</span>
</div>
<span asp-validation-for="Content" class="text-danger" >
</span>
<span asp-validation-for="Content" class="text-danger" ></span>
</div>
</form>
</div>
}
</div>
@if (await AuthorizationService.AuthorizeAsync(User, Model, new EditRequirement())) {
<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-link">@SR["Edit"]</a>

View file

@ -34,9 +34,7 @@
</style>
<script src="~/js/dropzone.js"></script>
<script src="~/js/quill.js"></script>
<script src="~/js/showdown.js"></script>
<script src="~/js/to-markdown.js"></script>
<script src="~/js/md-helpers.js"></script>
<script>
$(document).ready(function() {
$(".mdcoding").addClass('hidden');

View file

@ -10,6 +10,10 @@
.collapsed {
height: 1em;
}
.sametitlegrip {
text-decoration: underline;
cursor: pointer;
}
.sametitle {
overflow: hidden;
transition: height 1s;
@ -17,8 +21,8 @@
td {
transition: height 1s;
}
[class*="col-"] {
border: solid 1px blue;
div.row {
border-bottom: dashed black 1px;
}
</style>
}
@ -101,7 +105,8 @@
long gcount = group.Count();
@if (gcount>1) {
<div class="sametitle">
@(gcount-1) autre@(gcount>2?"s":"") au même titre:
<div class="sametitlegrip">@(gcount-1) autre@(gcount>2?"s":"") au même titre:</div>
@foreach (var item in group.Skip(1)) {
trclass = ((item.Visible)?"visiblepost":"hiddenpost");

View file

@ -7,7 +7,7 @@
<div class="panel">
<em>Salons</em>
<ul>
<li id="pubChan">Public</li>
<li id="pubChan"><button>Public</button></li>
</ul>
<em>Utilisateurs</em>
<ul id="userlist" style="list-style:none;">

View file

@ -89,8 +89,13 @@
}
@section ctxmenu {
@if ((bool)ViewData["HasHaircutCommand"]) {
@if (ViewData["Announces"]!=null) {
<li><a asp-controller="HairCutCommand" class="badge" >
<img src="~/images/shoppingcart.svg" alt="basket" /></a></li>
<img src="@SiteSettings.Value.Icon" alt="basket" title="Annonces @SiteSettings.Value.Title" /></a></li>
}
@if ((int)ViewData["HaircutCommandCount"]>0) {
<li><a asp-controller="HairCutCommand" class="badge" >
<img src="~/images/shoppingcart.svg" alt="basket" title="Vos commandes en coiffure à domicile" />(@ViewData["HaircutCommandCount"])</a></li>
}
}

View file

@ -1,5 +1,5 @@
@model ShortUserInfo
<div style="display: inline-block;">
<img src="@Model.Avatar" alt="@Model.UserName" class="smalltofhol" />
<div >@Model.UserName</div>
@Model.UserName
</div>

View file

@ -6,32 +6,38 @@
<link rel="icon" href="~/favicon.ico" asp-append-version="true" />
<title>@ViewData["Title"] - @SiteSettings.Value.Title</title>
<environment names="Development">
<script src="~/js/jquery-2.2.4.js" ></script>
<script src="~/js/showdown.js"></script>
<script src="~/js/md-helpers.js"></script>
<link rel="stylesheet" href="~/css/main/bootstrap.css" asp-append-version="true"/>
<link rel="stylesheet" href="~/css/main/site.css" asp-append-version="true"/>
<link rel="stylesheet" href="~/css/main/jquery-ui.css" asp-append-version="true"/>
<link rel="alternate stylesheet" title="Dark" href="~/css/dark/site.css" asp-append-version="true" />
<link rel="alternate stylesheet" title="Clear" href="~/css/clear/site.css" asp-append-version="true" />
<script src="~/js/jquery.js" asp-append-version="true"></script>
<script src="~/js/jquery-ui.js" asp-append-version="true"></script>
<script src="~/js/bootstrap.js" asp-append-version="true"></script>
<script src="~/js/jquery.signalR-2.2.1.js" asp-append-version="true"></script>
<script src="~/js/comment.js" asp-append-version="true"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
</environment>
<environment names="yavsc,yavscpre,zicmoove,lua,coiffure">
<script src="~/js/jquery-2.2.4.min.js" ></script>
<script src="~/js/showdown.min.js"></script>
<script src="~/js/md-helpers.min.js"></script>
<link rel="stylesheet" href="~/css/main/bootstrap.min.css" asp-append-version="true"/>
<link rel="stylesheet" href="~/css/main/site.min.css" asp-append-version="true"/>
<link rel="stylesheet" href="~/css/main/jquery-ui.min.css" asp-append-version="true"/>
<link rel="alternate stylesheet" title="Dark" href="~/css/dark/site.min.css" asp-append-version="true" />
<link rel="alternate stylesheet" title="Clear" href="~/css/clear/site.min.css" asp-append-version="true" />
<script src="~/js/jquery.min.js">
</script>
<script src="~/js/bootstrap.min.js">
</script>
<script src="~/js/bootstrap.min.js"></script>
<script src="~/js/jquery-ui.min.js" asp-append-version="true"></script>
<script src="~/js/jquery.signalR-2.2.1.min.js" asp-append-version="true"></script>
<script src="~/js/comment.min.js" asp-append-version="true"></script>
<script src="~/js/site.min.js" asp-append-version="true"></script>
</environment>