diff --git a/ChangeLog b/ChangeLog index 5a340de1..6a9ce1d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-10-24 Paul Schneider + + * Makefile: restores the server reload after rsync call + 2015-10-09 Paul Schneider * Makefile: reloads config after each rsync call diff --git a/Makefile b/Makefile index fbdcb10a..2bd59221 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ rsync_% : DESTDIR = $(DESTDIR_$@) rsync_% : deploy echo "!Deploying to $(HOST)!" $(RSYNCCMD) dist/web/$(CONFIG)/ root@$(HOST):$(DESTDIR) + ssh root@$(HOST) "service apache2 reload" build: xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index c43f8935..004300b9 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -51,6 +51,7 @@ input, textarea, checkbox { .blogbanner { float: left; top:0; } .subtitle { font-size:small; font-style: italic; } header { +transition: margin 2s, padding 2s, background 2s; padding: 0; margin: 0; padding-top: 201px; @@ -59,11 +60,13 @@ header { background: url("/images/star-939235_1280.jpg") 0 0 no-repeat fixed; } header h1, header a { +transition:padding 2s; background-color: rgba(0,0,0,.5); margin:0; padding:1em; } nav { +transition: margin 2s, padding 2s, background 2s; margin: 2em; padding: 2em; display: block; @@ -73,6 +76,7 @@ nav { } main { +transition: margin 2s, padding 2s, background 2s; margin: 2em; padding: 2em; display: block; @@ -81,6 +85,7 @@ main { } footer { +transition: margin 2s, padding 2s, background 2s; background: url("/images/helix-nebula-1400x1400.s.jpg") 50% 90% repeat fixed ; margin: 0; margin-top: 2em; @@ -156,7 +161,9 @@ textarea.fullwidth { min-height:10em; } display:inline; bottom:0; } -.panel { display:inline-block; } +.panel { +display:inline-block; + } .panel,.bshpanel, aside { background-color: rgba(20,20,20,.8); @@ -197,9 +204,6 @@ content: ")"; font-family: 'Arial', cursive; padding: 1em; } -a:visited { - color: #E0E0E0; -} label { font-size: medium; } @@ -269,10 +273,14 @@ input, select, textarea { font-family: 'Arial', cursive; } -.actionlink:hover, fa:hover, .menuitem:hover, a:hover { + a:hover { background-color:rgba(30,0,124,0.9); border: solid green 1px; } +a:active { + background-color:rgba(124,0,32,0.9); +} + input:hover, textarea:hover { color: white; background-color:rgba(64,64,64,0.8); @@ -323,10 +331,11 @@ input, select, textarea { @media all and (max-width: 640px) { header { padding-bottom:1em; + background: url("/images/star-939235_1280.s.jpg") 0 0 no-repeat fixed; } #avatar { - margin:.5em; + margin:.5em; } header h1, header a , .actionlink, .menuitem, a { padding:.5em;} @@ -339,6 +348,7 @@ header h1, header a , .actionlink, .menuitem, a { padding:.5em;} main { margin: 1em; padding: 1em; + background: url("/images/p8-av4.s.jpg") 50% 20em no-repeat fixed ; } footer { background: url("/images/helix-nebula-1400x1400.s.jpg") 50% 90% repeat fixed ; diff --git a/web/ChangeLog b/web/ChangeLog index 5419c6de..1234571f 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,31 @@ +2015-10-24 Paul Schneider + + * p8-av4.s.jpg: + * star-939235_1280.s.jpg: + * star-939235_1280.xxs.jpg: a smaller background + + * style.css: adds animation + + * AdminController.cs: Fixes the call to Notify + + * Global.asax.cs: restores a dropped route + + * App.master: Drops script references to jQuery-ui and + Prettify from + the master page. They are heavy. + + * parallax.js: specifies the capture to false at calling the + event listener registration + + * UserPost.aspx: Fixes this page + + * Index.aspx: adds the `panel` class to embed those default + home page links + + * Web.csproj: dropping the imported parallax.js script + + * animated-overlay.gif: may be used in a futur work :-) + 2015-10-23 Paul Schneider * AdminController.cs: Notification when Admin group is created diff --git a/web/Controllers/AdminController.cs b/web/Controllers/AdminController.cs index 79bf4d4a..3288b5af 100644 --- a/web/Controllers/AdminController.cs +++ b/web/Controllers/AdminController.cs @@ -27,7 +27,7 @@ namespace Yavsc.Controllers { if (!Roles.RoleExists (adminRoleName)) { Roles.CreateRole (adminRoleName); - YavscHelpers.Notify (adminRoleName + " " + LocalizedText.role_created); + YavscHelpers.Notify (ViewData, adminRoleName + " " + LocalizedText.role_created); } return View (); diff --git a/web/Global.asax.cs b/web/Global.asax.cs index cdef00f3..300bbfa7 100644 --- a/web/Global.asax.cs +++ b/web/Global.asax.cs @@ -75,6 +75,12 @@ namespace Yavsc new { controller = "Blogs", action = "Index", postid=UrlParameter.Optional } ); + routes.MapRoute ( + "BackCompat", + "{controller}/{action}/{user}/{title}", + new { controller = "Home", action = "Index", user = UrlParameter.Optional, title = UrlParameter.Optional } + ); + routes.MapRoute ( "Default", "{controller}/{action}/{id}", diff --git a/web/Models/App.master b/web/Models/App.master index 642b31de..97ba187d 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -15,9 +15,9 @@ " /> - - - + + + @@ -29,9 +29,9 @@ var apiBaseUrl = '<%=Url.Content(Yavsc.WebApiConfig.UrlPrefixRelative)%>';
-

"> +

"> <%=ViewState["orgtitle"]%> -- "><%= YavscHelpers.SiteName %> +- "><%= YavscHelpers.SiteName %>

@@ -56,17 +56,17 @@ Yavsc.notice('<%=note%>'); vos billets Vos billets -" accesskey="P" class="menuitem"> -<%= HttpContext.Current.User.Identity.Name %> - Édition de votre profile +" accesskey="P" class="menuitem fa fa-user"> +<%= HttpContext.Current.User.Identity.Name %> + Édition de votre profile - -Poster -Édition d'un nouveau billet + +Poster +Édition d'un nouveau billet -" accesskey = "C" class="menuitem"> -<%=Html.Translate("Logout")%> +" accesskey = "C" class="menuitem fa fa-sign-out"> +<%=Html.Translate("Logout")%> <% } %>
@@ -87,11 +87,6 @@ Yavsc.notice('<%=note%>'); <%= link.Text %> <% }} %> <%= Html.ActionLink("Formulaire de contact","Contact","Home") %> - -
-
diff --git a/web/Scripts/parallax.js b/web/Scripts/parallax.js old mode 100755 new mode 100644 index dc1d0e62..251a8a90 --- a/web/Scripts/parallax.js +++ b/web/Scripts/parallax.js @@ -1,358 +1,94 @@ -/*! - * parallax.js v1.3.1 (http://pixelcog.github.io/parallax.js/) - * @copyright 2015 PixelCog, Inc. - * @license MIT (https://github.com/pixelcog/parallax.js/blob/master/LICENSE) - */ - -;(function ( $, window, document, undefined ) { - - // Polyfill for requestAnimationFrame - // via: https://gist.github.com/paulirish/1579671 - - (function() { - var lastTime = 0; - var vendors = ['ms', 'moz', 'webkit', 'o']; - for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) { - window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame']; - window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] - || window[vendors[x]+'CancelRequestAnimationFrame']; - } - - if (!window.requestAnimationFrame) - window.requestAnimationFrame = function(callback) { - var currTime = new Date().getTime(); - var timeToCall = Math.max(0, 16 - (currTime - lastTime)); - var id = window.setTimeout(function() { callback(currTime + timeToCall); }, - timeToCall); - lastTime = currTime + timeToCall; - return id; - }; - - if (!window.cancelAnimationFrame) - window.cancelAnimationFrame = function(id) { - clearTimeout(id); - }; - }()); - - - // Parallax Constructor - - function Parallax(element, options) { - var self = this; - - if (typeof options == 'object') { - delete options.refresh; - delete options.render; - $.extend(this, options); - } - - this.$element = $(element); - - if (!this.imageSrc && this.$element.is('img')) { - this.imageSrc = this.$element.attr('src'); - } - - var positions = (this.position + '').toLowerCase().match(/\S+/g) || []; - - if (positions.length < 1) { - positions.push('center'); - } - if (positions.length == 1) { - positions.push(positions[0]); - } - - if (positions[0] == 'top' || positions[0] == 'bottom' || positions[1] == 'left' || positions[1] == 'right') { - positions = [positions[1], positions[0]]; - } - - if (this.positionX != undefined) positions[0] = this.positionX.toLowerCase(); - if (this.positionY != undefined) positions[1] = this.positionY.toLowerCase(); - - self.positionX = positions[0]; - self.positionY = positions[1]; - - if (this.positionX != 'left' && this.positionX != 'right') { - if (isNaN(parseInt(this.positionX))) { - this.positionX = 'center'; - } else { - this.positionX = parseInt(this.positionX); - } - } - - if (this.positionY != 'top' && this.positionY != 'bottom') { - if (isNaN(parseInt(this.positionY))) { - this.positionY = 'center'; - } else { - this.positionY = parseInt(this.positionY); - } - } - - this.position = - this.positionX + (isNaN(this.positionX)? '' : 'px') + ' ' + - this.positionY + (isNaN(this.positionY)? '' : 'px'); - - if (navigator.userAgent.match(/(iPod|iPhone|iPad)/)) { - if (this.iosFix && !this.$element.is('img')) { - this.$element.css({ - backgroundImage: 'url(' + this.imageSrc + ')', - backgroundSize: 'cover', - backgroundPosition: this.position - }); - } - return this; - } - - if (navigator.userAgent.match(/(Android)/)) { - if (this.androidFix && !this.$element.is('img')) { - this.$element.css({ - backgroundImage: 'url(' + this.imageSrc + ')', - backgroundSize: 'cover', - backgroundPosition: this.position - }); - } - return this; - } - - this.$mirror = $('
').prependTo('body'); - this.$slider = $('').prependTo(this.$mirror); - - this.$mirror.addClass('parallax-mirror').css({ - visibility: 'hidden', - zIndex: this.zIndex, - position: 'fixed', - top: 0, - left: 0, - overflow: 'hidden' - }); - - this.$slider.addClass('parallax-slider').one('load', function() { - if (!self.naturalHeight || !self.naturalWidth) { - self.naturalHeight = this.naturalHeight || this.height || 1; - self.naturalWidth = this.naturalWidth || this.width || 1; - } - self.aspectRatio = self.naturalWidth / self.naturalHeight; - - Parallax.isSetup || Parallax.setup(); - Parallax.sliders.push(self); - Parallax.isFresh = false; - Parallax.requestRender(); - }); - - this.$slider[0].src = this.imageSrc; - - if (this.naturalHeight && this.naturalWidth || this.$slider[0].complete) { - this.$slider.trigger('load'); - } - - }; - - - // Parallax Instance Methods - - $.extend(Parallax.prototype, { - speed: 0.2, - bleed: 0, - zIndex: -100, - iosFix: true, - androidFix: true, - position: 'center', - overScrollFix: false, - - refresh: function() { - this.boxWidth = this.$element.outerWidth(); - this.boxHeight = this.$element.outerHeight() + this.bleed * 2; - this.boxOffsetTop = this.$element.offset().top - this.bleed; - this.boxOffsetLeft = this.$element.offset().left; - this.boxOffsetBottom = this.boxOffsetTop + this.boxHeight; - - var winHeight = Parallax.winHeight; - var docHeight = Parallax.docHeight; - var maxOffset = Math.min(this.boxOffsetTop, docHeight - winHeight); - var minOffset = Math.max(this.boxOffsetTop + this.boxHeight - winHeight, 0); - var imageHeightMin = this.boxHeight + (maxOffset - minOffset) * (1 - this.speed) | 0; - var imageOffsetMin = (this.boxOffsetTop - maxOffset) * (1 - this.speed) | 0; - - if (imageHeightMin * this.aspectRatio >= this.boxWidth) { - this.imageWidth = imageHeightMin * this.aspectRatio | 0; - this.imageHeight = imageHeightMin; - this.offsetBaseTop = imageOffsetMin; - - var margin = this.imageWidth - this.boxWidth; - - if (this.positionX == 'left') { - this.offsetLeft = 0; - } else if (this.positionX == 'right') { - this.offsetLeft = - margin; - } else if (!isNaN(this.positionX)) { - this.offsetLeft = Math.max(this.positionX, - margin); - } else { - this.offsetLeft = - margin / 2 | 0; - } - } else { - this.imageWidth = this.boxWidth; - this.imageHeight = this.boxWidth / this.aspectRatio | 0; - this.offsetLeft = 0; - - var margin = this.imageHeight - imageHeightMin; - - if (this.positionY == 'top') { - this.offsetBaseTop = imageOffsetMin; - } else if (this.positionY == 'bottom') { - this.offsetBaseTop = imageOffsetMin - margin; - } else if (!isNaN(this.positionY)) { - this.offsetBaseTop = imageOffsetMin + Math.max(this.positionY, - margin); - } else { - this.offsetBaseTop = imageOffsetMin - margin / 2 | 0; - } - } - }, - - render: function() { - var scrollTop = Parallax.scrollTop; - var scrollLeft = Parallax.scrollLeft; - var overScroll = this.overScrollFix ? Parallax.overScroll : 0; - var scrollBottom = scrollTop + Parallax.winHeight; - - if (this.boxOffsetBottom > scrollTop && this.boxOffsetTop < scrollBottom) { - this.visibility = 'visible'; - } else { - this.visibility = 'hidden'; - } - this.mirrorTop = this.boxOffsetTop - scrollTop; - this.mirrorLeft = this.boxOffsetLeft - scrollLeft; - this.offsetTop = this.offsetBaseTop - this.mirrorTop * (1 - this.speed); - - this.$mirror.css({ - transform: 'translate3d(0px, 0px, 0px)', - visibility: this.visibility, - top: this.mirrorTop - overScroll, - left: this.mirrorLeft, - height: this.boxHeight, - width: this.boxWidth - }); - - this.$slider.css({ - transform: 'translate3d(0px, 0px, 0px)', - position: 'absolute', - top: this.offsetTop, - left: this.offsetLeft, - height: this.imageHeight, - width: this.imageWidth, - maxWidth: 'none' - }); - } - }); - - - // Parallax Static Methods - - $.extend(Parallax, { - scrollTop: 0, - scrollLeft: 0, - winHeight: 0, - winWidth: 0, - docHeight: 1 << 30, - docWidth: 1 << 30, - sliders: [], - isReady: false, - isFresh: false, - isBusy: false, - - setup: function() { - if (this.isReady) return; - - var $doc = $(document), $win = $(window); - - $win.on('scroll.px.parallax load.px.parallax', function() { - var scrollTopMax = Parallax.docHeight - Parallax.winHeight; - var scrollLeftMax = Parallax.docWidth - Parallax.winWidth; - Parallax.scrollTop = Math.max(0, Math.min(scrollTopMax, $win.scrollTop())); - Parallax.scrollLeft = Math.max(0, Math.min(scrollLeftMax, $win.scrollLeft())); - Parallax.overScroll = Math.max($win.scrollTop() - scrollTopMax, Math.min($win.scrollTop(), 0)); - Parallax.requestRender(); - }) - .on('resize.px.parallax load.px.parallax', function() { - Parallax.winHeight = $win.height(); - Parallax.winWidth = $win.width(); - Parallax.docHeight = $doc.height(); - Parallax.docWidth = $doc.width(); - Parallax.isFresh = false; - Parallax.requestRender(); - }); - - this.isReady = true; - }, - - configure: function(options) { - if (typeof options == 'object') { - delete options.refresh; - delete options.render; - $.extend(this.prototype, options); - } - }, - - refresh: function() { - $.each(this.sliders, function(){ this.refresh() }); - this.isFresh = true; - }, - - render: function() { - this.isFresh || this.refresh(); - $.each(this.sliders, function(){ this.render() }); - }, - - requestRender: function() { - var self = this; - - if (!this.isBusy) { - this.isBusy = true; - window.requestAnimationFrame(function() { - self.render(); - self.isBusy = false; - }); - } - } - }); - - - // Parallax Plugin Definition - - function Plugin(option) { - return this.each(function () { - var $this = $(this); - var options = typeof option == 'object' && option; - - if (this == window || this == document || $this.is('body')) { - Parallax.configure(options); - } - else if (!$this.data('px.parallax')) { - options = $.extend({}, $this.data(), options); - $this.data('px.parallax', new Parallax(this, options)); - } - if (typeof option == 'string') { - Parallax[option](); - } - }) - }; - - var old = $.fn.parallax; - - $.fn.parallax = Plugin; - $.fn.parallax.Constructor = Parallax; - - - // Parallax No Conflict - - $.fn.parallax.noConflict = function () { - $.fn.parallax = old; - return this; - }; - - - // Parallax Data-API - - $(document).on('ready.px.parallax.data-api', function () { - $('[data-parallax="scroll"]').parallax(); - }); - -}(jQuery, window, document)); +// +// parralax.js +// +// Author: +// Paul Schneider +// +// Copyright (c) 2015 GNU GPL +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . + + +$(document).ready(function(){ + var $window = $(window); + var onPos = function (bgobj,dx,dy) { + x=$window.scrollLeft()+dx; + y=$window.scrollTop()+dy; + + var speed = bgobj.data('speed'); + var xPos = bgobj.attr('orgbgpx') - Math.round( x / speed); + var yPos = bgobj.attr('orgbgpy') - Math.round( y / 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 tiltLR=0; + var titleFB=0; + + $('[data-type="background"]').each(function(){ + var $bgobj = $(this); // assigning the object + // get the initial background position, assumes a "X% Yem" ? + var orgpos = $bgobj.css('backgroundPosition'); + var bgpos = orgpos.split(" "); + + var bgposx = bgpos[0]; + var bgposy = bgpos[1]; + if (/%$/.test(bgposx)){ + bgposx = bgposx.substr(0,bgposx.length-1); + $bgobj.attr('orgbgpxu','% '); + } + else if (/em$/.test(bgposx)){ + bgposx = bgposx.substr(0,bgposx.length-2); + $bgobj.attr('orgbgpxu','em '); + } + else if (/px$/.test(bgposx)){ + bgposx = bgposx.substr(0,bgposx.length-2); + $bgobj.attr('orgbgpxu','px '); + } + else { $bgobj.attr('orgbgpxu','px '); } + + if (/%$/.test(bgposy)){ + bgposy = bgposy.substr(0,bgposy.length-1); + $bgobj.attr('orgbgpyu','% '); + } + else if (/em$/.test(bgposy)){ + bgposy = bgposy.substr(0,bgposy.length-2); + $bgobj.attr('orgbgpyu','em '); + } + else if (/px$/.test(bgposy)){ + bgposy = bgposy.substr(0,bgposy.length-2); + $bgobj.attr('orgbgpyu','px '); + } + else { $bgobj.attr('orgbgpyu','px '); } + $bgobj.attr('orgbgpx',parseInt(bgposx)); + $bgobj.attr('orgbgpy',parseInt(bgposy)); + + $(window).scroll(function() { + onPos($bgobj,tiltLR,titleFB); + }); + if (window.DeviceOrientationEvent) { + window.addEventListener('deviceorientation', function(event) { + tiltLR = event.gamma; + titleFB = event.beta; + onPos($bgobj,tiltLR,titleFB); + },false); + $(window).mousemove(function(e) { + tiltLR = e.pageX; + titleFB = e.pageY; + onPos($bgobj,tiltLR,titleFB); + }); + } + }); +}); diff --git a/web/Scripts/parralax.js b/web/Scripts/parralax.js deleted file mode 100644 index 439415ef..00000000 --- a/web/Scripts/parralax.js +++ /dev/null @@ -1,99 +0,0 @@ -// -// parralax.js -// -// Author: -// Paul Schneider -// -// Copyright (c) 2015 GNU GPL -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this program. If not, see . - - -$(document).ready(function(){ - var $window = $(window); - var onPos = function (bgobj,dx,dy) { - x=$window.scrollLeft()+dx; - y=$window.scrollTop()+dy; - - var speed = bgobj.data('speed'); - var xPos = bgobj.attr('orgbgpx') - Math.round( x / speed); - var yPos = bgobj.attr('orgbgpy') - Math.round( y / 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 tiltLR=0; - var titleFB=0; - - - - $('[data-type="background"]').each(function(){ - var $bgobj = $(this); // assigning the object - // get the initial background position, assumes a "X% Yem" ? - var orgpos = $bgobj.css('backgroundPosition'); - var bgpos = orgpos.split(" "); - - var bgposx = bgpos[0]; - var bgposy = bgpos[1]; - if (/%$/.test(bgposx)){ - bgposx = bgposx.substr(0,bgposx.length-1); - $bgobj.attr('orgbgpxu','% '); - } - else if (/em$/.test(bgposx)){ - bgposx = bgposx.substr(0,bgposx.length-2); - $bgobj.attr('orgbgpxu','em '); - } - else if (/px$/.test(bgposx)){ - bgposx = bgposx.substr(0,bgposx.length-2); - $bgobj.attr('orgbgpxu','px '); - } - else { $bgobj.attr('orgbgpxu','px '); } - - if (/%$/.test(bgposy)){ - bgposy = bgposy.substr(0,bgposy.length-1); - $bgobj.attr('orgbgpyu','% '); - } - else if (/em$/.test(bgposy)){ - bgposy = bgposy.substr(0,bgposy.length-2); - $bgobj.attr('orgbgpyu','em '); - } - else if (/px$/.test(bgposy)){ - bgposy = bgposy.substr(0,bgposy.length-2); - $bgobj.attr('orgbgpyu','px '); - } - else { $bgobj.attr('orgbgpyu','px '); } - $bgobj.attr('orgbgpx',parseInt(bgposx)); - $bgobj.attr('orgbgpy',parseInt(bgposy)); - - $(window).scroll(function() { - onPos($bgobj,tiltLR,titleFB); - }); - if (window.DeviceOrientationEvent) { - - // Create an event listener - window.addEventListener('deviceorientation', function(event) { - tiltLR = event.gamma; - titleFB = event.beta; - console.log("DeviceOrientationEvent"); - onPos($bgobj,tiltLR,titleFB); - }); - $(window).mousemove(function(e) { - tiltLR = e.pageX; - titleFB = e.pageY; - onPos($bgobj,tiltLR,titleFB); - }); - } - }); -}); diff --git a/web/Views/Blogs/UserPost.aspx b/web/Views/Blogs/UserPost.aspx index e4347298..aea9c74d 100644 --- a/web/Views/Blogs/UserPost.aspx +++ b/web/Views/Blogs/UserPost.aspx @@ -10,7 +10,7 @@ <% } %>

-"> +"> <%=Model.Title%> - <%= Html.ActionLink((string)ViewData ["BlogTitle"] ,"UserPosts",new{user=Model.Author}, null) %> diff --git a/web/Views/Home/Index.aspx b/web/Views/Home/Index.aspx index dc1a4808..95704808 100644 --- a/web/Views/Home/Index.aspx +++ b/web/Views/Home/Index.aspx @@ -6,7 +6,7 @@ -
+
<%= 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" }) %> diff --git a/web/Web.csproj b/web/Web.csproj index 4782c901..d6b37f06 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -142,6 +142,7 @@ + @@ -398,7 +399,6 @@ - @@ -443,6 +443,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/web/App_Themes/images/animated-overlay.gif b/web/images/animated-overlay.gif similarity index 100% rename from web/App_Themes/images/animated-overlay.gif rename to web/images/animated-overlay.gif diff --git a/web/images/p8-av4.s.jpg b/web/images/p8-av4.s.jpg new file mode 100644 index 00000000..dadca053 Binary files /dev/null and b/web/images/p8-av4.s.jpg differ diff --git a/web/images/star-939235_1280.s.jpg b/web/images/star-939235_1280.s.jpg new file mode 100644 index 00000000..7130232b Binary files /dev/null and b/web/images/star-939235_1280.s.jpg differ diff --git a/web/images/star-939235_1280.xxs.jpg b/web/images/star-939235_1280.xxs.jpg index ac2772a2..9ddad28f 100644 Binary files a/web/images/star-939235_1280.xxs.jpg and b/web/images/star-939235_1280.xxs.jpg differ