Many fixes
* Profile.aspx: * ProfileEdition.cs: Fixes the username modification * Book-next.aspx: pollution * NpgsqlMembershipProvider.cs: xmldoc * NpgsqlProfileProvider.cs: use default values from configuration * NpgsqlUserNameProvider.cs: Fixes the username detection * test-domain-TestAPI.config: profile dates must be returned as DateTime * instdbws.sql: The conversion to a valid .Net DateTime requires a credible date time as source value, the null one is not supported. * style.css: Fixes the new notification style * AccountController.cs: Fixes the profile edition. Now using the anti forgery key at login time * Book.aspx: * LocalizedText.resx: * LocalizedText.fr.resx: * CalendarApi.cs: * GoogleController.cs: * LocalizedText.Designer.cs: * LocalizedText.fr.Designer.cs: WIP booking * HomeController.cs: code prettying * Global.asax.cs: Limits the usage of titles in a route to the blog controller * OAuth2.cs: Profile values may be of type DBNull ... * T.cs: All translated strings will be Html encoded, as expected from an html helper * YavscHelpers.cs: A new method to build a javascript string... * App.master: * AppAdmin.master: Notification.body is now a js string literal * NoLogin.master: sync with the true master * Login.aspx: Permits the anti forgery key usage * Estimate.aspx: refactoring * Web.config: Fixes a later commit on the catalog name space * Web.csproj: An ajax helper to notify * ChangePasswordModel.cs: * RegisterClientModel.cs: A regexp for user name * LoginModel.cs: A regexp for user name and password * Profile.cs: A regexp for user name, and profile usage fixes * UserManager.cs: Checks for username availability before trying to modify it * YavscModel.csproj: `ProfileEdition` class addition * ChangeLog: should not be indexed * ChangeLog: useless here * ValidateAjaxAttribute.cs: Fixes usage of HtmlFieldPrefix * BookQuery.cs: Start, end hour and role are required * OtherWebException.cs: uselessmain
parent
0a91d3935b
commit
d9d5bb308e
@ -1,73 +0,0 @@
|
|||||||
<%@ Page Title="Booking" Language="C#" Inherits="System.Web.Mvc.ViewPage<BookQuery>" MasterPageFile="~/Models/App.master" %>
|
|
||||||
<asp:Content ContentPlaceHolderID="head" ID="headContent" runat="server">
|
|
||||||
<link rel='stylesheet' href='/Scripts/fullcalendar/fullcalendar.css' />
|
|
||||||
<script type="text/javascript" src="/Scripts/jquery.mousewheel.js"></script>
|
|
||||||
<link rel="stylesheet" type="text/css" href="/App_Themes/jquery.timepicker.css" />
|
|
||||||
<script type="text/javascript" src="/Scripts/globalize/globalize.js"></script>
|
|
||||||
<script type="text/javascript" src="/Scripts/globalize/cultures/globalize.culture.fr.js"></script>
|
|
||||||
<script type="text/javascript" src="/Scripts/datepicker-fr.js"></script>
|
|
||||||
<script type="text/javascript" src="/Scripts/datepicker-en-GB.js"></script>
|
|
||||||
<script type="text/javascript" src="/Scripts/datepair.js"></script>
|
|
||||||
<script type="text/javascript" src="/Scripts/jquery.timepicker.min.js"></script>
|
|
||||||
<script type="text/javascript" src="/Scripts/jquery.datepair.min.js"></script>
|
|
||||||
|
|
||||||
</asp:Content>
|
|
||||||
|
|
||||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
|
||||||
|
|
||||||
<% using ( Html.BeginForm("Book","Google") ) { %>
|
|
||||||
<div id="book" ><fieldset>
|
|
||||||
<legend>Date d'intervention</legend>
|
|
||||||
Intervention souhaitée entre le
|
|
||||||
<input type="text" id="StartDate" class="start date" value="<%= DateTime.Now.ToString("yyyy/MM/dd")%>">
|
|
||||||
<%= Html.ValidationMessageFor(model=>model.StartDate) %>
|
|
||||||
et le
|
|
||||||
<input type="text" id="EndDate" class="end date" value="<%= DateTime.Now.AddDays(2).ToString("yyyy/MM/dd")%>">
|
|
||||||
<%= Html.ValidationMessageFor(model=>model.EndDate) %>
|
|
||||||
</fieldset>
|
|
||||||
<fieldset >
|
|
||||||
<legend>Heure et durée d'intervention souhaitée</legend>
|
|
||||||
<%= Html.LabelFor(model=>model.StartHour) %>
|
|
||||||
<input type="text" id="StartHour" class="start time" value="<%= DateTime.Now.ToString("H:mm")%>">
|
|
||||||
<%= Html.ValidationMessageFor(model=>model.StartHour) %>
|
|
||||||
|
|
||||||
<%= Html.LabelFor(model=>model.EndHour) %>
|
|
||||||
<input type="text" id="EndHour" class="end time" value="<%= DateTime.Now.AddMinutes(30).ToString("H:mm")%>">
|
|
||||||
<%= Html.ValidationMessageFor(model=>model.EndHour) %>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<fieldset>
|
|
||||||
<legend>Intervenant</legend>
|
|
||||||
<%= Html.LabelFor(model=>model.Role) %>:
|
|
||||||
<%= Html.TextBoxFor(model=>model.Role) %>
|
|
||||||
<%= Html.ValidationMessageFor(model=>model.Role) %>
|
|
||||||
<br>
|
|
||||||
<%= Html.LabelFor(model=>model.Person) %>:
|
|
||||||
<%= Html.TextBoxFor(model=>model.Person) %>
|
|
||||||
<%= Html.ValidationMessageFor(model=>model.Person) %>
|
|
||||||
</fieldset>
|
|
||||||
<script>
|
|
||||||
$(function() {
|
|
||||||
var tpconfig = {
|
|
||||||
'timeFormat': 'H:i',
|
|
||||||
'showDuration': true,
|
|
||||||
'disableTimeRanges': [
|
|
||||||
['17:01pm', '24:01pm'],
|
|
||||||
['0am', '9am']
|
|
||||||
]};
|
|
||||||
// $.datepicker.setDefaults($.datepicker.regional[ "fr" ] );
|
|
||||||
var dpconfig = {
|
|
||||||
'format': 'yy/mm/dd',
|
|
||||||
'autoclose': true } ;
|
|
||||||
|
|
||||||
$('#book .time').timepicker(tpconfig);
|
|
||||||
$('#book .date').datepicker(dpconfig);
|
|
||||||
$('#book').datepair();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<input type="submit">
|
|
||||||
<% } %>
|
|
||||||
<pre><%= Html.Encode(ViewData["json"]) %></pre>
|
|
||||||
|
|
||||||
</asp:Content>
|
|
||||||
Loading…
Reference in New Issue