Merge from booking branch
This commit is contained in:
@ -34,8 +34,7 @@ $(function(){
|
||||
$("#tbc").stupidtable();
|
||||
});
|
||||
</script>
|
||||
</asp:Content>
|
||||
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
||||
|
||||
<div id="fncirc" class="hidden">
|
||||
|
||||
|
||||
|
@ -5,10 +5,31 @@
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
|
||||
<style>
|
||||
table.layout { border-width: 0; }
|
||||
table.layout TR TD { max-width:40%; }
|
||||
</style>
|
||||
|
||||
<aside>
|
||||
<%= Html.ActionLink("Changer de mot de passe","ChangePassword", "Account",null, new { @class="actionlink" })%>
|
||||
<%= Html.ActionLink("Désincription", "Unregister", "Account", new { id = ViewData["UserName"] } , new { @class="actionlink" })%>
|
||||
</aside>
|
||||
<aside>
|
||||
<% if (Roles.IsUserInRole((string)ViewData ["UserName"],"Admin")) {
|
||||
// TODO View all roles
|
||||
%>
|
||||
This user is Admin.
|
||||
<% } %>
|
||||
<code>HasBankAccount:<%= Model.HasBankAccount %></code>
|
||||
<% if (!Model.HasBankAccount) { %><span class="hint">
|
||||
IBAN+BIC ou Codes banque, guichet, compte et clé RIB</span>
|
||||
<% } %>, <code>IsBillable:<%=Model.IsBillable%></code>
|
||||
<% if (!Model.IsBillable) { %>
|
||||
<span class="hint">un nom et au choix, une adresse postale valide,
|
||||
ou un téléphone, ou un email, ou un Mobile</span> <% } %>
|
||||
</aside>
|
||||
|
||||
<%= Html.ValidationSummary() %>
|
||||
<% using(Html.BeginForm("Profile", "Account", FormMethod.Post, new { enctype = "multipart/form-data" })) %>
|
||||
<% { %>
|
||||
@ -116,25 +137,15 @@ Avatar : <img src="<%=Url.AvatarUrl(HttpContext.Current.User.Identity.Name)%>" a
|
||||
<%= Html.ValidationMessage("IBAN", "*") %>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset><legend>Interface utilisateur</legend>
|
||||
|
||||
<%= Html.LabelFor(model => model.UITheme) %> :
|
||||
<%= Html.TextBox("UITheme") %>
|
||||
<%= Html.ValidationMessage("UITheme", "*") %>
|
||||
</fieldset>
|
||||
<input type="submit"/>
|
||||
<% } %>
|
||||
<aside>
|
||||
<%= Html.ActionLink("Changer de mot de passe","ChangePassword", "Account",null, new { @class="actionlink" })%>
|
||||
<%= Html.ActionLink("Désincription", "Unregister", "Account", new { id = ViewData["UserName"] } , new { @class="actionlink" })%>
|
||||
</aside>
|
||||
<aside>
|
||||
<% if (Roles.IsUserInRole((string)ViewData ["UserName"],"Admin")) { %>
|
||||
This user is Admin.
|
||||
<% } %>
|
||||
<code>HasBankAccount:<%= Model.HasBankAccount %></code>
|
||||
<% if (!Model.HasBankAccount) { %><span class="hint">
|
||||
IBAN+BIC ou Codes banque, guichet, compte et clé RIB</span>
|
||||
<% } %>, <code>IsBillable:<%=Model.IsBillable%></code>
|
||||
<% if (!Model.IsBillable) { %>
|
||||
<span class="hint">un nom et au choix, une adresse postale valide,
|
||||
ou un téléphone, ou un email, ou un Mobile</span> <% } %>
|
||||
</aside>
|
||||
|
||||
|
||||
</asp:Content>
|
||||
|
||||
|
@ -1,11 +0,0 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
|
||||
|
||||
<%= Html.ValidationSummary() %>
|
||||
<% using(Ajax.BeginForm())
|
||||
{ %>
|
||||
Nom du rôle :
|
||||
<%= Html.TextBox( "RoleName" ) %>
|
||||
<%= Html.ValidationMessage("RoleName", "*") %><br/>
|
||||
<input class="actionlink" type="submit"/>
|
||||
<% } %>
|
||||
|
@ -9,7 +9,6 @@ Nom du rôle :
|
||||
<%= Html.ValidationMessage("RoleName", "*") %><br/>
|
||||
<input class="actionlink" type="submit"/>
|
||||
<% } %>
|
||||
<%= Html.Partial("AddMemberToRole")%>
|
||||
</asp:Content>
|
||||
|
||||
|
||||
|
@ -6,7 +6,10 @@
|
||||
<table>
|
||||
<% foreach (string u in (string[])ViewData["admins"]) { %>
|
||||
<tr><td>
|
||||
<%= u %> </td><td><%= Html.ActionLink("Remove","RemoveFromRole",new { username = u, rolename="Admin", returnUrl = Request.Url.PathAndQuery })%>
|
||||
<%= u %> </td><td>
|
||||
<%= Html.ActionLink("Remove","RemoveFromRole",
|
||||
new { username = u, rolename="Admin", returnUrl = Request.Url.PathAndQuery })%>
|
||||
|
||||
</td></tr>
|
||||
|
||||
<% } %>
|
||||
|
@ -1,4 +1,6 @@
|
||||
<%@ Page Title="Liste des rôles" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/AppAdmin.master" %>
|
||||
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
Roles:
|
||||
<ul>
|
||||
|
@ -6,8 +6,18 @@
|
||||
<ul>
|
||||
<%foreach (MembershipUser user in Model){ %>
|
||||
<li><%=user.UserName%> (created <%=user.CreationDate.ToString("D")%>) <%=user.Email%> <%=(user.IsApproved)?"":"("+LocalizedText.Not_Approuved+")"%> <%=user.IsOnline?LocalizedText.Online:LocalizedText.Offline%>
|
||||
<br>
|
||||
Roles :
|
||||
<ul>
|
||||
<%foreach (string role in Roles.GetRolesForUser(user.UserName)){ %>
|
||||
<li><%=role%></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
|
||||
|
||||
<% if (Roles.IsUserInRole("Admin")) { %>
|
||||
<%= Html.ActionLink(LocalizedText.Remove,"RemoveUser", new { username = user.UserName }, new { @class="actionlink" } ) %>
|
||||
<%= Html.ActionLink(LocalizedText.Remove,"RemoveUser", new { username = user.UserName, returnUrl = Request.Url.PathAndQuery }, new { @class="actionlink" } ) %>
|
||||
<%= Html.ActionLink("Blogger","AddUserToRole", new { username = user.UserName, rolename="Blogger", returnUrl = Request.Url.PathAndQuery }, new { @class="actionlink" } ) %>
|
||||
<% } %>
|
||||
</li><% }%>
|
||||
</ul>
|
||||
|
@ -1,11 +1,21 @@
|
||||
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head runat="server">
|
||||
<title></title>
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" Title="UsersInRoleOf" MasterPageFile="~/Models/AppAdmin.master" %>
|
||||
<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
|
||||
<% ViewState["orgtitle"] = string.Format ( LocalizedText.UsersInRole , Html.Encode(ViewData["RoleName"])); %>
|
||||
<% Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName; %>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="overHeaderOne" ID="header1" runat="server">
|
||||
<h1><a href="<%= Url.RouteUrl("Default", new { action = "UsersInRole", RoleName = ViewData["RoleName"] } )%>">
|
||||
<%=ViewState["orgtitle"]%></a>
|
||||
- <a href="<%= Url.RouteUrl("Default",new {controller="Home" }) %>"><%= YavscHelpers.SiteName %></a>
|
||||
</h1>
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<ul>
|
||||
<%foreach (string username in (string[]) ViewData["UsersInRole"]){ %>
|
||||
<li><%= username %></li>
|
||||
<% } %>
|
||||
</ul>
|
||||
|
||||
<%= Html.Partial("AddUserToRole") %>
|
||||
</asp:Content>
|
@ -1,9 +1,9 @@
|
||||
<%@ Page Title="Back office" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
||||
<ul><li>
|
||||
<%= Html.ActionLink("Catalog","Catalog","FrontOffice" ) %>
|
||||
</li></ul>
|
||||
</li>
|
||||
<li><%= Html.ActionLink(LocalizedText.Skill,"Skills","FrontOffice" ) %></li>
|
||||
</ul>
|
||||
</asp:Content>
|
||||
|
@ -1,14 +0,0 @@
|
||||
<%@ Page Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
<asp:Content ID="initContent" ContentPlaceHolderID="init" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="overHeaderOneContent" ContentPlaceHolderID="overHeaderOne" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="headerContent" ContentPlaceHolderID="header" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
kjgftkgt
|
||||
</asp:Content>
|
||||
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
||||
</asp:Content>
|
@ -12,8 +12,13 @@
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
|
||||
<aside>
|
||||
Id:<%= Html.ActionLink( Model.Id.ToString() , "UserPost", new { user= Model.Author, title=Model.Title, id = Model.Id }, new { @class = "usertitleref actionlink" }) %>
|
||||
, Posted: <%= Model.Posted.ToString("yyyy/MM/dd") %> - Modified: <%= Model.Modified.ToString("yyyy/MM/dd") %>
|
||||
Visible: <%= Model.Visible? "oui":"non" %> <%= Html.ActionLink("Supprimer","RemovePost", new { user=Model.Author, title = Model.Title, id = Model.Id }, new { @class="actionlink" } ) %>
|
||||
</aside>
|
||||
|
||||
<% using(Html.BeginForm("ValidateEdit","Blogs")) { %>
|
||||
<% using(Html.BeginForm("Edit","Blogs")) { %>
|
||||
<fieldset>
|
||||
<legend>Contrôle d'accès au Billet</legend>
|
||||
<%= Html.LabelFor(model => model.Visible) %> : <%= Html.CheckBox( "Visible" ) %>
|
||||
@ -234,10 +239,5 @@ var data = new FormData($('#frmajax').get()[0]);
|
||||
|
||||
|
||||
|
||||
<aside>
|
||||
Id:<%= Html.ActionLink( Model.Id.ToString() , "UserPost", new { user= Model.Author, title=Model.Title, id = Model.Id }, new { @class = "usertitleref actionlink" }) %>
|
||||
, Posted: <%= Model.Posted.ToString("yyyy/MM/dd") %> - Modified: <%= Model.Modified.ToString("yyyy/MM/dd") %>
|
||||
Visible: <%= Model.Visible? "oui":"non" %> <%= Html.ActionLink("Supprimer","RemovePost", new { user=Model.Author, title = Model.Title, id = Model.Id }, new { @class="actionlink" } ) %>
|
||||
</aside>
|
||||
|
||||
</asp:Content>
|
@ -8,6 +8,9 @@
|
||||
<h2><a href="<%= Url.RouteUrl("Titles", new { title = g.Key }) %>" class="usertitleref"><%=Html.Encode(g.Key)%></a></h2>
|
||||
<% foreach (var p in g) { %>
|
||||
<div class="postpreview">
|
||||
<% if (p.Photo != null ) { %>
|
||||
<img src="<%=p.Photo%>" alt="<%=p.Photo%>" class="photo">
|
||||
<% } %>
|
||||
<p><%= Html.Markdown(p.Intro,"/bfiles/"+p.Id+"/") %></p>
|
||||
<%= Html.Partial("PostActions",p)%>
|
||||
</div> <% } %>
|
||||
|
@ -1,4 +0,0 @@
|
||||
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<BlogEntryCollection>" MasterPageFile="~/Models/App.master"%>
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
Ce contenu est d'accès restreint : <<%= Html.Encode(ViewData["BlogUser"]) %>/<%= Html.Encode(ViewData["PostTitle"]) %>>
|
||||
</asp:Content>
|
@ -1,11 +1,14 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BasePost>" %>
|
||||
<aside>
|
||||
<% if (Membership.GetUser()!=null) { %>
|
||||
<aside>
|
||||
(<%= Model.Posted.ToString("D") %>
|
||||
- <%= Model.Modified.ToString("D") %> <%= Model.Visible? "":", Invisible!" %>)
|
||||
<% if (Membership.GetUser()!=null) {
|
||||
<%= Html.Partial("RateControl",Model)%>
|
||||
<%
|
||||
if (Membership.GetUser().UserName==Model.Author || Roles.IsUserInRole("Admin"))
|
||||
{ %>
|
||||
<% if (Model is BlogEntry) { %><%= Html.Partial("TagControl",Model)%>
|
||||
<%= Html.Partial("TagControl",Model)%>
|
||||
<% if (Model is BlogEntry) { %>
|
||||
<i class="fa fa-pencil"><%=Html.Translate("DoComment")%></i>
|
||||
<aside class="control" class="hidden">
|
||||
<% using (Html.BeginForm("Comment","Blogs")) { %>
|
||||
@ -17,10 +20,11 @@
|
||||
<% } %>
|
||||
</aside>
|
||||
<% } %>
|
||||
<a href="<%= Url.RouteUrl("Default", new { action = "Edit", postid = Model.Id })%>" class="actionlink">
|
||||
<a href="<%= Url.RouteUrl("Default", new { action = "EditId", postid = Model.Id })%>" class="actionlink">
|
||||
<i class="fa fa-pencil"><%=Html.Translate("Edit")%></i>
|
||||
</a>
|
||||
<a href="<%= Url.RouteUrl("Default", new { action = "RemovePost", postid = Model.Id })%>" class="actionlink">
|
||||
<i class="fa fa-remove"><%=Html.Translate("Remove")%></i></a>
|
||||
<% }} %>
|
||||
<% } %>
|
||||
</aside>
|
||||
<% } %>
|
||||
|
@ -1,4 +1,4 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogEntry>" %>
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BasePost>" %>
|
||||
<p id="tags<%=Model.Id%>" data-postid="<%=Model.Id%>" class="fa fa-tag">
|
||||
<% if (Model.Tags != null) {
|
||||
foreach ( var tagname in Model.Tags) { %>
|
||||
@ -8,6 +8,7 @@ foreach ( var tagname in Model.Tags) { %>
|
||||
<% if (Membership.GetUser()!=null) { %>
|
||||
<% if (Membership.GetUser().UserName==Model.Author || Roles.IsUserInRole("Admin"))
|
||||
{ // grant all permissions: to choose a given set of tags, also create some new tags %>
|
||||
|
||||
<span id="viewtagger<%=Model.Id%>">
|
||||
<i class="fa fa-tag menuitem" id="viewtaggerbtn<%=Model.Id%>"><%=Html.Translate("DoTag")%></i></span>
|
||||
<span id="hidetagger<%=Model.Id%>" class="hidden">
|
||||
|
@ -1,12 +1,14 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<TagInfo>" %>
|
||||
<h2><%=Html.Encode(Model.Name)%></h2>
|
||||
<% foreach (var g in Model.Titles) { %>
|
||||
<div class="panel">
|
||||
<i class="fa fa-tag"><%=Html.Encode(Model.Name)%></i>
|
||||
<% foreach (var t in Model.Titles) { %>
|
||||
<a href="<%= Url.RouteUrl("Titles", new { title = t.Title }) %>">
|
||||
<img src="<%=Url.Encode(t.Photo)%>" alt="placard" class="photo">
|
||||
<%= Html.Markdown(t.Title,"/bfiles/"+t.Id+"/")%></a>
|
||||
<h3><%= Html.Markdown(g.Key)%></h3>
|
||||
<% foreach (var p in g) { %>
|
||||
<a href="<%= Url.RouteUrl("Titles", new { title = g.Key, postid = p.Id }) %>">
|
||||
<% if (p.Photo != null) { %> <img src="<%=p.Photo%>" alt="placard" class="photo"> <% } %>
|
||||
<div class="postpreview">
|
||||
<p><%= Html.Markdown(t.Intro,"/bfiles/"+t.Id+"/") %></p>
|
||||
</div>
|
||||
<p><%= Html.Markdown(p.Intro,"/bfiles/"+p.Id+"/") %></p>
|
||||
</div> </a>
|
||||
<% } %>
|
||||
</div>
|
||||
</div>
|
||||
<% } %>
|
@ -12,16 +12,9 @@
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<% foreach (BlogEntry e in this.Model) { %>
|
||||
<div class="post<% if (!e.Visible) { %> hiddenpost<% } %>" >
|
||||
<% if (e.Photo!=null) { %><img src="<%=e.Photo%>" alt="" class="photo"><% } %>
|
||||
<%= Html.Markdown(e.Content,"/bfiles/"+e.Id+"/") %>
|
||||
<%= Html.Partial("PostActions",e)%>
|
||||
</div>
|
||||
<% } %>
|
||||
<%
|
||||
if (((int) ViewData["RecordCount"]) > ((int) ViewData["PageSize"])) {
|
||||
rp1.ResultCount = (int) ViewData["RecordCount"];
|
||||
if (((int) ViewData["ResultCount"]) > ((int) ViewData["PageSize"])) {
|
||||
rp1.ResultCount = (int) ViewData["ResultCount"];
|
||||
rp1.PageIndex = (int) ViewData["PageIndex"];
|
||||
rp1.PageSize = (int) ViewData["PageSize"];
|
||||
%><aside><form runat="server" id="form1">
|
||||
@ -31,4 +24,11 @@ if (((int) ViewData["RecordCount"]) > ((int) ViewData["PageSize"])) {
|
||||
</form>
|
||||
</aside>
|
||||
<% } %>
|
||||
<% foreach (BlogEntry e in this.Model) { %>
|
||||
<div class="post<% if (!e.Visible) { %> hiddenpost<% } %>" >
|
||||
<% if (e.Photo!=null) { %><img src="<%=e.Photo%>" alt="" class="photo"><% } %>
|
||||
<%= Html.Markdown(e.Content,"/bfiles/"+e.Id+"/") %>
|
||||
<%= Html.Partial("PostActions",e)%>
|
||||
</div>
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
|
@ -19,30 +19,18 @@
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<% foreach (BlogEntry e in this.Model) { %>
|
||||
<div class="postpreview<% if (!e.Visible) { %> hiddenpost<% } %>" >
|
||||
<h2><a href="<%= Url.RouteUrl("BlogByTitle", new { user=e.Author, title=e.Title, postid = e.Id })%>" class="usertitleref">
|
||||
<%=Html.Markdown(e.Title)%></a></h2>
|
||||
<% bool truncated = false; %>
|
||||
<%= Html.MarkdownToHtmlIntro(out truncated, e.Content,"/bfiles/"+e.Id+"/") %>
|
||||
<% if (truncated) { %>
|
||||
<a href="<%= Url.RouteUrl( "BlogByTitle", new { user=e.Author , title=e.Title, postid = e.Id}) %>">
|
||||
<i><%=Html.Translate("ReadMore")%></i></a>
|
||||
<% } %>
|
||||
<%= Html.Partial("PostActions",e)%>
|
||||
</div>
|
||||
<% } %>
|
||||
<aside>
|
||||
<form runat="server" id="form1" method="GET">
|
||||
<%
|
||||
rp1.ResultCount = (int) ViewData["RecordCount"];
|
||||
rp1.PageIndex = (int) ViewData["PageIndex"];
|
||||
%>
|
||||
<yavsc:ResultPages id="rp1" Action = "?pageIndex={0}" runat="server">
|
||||
<None><i>Pas de contenu</i></None>
|
||||
</yavsc:ResultPages>
|
||||
</form>
|
||||
</aside>
|
||||
|
||||
|
||||
<% foreach (var g in Model.GroupByTitle()) { %>
|
||||
<div class="panel">
|
||||
<h2><a href="<%= Url.RouteUrl("Titles", new { title = g.Key }) %>" class="usertitleref"><%=Html.Encode(g.Key)%></a></h2>
|
||||
<% foreach (var p in g) { %>
|
||||
<div class="postpreview">
|
||||
<% if (p.Photo!=null) { %>
|
||||
<img src="<%=p.Photo%>" alt="photo" class="photo"><% } %>
|
||||
<%= Html.Markdown(p.Intro,"/bfiles/"+p.Id+"/") %>
|
||||
<%= Html.Partial("PostActions",p)%>
|
||||
</div> <% } %>
|
||||
</div>
|
||||
<% } %>
|
||||
<%= Html.RenderPageLinks((int)ViewData["PageIndex"],(int)ViewData["PageSize"],(int)ViewData["ResultCount"])%>
|
||||
</asp:Content>
|
||||
|
@ -27,9 +27,7 @@
|
||||
</ul>
|
||||
<% } %>
|
||||
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
||||
<ul><li>
|
||||
<%= Html.ActionLink("Catalog","Catalog" ) %>
|
||||
</li><li>
|
||||
|
@ -2,12 +2,11 @@
|
||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
|
||||
<%= Html.ActionLink("Votre panier","Basket","FrontOffice" ) %>
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
||||
<ul><li>
|
||||
<ul><li>
|
||||
<%= Html.ActionLink("Catalog","Catalog" ) %>
|
||||
</li><li>
|
||||
<%= Html.ActionLink("Estimates","Estimates" ) %>
|
||||
</li></ul>
|
||||
</asp:Content>
|
||||
|
||||
</asp:Content>
|
||||
|
@ -6,83 +6,7 @@
|
||||
</script>
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
|
||||
<%= Html.ValidationSummary("Devis") %>
|
||||
|
||||
<% using (Html.BeginForm("Estimate","FrontOffice")) { %>
|
||||
<%= Html.LabelFor(model => model.Title) %>:<%= Html.TextBox( "Title" ) %>
|
||||
<%= Html.ValidationMessage("Title", "*") %>
|
||||
<br/>
|
||||
<%= Html.Hidden ("Responsible") %>
|
||||
|
||||
<%= Html.LabelFor(model => model.Client) %>:
|
||||
|
||||
<% Client.Value = Model.Client ; %>
|
||||
<yavsc:InputUserName
|
||||
id="Client"
|
||||
name="Client"
|
||||
emptyvalue="*nouvel utilisateur*"
|
||||
onchange="onClientChange(this.value);"
|
||||
runat="server" >
|
||||
</yavsc:InputUserName>
|
||||
<script>
|
||||
function onClientChange(newval)
|
||||
{
|
||||
if (newval=='')
|
||||
$("#dfnuser").removeClass("hidden");
|
||||
else
|
||||
$("#dfnuser").addClass("hidden");
|
||||
}
|
||||
</script>
|
||||
<%= Html.ValidationMessage("Client", "*") %>
|
||||
<br/>
|
||||
<%= Html.LabelFor(model => model.Description) %>:<%=Html.TextArea( "Description") %>
|
||||
<%= Html.ValidationMessage("Description", "*") %>
|
||||
<br/>
|
||||
<%= Html.Hidden( "Id" ) %>
|
||||
<br/>
|
||||
<% if (Model.Id==0) { %>
|
||||
<input type="submit" name="submit" value="Create"/>
|
||||
<% } else { %>
|
||||
<input type="submit" name="submit" value="Update"/>
|
||||
<% } %>
|
||||
|
||||
<% if (Model.Id>0) { %>
|
||||
<table id="tbwrts">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sort="string"><%=Yavsc.Model.LocalizedText.Description%></th>
|
||||
<th data-sort="string"><%=Yavsc.Model.LocalizedText.Product_reference%></th>
|
||||
<th data-sort="int"><%=Yavsc.Model.LocalizedText.Count%></th>
|
||||
<th data-sort="float"><%=Yavsc.Model.LocalizedText.Unitary_cost%></th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="wrts">
|
||||
<% int lc=0;
|
||||
if (Model.Lines!=null)
|
||||
foreach (Writting wr in Model.Lines) { lc++; %>
|
||||
<tr class="<%= (wr.Id%2==0)?"even ":"odd " %>row" id="wr<%=wr.Id%>">
|
||||
<td><%=wr.Description%></td>
|
||||
<td><%=wr.ProductReference%></td>
|
||||
<td><%=wr.Count%></td>
|
||||
<td><%=wr.UnitaryCost%></td>
|
||||
<td>
|
||||
<input type="button" value="X" class="actionlink rowbtnrm"/>
|
||||
</td>
|
||||
</tr>
|
||||
<% } %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% } %>
|
||||
<% } %>
|
||||
|
||||
</asp:Content>
|
||||
|
||||
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MASContent" ID="MASContent1" runat="server">
|
||||
<aside>
|
||||
<aside>
|
||||
<div id="dfnuser" class="hidden">
|
||||
<%= Html.Partial("~/Views/Account/Register.ascx",new RegisterClientModel(),new ViewDataDictionary(ViewData)
|
||||
{
|
||||
@ -354,4 +278,77 @@ function addRow(){
|
||||
<a class="actionlink" href="<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>/FrontOffice/EstimateToTex?id=<%=Model.Id%>"><%= LocalizedText.Tex_version %></a>
|
||||
<a class="actionlink" href="<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>/FrontOffice/EstimateToPdf?id=<%=Model.Id%>"><%= LocalizedText.Pdf_version %></a>
|
||||
</aside>
|
||||
|
||||
<%= Html.ValidationSummary("Devis") %>
|
||||
|
||||
<% using (Html.BeginForm("Estimate","FrontOffice")) { %>
|
||||
<%= Html.LabelFor(model => model.Title) %>:<%= Html.TextBox( "Title" ) %>
|
||||
<%= Html.ValidationMessage("Title", "*") %>
|
||||
<br/>
|
||||
<%= Html.Hidden ("Responsible") %>
|
||||
|
||||
<%= Html.LabelFor(model => model.Client) %>:
|
||||
|
||||
<% Client.Value = Model.Client ; %>
|
||||
<yavsc:InputUserName
|
||||
id="Client"
|
||||
name="Client"
|
||||
emptyvalue="*nouvel utilisateur*"
|
||||
onchange="onClientChange(this.value);"
|
||||
runat="server" >
|
||||
</yavsc:InputUserName>
|
||||
<script>
|
||||
function onClientChange(newval)
|
||||
{
|
||||
if (newval=='')
|
||||
$("#dfnuser").removeClass("hidden");
|
||||
else
|
||||
$("#dfnuser").addClass("hidden");
|
||||
}
|
||||
</script>
|
||||
<%= Html.ValidationMessage("Client", "*") %>
|
||||
<br/>
|
||||
<%= Html.LabelFor(model => model.Description) %>:<%=Html.TextArea( "Description") %>
|
||||
<%= Html.ValidationMessage("Description", "*") %>
|
||||
<br/>
|
||||
<%= Html.Hidden( "Id" ) %>
|
||||
<br/>
|
||||
<% if (Model.Id==0) { %>
|
||||
<input type="submit" name="submit" value="Create"/>
|
||||
<% } else { %>
|
||||
<input type="submit" name="submit" value="Update"/>
|
||||
<% } %>
|
||||
|
||||
<% if (Model.Id>0) { %>
|
||||
<table id="tbwrts">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sort="string"><%=Yavsc.Model.LocalizedText.Description%></th>
|
||||
<th data-sort="string"><%=Yavsc.Model.LocalizedText.Product_reference%></th>
|
||||
<th data-sort="int"><%=Yavsc.Model.LocalizedText.Count%></th>
|
||||
<th data-sort="float"><%=Yavsc.Model.LocalizedText.Unitary_cost%></th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="wrts">
|
||||
<% int lc=0;
|
||||
if (Model.Lines!=null)
|
||||
foreach (Writting wr in Model.Lines) { lc++; %>
|
||||
<tr class="<%= (wr.Id%2==0)?"even ":"odd " %>row" id="wr<%=wr.Id%>">
|
||||
<td><%=wr.Description%></td>
|
||||
<td><%=wr.ProductReference%></td>
|
||||
<td><%=wr.Count%></td>
|
||||
<td><%=wr.UnitaryCost%></td>
|
||||
<td>
|
||||
<input type="button" value="X" class="actionlink rowbtnrm"/>
|
||||
</td>
|
||||
</tr>
|
||||
<% } %>
|
||||
</tbody>
|
||||
</table>
|
||||
<% } %>
|
||||
<% } %>
|
||||
|
||||
|
||||
|
||||
</asp:Content>
|
@ -10,7 +10,6 @@
|
||||
<%= Html.LabelFor(model => model.StartDate) %>: <%=Model.StartDate%> <br/>
|
||||
<%= Html.LabelFor(model => model.EndDate) %>: <%=Model.EndDate%> <br/>
|
||||
<%= Html.LabelFor(model => model.Circles) %>: <%=Model.Circles%> <br/>
|
||||
<%= Html.LabelFor(model => model.ImgLocator) %>: <%=Model.ImgLocator%> <br/>
|
||||
<%= Html.LabelFor(model => model.EventWebPage) %>: <%=Model.EventWebPage%> <br/>
|
||||
<%= Html.LabelFor(model => model.ProviderName) %>: <%=Model.ProviderName%> <br/>
|
||||
<%= Html.LabelFor(model => model.Comment) %>: <%=Model.Comment%> <br/>
|
||||
|
@ -1,9 +1,7 @@
|
||||
<%@ Page Title="Front office" Language="C#" MasterPageFile="~/Models/App.master" Inherits="System.Web.Mvc.ViewPage" %>
|
||||
|
||||
<asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
|
||||
</asp:Content>
|
||||
<asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
|
||||
<ul><li>
|
||||
<ul><li>
|
||||
<%= Html.ActionLink("Catalog","Catalog" ) %>
|
||||
</li><li>
|
||||
<%= Html.ActionLink("Estimates","Estimates" ) %>
|
||||
|
@ -3,13 +3,13 @@
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<div class="panel">
|
||||
<p>
|
||||
Directeur : <br>
|
||||
Adresse postale : <br>
|
||||
Tél. : +33 <br>
|
||||
Tél. : +33 <br>
|
||||
SIREN : <br>
|
||||
SIRET : <br>
|
||||
Activité Principalement Exercée (APE) : <br>
|
||||
Directeur : Paul Schneider<br>
|
||||
Adresse postale : 2 Boulevard Aristide Briand<br>
|
||||
Tél. : +33 (0) 9 80 90 36 42<br>
|
||||
Mobile : +33 (0) 6 51 14 15 64<br>
|
||||
SIREN : 803 851 674<br>
|
||||
SIRET : 803 851 674 00017<br>
|
||||
Activité Principalement Exercée (APE) : 5829C Édition de logiciels applicatifs<br>
|
||||
</p>
|
||||
<% using (Html.BeginForm("Contact", "Home")) { %>
|
||||
<fieldset>
|
||||
|
@ -1,16 +1,16 @@
|
||||
<%@ Page Title="Home" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%>
|
||||
<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
|
||||
<% Title = YavscHelpers.SiteName ; %>
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="overHeaderOne" ID="header1" runat="server">
|
||||
<h1><%=Html.Encode(Page.Title)%></h1>
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<%= Html.Partial("TagPanel",ViewData["Accueil"]) %>
|
||||
<%= Html.Partial("TagPanel",ViewData["Yavsc"]) %>
|
||||
<%= Html.Partial("TagPanel",ViewData["Événements"]) %>
|
||||
<%= Html.Partial("TagPanel",ViewData["Mentions légales"]) %>
|
||||
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderID="MASContent" ID="MASContentContent" runat="server">
|
||||
<div class="panel">
|
||||
<%= Html.ActionLink("Les articles", "Index", "Blogs", null, new { @class="actionlink" }) %>
|
||||
<%= Html.ActionLink("Contact", "Contact", "Home", null, new { @class="actionlink" }) %>
|
||||
<%= Html.ActionLink("Credits", "Credits", "Home", null, new { @class="actionlink" }) %>
|
||||
<%= Html.ActionLink("Version des librairies", "AssemblyInfo", "Home", null, new { @class="actionlink" }) %>
|
||||
</div>
|
||||
</asp:Content>
|
||||
|
||||
|
@ -1,13 +1,14 @@
|
||||
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<TagInfo>" %>
|
||||
<div class="panel">
|
||||
<h2><%=Html.Encode(Model.Name)%></h2>
|
||||
<% foreach (var t in Model.Titles) { %>
|
||||
<% foreach (var g in Model.Titles) { %>
|
||||
<div class="panel">
|
||||
<h3><%= Html.Markdown(g.Key)%></h3>
|
||||
<% foreach (var p in g) { %>
|
||||
<a href="<%= Url.RouteUrl("Titles", new { title = g.Key, postid = p.Id }) %>">
|
||||
<% if (p.Photo != null) { %> <img src="<%=p.Photo%>" alt="placard" class="photo"> <% } %>
|
||||
<div class="postpreview">
|
||||
<a href="<%= Url.RouteUrl("Titles", new { title = t.Title }) %>">
|
||||
<% if (t.Photo != null ) { %>
|
||||
<img src="<%=t.Photo%>" alt="placard" class="photo"><% } %>
|
||||
<%= Html.Markdown(t.Title,"/bfiles/"+t.Id+"/")%></a>
|
||||
<%= Html.Markdown(t.Intro,"/bfiles/"+t.Id+"/") %>
|
||||
</div>
|
||||
<p><%= Html.Markdown(p.Intro,"/bfiles/"+p.Id+"/") %></p>
|
||||
</div> </a>
|
||||
<% } %>
|
||||
</div>
|
||||
<% } %>
|
||||
|
@ -17,6 +17,7 @@
|
||||
<add tagPrefix="yavsc" namespace="Yavsc.WebControls" assembly="Yavsc.WebControls" />
|
||||
</controls>
|
||||
<namespaces>
|
||||
<add namespace="System.Collections.Generic" />
|
||||
<add namespace="Yavsc.Helpers" />
|
||||
<add namespace="Yavsc.Admin" />
|
||||
<add namespace="Yavsc.CatExts" />
|
||||
@ -26,9 +27,10 @@
|
||||
<add namespace="Yavsc.Model.WorkFlow" />
|
||||
<add namespace="Yavsc.Model.Google" />
|
||||
<add namespace="Yavsc.Model.FrontOffice" />
|
||||
<add namespace="Yavsc.Model.FrontOffice.Catalog" />
|
||||
<add namespace="Yavsc.Model.Circles" />
|
||||
<add namespace="Yavsc.Model.Calendar" />
|
||||
<add namespace="System.Collections.Generic" />
|
||||
<add namespace="Yavsc.Model.Skill" />
|
||||
</namespaces>
|
||||
</pages>
|
||||
</system.web>
|
||||
|
Reference in New Issue
Block a user