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

Merge branch 'master' of yavsc

Browse source
This commit is contained in:
Paul Schneider 2015-10-02 15:39:51 +02:00
commit 8042031871
36 changed files with 1682 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

67
web/Models/App.master
View file

@ -62,12 +62,14 @@ $(document).ready(function(){
$bgobj.attr('orgbgpy',parseInt(bgposy));
$(window).scroll(function() {
var xPos = $bgobj.attr('orgbgpx') - ($window.scrollLeft() / $bgobj.data('speed'));
var yPos = $bgobj.attr('orgbgpy') - ($window.scrollTop() / $bgobj.data('speed'));
// Put together our final background position
var coords = '' + xPos + $bgobj.attr('orgbgpxu') + yPos + $bgobj.attr('orgbgpyu');
// Move the background
$bgobj.css({ backgroundPosition: coords });
var speed = $bgobj.data('speed');
var xPos = $bgobj.attr('orgbgpx') - Math.round($window.scrollLeft() / speed);
var yPos = $bgobj.attr('orgbgpy') - Math.round($window.scrollTop() / speed);
// Put together our final background position
var coords = '' + xPos + $bgobj.attr('orgbgpxu') + yPos + $bgobj.attr('orgbgpyu');
// Move the background
$bgobj.css({ backgroundPosition: coords });
// console.log($bgobj.get()[0].localName+' backgroundPosition: '+coords);
});
});
});
@ -78,7 +80,11 @@ $(document).ready(function(){
<link href='http://fonts.googleapis.com/css?family=Dancing+Script:400,700' rel='stylesheet' type='text/css'/>
</head>
<body>
<<<<<<< HEAD
<header data-type="background" data-speed="10" >
=======
<header data-type="background" data-speed="8" >
>>>>>>> bdae927f67893f93bc3681bb9c7fa08d0ca04a93
<asp:ContentPlaceHolder ID="overHeaderOne" runat="server">
@ -96,9 +102,15 @@ $(document).ready(function(){
</header>
<<<<<<< HEAD
<nav data-type="background" data-speed="10" data-emheight="10" data-posx="0" data-posy="11" >
=======
<nav data-type="background" data-speed="2">
>>>>>>> bdae927f67893f93bc3681bb9c7fa08d0ca04a93
<% if (Membership.GetUser()==null) { %>
<a href="<%= Url.Content("~/Account/Login/?returnUrl=") + Url.Encode( Request.Url.PathAndQuery )%>" >
<div class="menuitem">
<<<<<<< HEAD
<%= Html.ActionLink("Authentification", "Login", "Account", new { returnUrl=Request.Url.PathAndQuery }, new { accesskey = "L" } ) %>
<div class="hint">Pour pouvoir publier, facturer</div>
</div>
@ -106,9 +118,16 @@ $(document).ready(function(){
<a href="/Blog/<%= HttpContext.Current.User.Identity.Name%>" accesskey = "B" >
<img src="<%=Html.AvatarUrl(HttpContext.Current.User.Identity.Name)%>" alt="vos billets" class="iconsmall" /></a>
<div class="hint">Vos billets</div>
=======
<i class="fa fa-sign-in"></i> Connexion
<div class="hint">Pour pouvoir publier, facturer</div>
>>>>>>> bdae927f67893f93bc3681bb9c7fa08d0ca04a93
</div>
</a>
<% } else { %>
<a href="/Blog/<%= HttpContext.Current.User.Identity.Name%>" accesskey = "B" >
<div class="menuitem">
<<<<<<< HEAD
<%= Html.ActionLink(HttpContext.Current.User.Identity.Name, "Profile", "Account", new { id = HttpContext.Current.User.Identity.Name }, new { accesskey = "P" } ) %>
<div class="hint"> &Eacute;dition de votre profile </div></div>
@ -118,8 +137,23 @@ $(document).ready(function(){
&Eacute;dition d'un nouveau billet </div></div>
<div class="menuitem">
<%= Html.ActionLink( "Deconnexion", "Logout", "Account", new { returnUrl=Request.Url.PathAndQuery }, new { accesskey = "L" }) %>
<% } %>
=======
<img src="<%=Html.AvatarUrl(HttpContext.Current.User.Identity.Name)%>" alt="vos billets" class="iconsmall" />
<div class="hint">Vos billets</div>
</div>
</a>
<a href="<%= Url.Content("~/Account/Profile/" + HttpContext.Current.User.Identity.Name) %>" accesskey="L" class="menuitem">
<i class="fa fa-user"></i> <%= HttpContext.Current.User.Identity.Name %>
<div class="hint"> &Eacute;dition de votre profile </div></a>
<a href="/Blogs/Post" accesskey="P" class="menuitem">
<i class="fa fa-pencil"></i>
<u>P</u>oster
<div class="hint">&Eacute;dition d'un nouveau billet </div></a>
<a href="<%= Url.Content( "~/Account/Logout/?returnUrl=")+Url.Encode(Request.Url.PathAndQuery)%>" accesskey = "P" class="menuitem">
<i class="fa fa-sign-out"></i>Deconnexion</a>
>>>>>>> bdae927f67893f93bc3681bb9c7fa08d0ca04a93
<% } %>
</nav>
<main data-type="background" data-speed="10" data-emheight="10" data-posx="0" data-posy="22" >
<div>
@ -130,6 +164,7 @@ $(document).ready(function(){
<asp:ContentPlaceHolder ID="MASContent" runat="server">
</asp:ContentPlaceHolder>
<<<<<<< HEAD
<footer data-type="background" data-speed="10" >
<p id="copyr">
@ -149,6 +184,22 @@ $(document).ready(function(){
<p><i>(Version de développement, G+1 desactivé)</i></p>
<% #endif %>
=======
<footer data-type="background" data-speed="2">
<div >
<%= Html.ActionLink("Formulaire de contact","Contact","Home",null, new { @class="thanks" }) %>
<% foreach ( Link link in Html.Thanks()) { %>
<a class="thanks" href="<%=link.Url%>"><% if (link.Image !=null) {
%><img src="<%= link.Image %>" alt="<%= link.Text %>"/></a>
<% } else { %>
<a class="thanks" href="<%=link.Url%>"><%= link.Text %></a>
<% }} %>
</div>
<script src="https://apis.google.com/js/platform.js" defer>
{lang: 'fr'}
</script>
<div id="gspacer"><div class="g-plusone" data-annotation="inline" data-width="170"></div></div>
>>>>>>> bdae927f67893f93bc3681bb9c7fa08d0ca04a93
</footer>
</body>
</html>