notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions

[do not push this]

Browse source
This commit is contained in:
Paul Schneider 2017-03-15 07:09:48 +01:00
commit a68afc9364
29 changed files with 128 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Yavsc/Views/Command/BookHaircutStar.cshtml
View file

@ -51,8 +51,8 @@
var pos = loc.geometry.location;
var lat = new Number(pos.lat);
var lng = new Number(pos.lng);
$('#' + config.latId).val(lat.toLocaleString('fr'));
$('#' + config.longId).val(lng.toLocaleString('fr'));
$('#' + config.latId).val(lat.toLocaleString('en'));
$('#' + config.longId).val(lng.toLocaleString('en'));
gmap.setCenter(pos);
if (marker) {
marker.setMap(null);

4
Yavsc/Views/Command/Create.cshtml
View file

@ -57,8 +57,8 @@
var pos = loc.geometry.location;
var lat = new Number(pos.lat);
var lng = new Number(pos.lng);
$('#' + config.latId).val(lat.toLocaleString('fr'));
$('#' + config.longId).val(lng.toLocaleString('fr'));
$('#' + config.latId).val(lat.toLocaleString('en'));
$('#' + config.longId).val(lng.toLocaleString('en'));
gmap.setCenter(pos);
if (marker) {
marker.setMap(null);

2
Yavsc/Views/HairCutCommand/HairCut.cshtml
View file

@ -127,7 +127,7 @@
@Html.DisplayFor(m=>m.PerformerProfile)
<form asp-controller="HairCutCommand" asp-action="HairCut">
<form asp-controller="HairCutCommand" asp-action="HairCut" id="form">
<div class="form-horizontal">
<hr />
<div asp-validation-summary="ValidationSummary.ModelOnly" class="text-danger"></div>

5
Yavsc/Views/Home/Chat.cshtml
View file

@ -52,6 +52,7 @@
var audio = new Audio('/sounds/bell.mp3');
var setPrivate = function (li) {
console.log("here I am");
$("#sendmessagebox").addClass("hidden");
$("#sendpvbox").removeClass("hidden");
pvuis = { CXs: $(li).data("cxids"), UserName: $(li).data("name") };
@ -136,9 +137,9 @@
var li = $('<li class="user"><img src="/Avatars/' + username + '.xs.png"> ' + username + '</li>');
li.data("name", username);
li.data("cxids", [cxid]);
li.appendTo('#userlist');
li.css('cursor', 'pointer');
li.click(function () { setPrivate(this); })
li.click(function () { console.log('no click?'); setPrivate(this); });
li.appendTo('#userlist');
}
};
chat.client.notify = function (tag, message, data) {

4
Yavsc/Views/Manage/SetActivity.cshtml
View file

@ -41,8 +41,8 @@
var pos = loc.geometry.location;
var lat = new Number(pos.lat);
var lng = new Number(pos.lng);
$('#'+config.latId).val(lat.toLocaleString('fr'));
$('#'+config.longId).val(lng.toLocaleString('fr'));
$('#'+config.latId).val(lat.toLocaleString('en'));
$('#'+config.longId).val(lng.toLocaleString('en'));
gmap.setCenter(pos);
if (marker) { 
marker.setMap(null);

45
Yavsc/Views/Shared/_Layout.cshtml
View file

@ -7,41 +7,40 @@
<title>@ViewData["Title"] - @SiteSettings.Value.Title</title>
<environment names="Development">
<link rel="stylesheet" href="~/css/main/bootstrap.css" />
<link rel="stylesheet" href="~/css/main/site.css" />
<link rel="stylesheet" href="~/css/main/jquery-ui.css" />
<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/site.js" asp-append-version="true"></script>
<script src="~/js/jquery.signalR-2.2.1.js" asp-append-version="true"></script>
<style>
</environment>
<environment names="Staging,Production,yavsc,yavscpre,zicmoove,lua">
<link rel="stylesheet" href="~/csslib/site.min.css" asp-append-version="true" />
</environment>
<environment names="Development">
<script src="~/js/jquery.js"></script>
<script src="~/js/jquery-ui.js"></script>
<script src="~/js/bootstrap.js"></script>
<script src="~/js/site.js"></script>
</environment>
<environment names="Staging,Production,yavsc,yavscpre,zicmoove,lua">
<environment names="yavsc,yavscpre,zicmoove,lua">
<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="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.1.4.min.js"
asp-fallback-src="~/bower_components/jquery/dist/jquery.min.js"
asp-fallback-src="~/jquery.min.js"
asp-fallback-test="window.jQuery" >
</script>
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.5/bootstrap.min.js"
asp-fallback-src="~/bower_components/bootstrap/dist/js/bootstrap.min.js"
asp-fallback-src="~/js/bootstrap.min.js"
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal">
</script>
<script src="~/js/jquery-ui.js"></script>
<script src="~/js/site.js"></script>
<script src="~/js/jquery-ui.min.js" asp-append-version="true"></script>
<script src="~/js/site.min.js" asp-append-version="true"></script>
<script src="~/js/jquery.signalR-2.2.1.min.js" asp-append-version="true"></script>
<style>
</environment>
<script src="~/js/jquery.signalR-2.2.1.js"></script>
<style>
nav {
background: url(@Startup.SiteSetup.Banner) 0% 50%;
}