diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index 31032385..47f0962b 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -39,6 +39,11 @@ body.loading .modal { } .iconsmall { max-height: 1.3em; max-width: 1.3em; } +input, textarea, checkbox { + color: #FFFFA0; + background-color: black; + } + .photo { width: 100%; } .blogbanner { float: left; top:0; } .subtitle { font-size:small; font-style: italic; } @@ -48,7 +53,7 @@ header { padding-top: 201px; padding-bottom:2em; display: block; - background: url("/images/totem-banner.xs.jpg") 0 0 no-repeat fixed; + background: url("/images/star-939235_1280.jpg") 0 0 no-repeat fixed; } header h1, header a { background-color: rgba(0,0,0,.5); @@ -60,7 +65,7 @@ nav { padding: 2em; display: block; border-radius:1em; - background: url("/images/live-concert-388160_1280.jpg") 50% 10em repeat fixed ; + background: url("/images/helix-nebula-1400x1400.s.jpg") 50% 10% repeat fixed ; justify-content: space-around; } @@ -69,11 +74,11 @@ main { padding: 2em; display: block; border-radius:1em; - background: url("/images/musician-923526_1.nbb.jpg") 50% 20em repeat fixed ; + background: url("/images/p8-av4.png") 50% 20em no-repeat fixed ; } footer { - background: url("/images/drummer-652345_1280.s.jpg") 50% 30em repeat fixed ; + background: url("/images/helix-nebula-1400x1400.s.jpg") 50% 90% repeat fixed ; margin: 0; margin-top: 2em; padding: 2em; @@ -314,8 +319,8 @@ input, select, textarea { @media all and (max-width: 640px) { header { padding-bottom:1em; - } - + } + #avatar { margin:.5em; } @@ -325,15 +330,14 @@ header h1, header a , .actionlink, .menuitem, a { padding:.5em;} nav { margin: 1em; padding: 1em; - background: url("/images/live-concert-388160_1280.s.jpg") 50% 10% repeat fixed ; + background: url("/images/helix-nebula-1400x1400.s.jpg") 50% 10% repeat fixed ; } main { margin: 1em; padding: 1em; - background: url("/images/musician-923526_1.nbb.xs.jpg") 50% 20em repeat fixed ; } footer { - background: url("/images/drummer-652345_1280.s.jpg") 50% 90% repeat fixed ; + background: url("/images/helix-nebula-1400x1400.s.jpg") 50% 90% repeat fixed ; } footer a { border-radius:.5em; @@ -365,22 +369,22 @@ header h1, header a , .actionlink, .menuitem, a { padding:.5em;} header { padding-top: 101px; padding-bottom:1em; - background: url("/images/totem-banner.xxs.jpg") 0 0 no-repeat fixed; + background: url("/images/star-939235_1280.xxs.jpg") 0 0 no-repeat fixed; } header h1, header a { padding:.2em;} nav { margin: .5em; padding: .5em; - background: url("/images/live-concert-388160_1280.xxs.jpg") 50% 10% repeat fixed ; + background: url("/images/helix-nebula-1400x1400.xxs.jpg") 50% 10% repeat fixed ; } main { margin: .5em; padding: .5em; - background: url("/images/musician-923526_1.nbb.xxs.jpg") 50% 20em repeat fixed ; + background: url("/images/p8-av4.xxs.jpg") 50% 20em repeat fixed ; } footer { - background: url("/images/drummer-652345_1280.xxs.jpg") 50% 90% repeat fixed ; + background: url("/images/helix-nebula-1400x1400.xxs.jpg") 50% 10% repeat fixed ; } footer a { border-radius:.2em; diff --git a/web/ChangeLog b/web/ChangeLog index a512c2df..965c18c0 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,36 @@ +2015-10-20 Paul Schneider + + * Web.config: + * Web.csproj: + * totem.jpg: + * App.master: + * twiter.png: + * facebook.png: + * totemprod.png: + * style.css: + * p8-av4.xxs.png: + * totem-banner.png: + * YavscHelpers.cs: + * concert.clear.jpg: + * totem-banner.xs.jpg: + * totem-banner.xxs.jpg: + * drummer-652345_1280.jpg: + * musician-923526_1.nb.jpg: + * musician-923526_1280.jpg: + * drummer-652345_1280.s.jpg: + * an-pierle-876094_1280.jpg: + * musician-923526_1.nbb.jpg: + * musician-923526_1280.s.jpg: + * drummer-652345_1280.xxs.jpg: + * musician-923526_1.nb.xs.jpg: + * live-concert-388160_1280.jpg: + * musician-923526_1280.xxs.jpg: + * musician-923526_1.nb.xxs.jpg: + * musician-923526_1.nbb.xs.jpg: + * musician-923526_1.nbb.xxs.jpg: + * live-concert-388160_1280.s.jpg: + * live-concert-388160_1280.xxs.jpg: + 2015-10-19 Paul Schneider * Web.csproj: diff --git a/web/Helpers/YavscHelpers.cs b/web/Helpers/YavscHelpers.cs index b2a935b8..64e0366b 100644 --- a/web/Helpers/YavscHelpers.cs +++ b/web/Helpers/YavscHelpers.cs @@ -158,15 +158,15 @@ namespace Yavsc.Helpers /// Helper. /// Username. public static string AvatarUrl (this System.Web.Mvc.UrlHelper helper, string username) { - if (username == null) - return null; + if (username == null) return null; ProfileBase pr = ProfileBase.Create (username); object avpath = null; if (pr != null) avpath = pr.GetPropertyValue("Avatar"); - if (avpath == null) return DefaultAvatar==null?"/bfiles/"+username+".png":DefaultAvatar; + if (avpath == null || avpath is DBNull) + return DefaultAvatar==null?"/bfiles/"+username+".png":DefaultAvatar; string avatarLocation = avpath as string; if (avatarLocation.StartsWith ("~/")) { - avatarLocation = helper.RequestContext.HttpContext.Server.MapPath(avatarLocation); + avatarLocation = helper.RouteUrl("Default", avatarLocation); } return avatarLocation; diff --git a/web/Models/App.master b/web/Models/App.master index b225d184..cf618159 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -79,22 +79,21 @@ Yavsc.notice('<%=note%>'); diff --git a/web/Models/NoLogin.master b/web/Models/NoLogin.master index 4945367d..2cb237ac 100644 --- a/web/Models/NoLogin.master +++ b/web/Models/NoLogin.master @@ -2,75 +2,64 @@ - -<% ViewState["orgtitle"] = Html.Translate(Page.Title); +<% +ViewState["orgtitle"] = T.GetString(Page.Title); Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName; %> -" /> -" /> -" /> + - - - - - + + -
+
-

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

-
- -
-<%if (ViewData ["Notifications"]!=null) { %> - -<% } %> +

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

+ <% + if (ViewData["Error"]!=null) { + %>
<%= Html.Encode(ViewData["Error"]) %> +
<% } + if (ViewData["Message"]!=null) { + %>
<%= Html.Encode(ViewData["Message"]) %>
<% } + %>
-
+
-
-
-© 2012 Totem Production. Tous droits réservés. -
-
-

-<%= Html.ActionLink("Formulaire de contact","Contact","Home") %> -

-

-facebook -twiter -

- -
-
-
-
+ <%= Html.ActionLink("Contact","Contact","Home",null, new { @class="thanks" }) %> + <% foreach ( Link link in Html.Thanks()) { %> + <% if (link.Image !=null) { + %><%= link.Text %><% + } else { %><%= link.Text %><% }} %> +
+ + diff --git a/web/Web.config b/web/Web.config index 17f13eb4..fe6af844 100644 --- a/web/Web.config +++ b/web/Web.config @@ -85,7 +85,6 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - @@ -100,10 +99,9 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - - - - + + + @@ -251,19 +249,19 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - + - - - + + + - + diff --git a/web/Web.csproj b/web/Web.csproj index c80b5e42..5ed2e53d 100644 --- a/web/Web.csproj +++ b/web/Web.csproj @@ -373,18 +373,7 @@ - - - - - - - - - - - @@ -408,22 +397,8 @@ - - - - - - - - - - - - - - diff --git a/web/images/an-pierle-876094_1280.jpg b/web/images/an-pierle-876094_1280.jpg deleted file mode 100644 index 6979be62..00000000 Binary files a/web/images/an-pierle-876094_1280.jpg and /dev/null differ diff --git a/web/images/concert.clear.jpg b/web/images/concert.clear.jpg deleted file mode 100644 index 2797adbc..00000000 Binary files a/web/images/concert.clear.jpg and /dev/null differ diff --git a/web/images/drummer-652345_1280.jpg b/web/images/drummer-652345_1280.jpg deleted file mode 100644 index 74d44df0..00000000 Binary files a/web/images/drummer-652345_1280.jpg and /dev/null differ diff --git a/web/images/drummer-652345_1280.s.jpg b/web/images/drummer-652345_1280.s.jpg deleted file mode 100644 index 4d6e6f7e..00000000 Binary files a/web/images/drummer-652345_1280.s.jpg and /dev/null differ diff --git a/web/images/drummer-652345_1280.xxs.jpg b/web/images/drummer-652345_1280.xxs.jpg deleted file mode 100644 index 6a2c304e..00000000 Binary files a/web/images/drummer-652345_1280.xxs.jpg and /dev/null differ diff --git a/web/images/facebook.png b/web/images/facebook.png deleted file mode 100644 index f76fa1fc..00000000 Binary files a/web/images/facebook.png and /dev/null differ diff --git a/web/images/live-concert-388160_1280.jpg b/web/images/live-concert-388160_1280.jpg deleted file mode 100644 index abb4fbdf..00000000 Binary files a/web/images/live-concert-388160_1280.jpg and /dev/null differ diff --git a/web/images/live-concert-388160_1280.s.jpg b/web/images/live-concert-388160_1280.s.jpg deleted file mode 100644 index e4c5d6bf..00000000 Binary files a/web/images/live-concert-388160_1280.s.jpg and /dev/null differ diff --git a/web/images/live-concert-388160_1280.xxs.jpg b/web/images/live-concert-388160_1280.xxs.jpg deleted file mode 100644 index c399ff2a..00000000 Binary files a/web/images/live-concert-388160_1280.xxs.jpg and /dev/null differ diff --git a/web/images/musician-923526_1.nb.jpg b/web/images/musician-923526_1.nb.jpg deleted file mode 100644 index d88e7910..00000000 Binary files a/web/images/musician-923526_1.nb.jpg and /dev/null differ diff --git a/web/images/musician-923526_1.nb.xs.jpg b/web/images/musician-923526_1.nb.xs.jpg deleted file mode 100644 index 42c7a360..00000000 Binary files a/web/images/musician-923526_1.nb.xs.jpg and /dev/null differ diff --git a/web/images/musician-923526_1.nb.xxs.jpg b/web/images/musician-923526_1.nb.xxs.jpg deleted file mode 100644 index 9220785c..00000000 Binary files a/web/images/musician-923526_1.nb.xxs.jpg and /dev/null differ diff --git a/web/images/musician-923526_1.nbb.jpg b/web/images/musician-923526_1.nbb.jpg deleted file mode 100644 index a599a28c..00000000 Binary files a/web/images/musician-923526_1.nbb.jpg and /dev/null differ diff --git a/web/images/musician-923526_1.nbb.xs.jpg b/web/images/musician-923526_1.nbb.xs.jpg deleted file mode 100644 index 1dcd6009..00000000 Binary files a/web/images/musician-923526_1.nbb.xs.jpg and /dev/null differ diff --git a/web/images/musician-923526_1.nbb.xxs.jpg b/web/images/musician-923526_1.nbb.xxs.jpg deleted file mode 100644 index efddc883..00000000 Binary files a/web/images/musician-923526_1.nbb.xxs.jpg and /dev/null differ diff --git a/web/images/musician-923526_1280.jpg b/web/images/musician-923526_1280.jpg deleted file mode 100644 index 648150c1..00000000 Binary files a/web/images/musician-923526_1280.jpg and /dev/null differ diff --git a/web/images/musician-923526_1280.s.jpg b/web/images/musician-923526_1280.s.jpg deleted file mode 100644 index ffabe2e2..00000000 Binary files a/web/images/musician-923526_1280.s.jpg and /dev/null differ diff --git a/web/images/musician-923526_1280.xxs.jpg b/web/images/musician-923526_1280.xxs.jpg deleted file mode 100644 index 3de92207..00000000 Binary files a/web/images/musician-923526_1280.xxs.jpg and /dev/null differ diff --git a/web/images/p8-av4.xxs.png b/web/images/p8-av4.xxs.png deleted file mode 100644 index 629f7bcd..00000000 Binary files a/web/images/p8-av4.xxs.png and /dev/null differ diff --git a/web/images/totem-banner.png b/web/images/totem-banner.png deleted file mode 100644 index 56012570..00000000 Binary files a/web/images/totem-banner.png and /dev/null differ diff --git a/web/images/totem-banner.xs.jpg b/web/images/totem-banner.xs.jpg deleted file mode 100644 index 60eb807b..00000000 Binary files a/web/images/totem-banner.xs.jpg and /dev/null differ diff --git a/web/images/totem-banner.xxs.jpg b/web/images/totem-banner.xxs.jpg deleted file mode 100644 index 878aa2ec..00000000 Binary files a/web/images/totem-banner.xxs.jpg and /dev/null differ diff --git a/web/images/totem.jpg b/web/images/totem.jpg deleted file mode 100644 index 2c434a59..00000000 Binary files a/web/images/totem.jpg and /dev/null differ diff --git a/web/images/totemprod.png b/web/images/totemprod.png deleted file mode 100644 index 4c22ce16..00000000 Binary files a/web/images/totemprod.png and /dev/null differ diff --git a/web/images/twiter.png b/web/images/twiter.png deleted file mode 100644 index 75ab78a8..00000000 Binary files a/web/images/twiter.png and /dev/null differ