Bug fixe: comnet avatar

* web/Controllers/AccountController.cs: Fixes the avatar icon in comments

* .gitignore: ignore `bfiles`

* web/images/musician-923526_1.nb.jpg:
* web/images/musician-923526_1.nb.xs.jpg:
* web/images/musician-923526_1.nb.xxs.jpg:
* web/images/musician-923526_1.nbb.jpg:
* web/images/musician-923526_1.nbb.xs.jpg:
* web/images/musician-923526_1.nbb.xxs.jpg:
* totem-banner.xxs.xcf:
* totem.xcf: totem custo
vnext
Paul Schneider 9 years ago
parent 30cebd7751
commit 3fd8578c07
12 changed files with 58 additions and 38 deletions

1
.gitignore vendored

@ -13,3 +13,4 @@ svg
.nuget .nuget
.gitignore .gitignore
web/bfiles

Binary file not shown.

Binary file not shown.

@ -37,16 +37,17 @@ nav {
padding: 2em; padding: 2em;
display: block; display: block;
border-radius:1em; border-radius:1em;
background: url("/images/live-concert-388160_1280.s.jpg") 50% 10em repeat fixed ; background: url("/images/live-concert-388160_1280.jpg") 50% 10em repeat fixed ;
justify-content: space-around; justify-content: space-around;
min-height:5em;
} }
main { main {
margin: 2em; margin: 2em;
padding: 2em; padding: 6em 2em 6em 2em;
display: block; display: block;
border-radius:1em; border-radius:1em;
background: url("/images/musician-923526_1280.s.jpg") 50% 20em repeat fixed ; background: url("/images/musician-923526_1.nbb.jpg") 50% 20em repeat fixed ;
} }
footer { footer {
@ -133,14 +134,14 @@ textarea.fullwidth { min-height:10em; }
.panel,.bshpanel, aside { .panel,.bshpanel, aside {
background-color: rgba(20,20,20,.8); background-color: rgba(20,20,20,.8);
border-radius:5px; border-radius: 5px;
margin:.5em; margin: .5em;
padding: .5em; padding: .5em;
} }
.spanel { .spanel {
max-width:24em; max-width: 24em;
display: inline-block; display: inline-block;
margin:.3em; margin: .3em;
} }
.xspanel { .xspanel {
max-width:13em; max-width:13em;
@ -178,13 +179,13 @@ a:visited {
label { label {
font-size: medium; font-size: medium;
} }
.editable { .editable {
margin 1em; margin 1em;
min-height:1em; min-height:1em;
border-radius: 1em; border-radius: 1em;
border: dashed rgb(020,20,256) 2px; border: dashed rgb(020,20,256) 2px;
} }
#notifications { #notifications {
padding: .5em; padding: .5em;
} }
@ -302,24 +303,21 @@ input, select {
} }
@media all and (max-width: 640px) { @media all and (max-width: 640px) {
header {
margin-bottom:1em;
background: url("/images/totem-banner.xs.jpg") 0 0 no-repeat fixed;
}
nav { nav {
margin: 1em; margin: 1em;
padding: 1em; padding: 1em;
background: url("/images/live-concert-388160_1280.xxs.jpg") 50% 10% repeat fixed ; min-height:4em;
background: url("/images/live-concert-388160_1280.s.jpg") 50% 10% repeat fixed ;
} }
main { main {
margin: 1em; margin: 1em;
padding: 1em; padding: 4em 1em 4em 1em;
background: url("/images/musician-923526_1280.xxs.jpg") 50% 20em repeat fixed ; background: url("/images/musician-923526_1.nbb.xs.jpg") 50% 20em repeat fixed ;
} }
footer { footer {
background: url("/images/drummer-652345_1280.xxs.jpg") 50% 90% repeat fixed ; background: url("/images/drummer-652345_1280.xs.jpg") 50% 90% repeat fixed ;
padding: 1em; padding: 1em;
margin: 1em;
} }
.menuitem { .menuitem {
display: block; display: block;
@ -342,19 +340,30 @@ header {
@media all and (max-width: 350px) { @media all and (max-width: 350px) {
header { header {
padding: 0;
margin: 0;
margin-top: 0;
padding-top: 101px; padding-top: 101px;
margin-bottom:1em;
background: url("/images/totem-banner.xxs.jpg") 0 0 no-repeat fixed; background: url("/images/totem-banner.xxs.jpg") 0 0 no-repeat fixed;
} }
nav { nav {
margin: 0.3em; margin: .5em;
padding: 0.3em; padding: .5em;
min-height:3em;
background: url("/images/live-concert-388160_1280.xxs.jpg") 50% 10% repeat fixed ;
} }
main { main {
margin: 0.3em; margin: .5em;
padding: 0.3em;} padding: 3em .5em 3em .5em;
background: url("/images/musician-923526_1.nbb.xxs.jpg") 50% 20em repeat fixed ;
}
footer {
background: url("/images/drummer-652345_1280.xxs.jpg") 50% 90% repeat fixed ;
padding: 0em; margin: 0.5em;
margin: 0em; padding: 0.5em;
}
.c2 { display:none; } .c2 { display:none; }
.c2-alt { display:initial; } .c2-alt { display:initial; }
} }

@ -33,21 +33,25 @@ namespace Yavsc.Controllers
/// <summary> /// <summary>
/// Avatar the specified user. /// Avatar the specified user.
/// </summary> /// </summary>
/// <param name="user">User.</param> /// <param name="id">User.</param>
[AcceptVerbs (HttpVerbs.Get)] [AcceptVerbs (HttpVerbs.Get)]
public ActionResult Avatar (string user) public ActionResult Avatar (string id)
{ {
ProfileBase pr = ProfileBase.Create (user); if (id == null)
string avpath = (string ) pr.GetPropertyValue("Avatar") ; return new EmptyResult ();
ProfileBase pr = ProfileBase.Create (id);
var avpath = pr.GetPropertyValue("Avatar");
if (avpath == null) { if (avpath == null) {
FileInfo fia = new FileInfo (Server.MapPath (defaultAvatar)); FileInfo fia = new FileInfo (Server.MapPath (defaultAvatar));
return File (fia.OpenRead (), defaultAvatarMimetype); return File (fia.OpenRead (), defaultAvatarMimetype);
} }
if (avpath.StartsWith ("~/")) { string avatarLocation = avpath as string;
avpath = Server.MapPath (avpath); if (avatarLocation.StartsWith ("~/")) {
avatarLocation = Server.MapPath (avatarLocation);
} }
WebRequest wr = WebRequest.Create (avpath); WebRequest wr = WebRequest.Create (avatarLocation);
FileContentResult res; FileContentResult res;
using (WebResponse resp = wr.GetResponse ()) { using (WebResponse resp = wr.GetResponse ()) {
using (Stream str = resp.GetResponseStream ()) { using (Stream str = resp.GetResponseStream ()) {

@ -422,6 +422,12 @@
<Content Include="images\totem-banner.png" /> <Content Include="images\totem-banner.png" />
<Content Include="images\totem-banner.xxs.jpg" /> <Content Include="images\totem-banner.xxs.jpg" />
<Content Include="images\totem-banner.xs.jpg" /> <Content Include="images\totem-banner.xs.jpg" />
<Content Include="images\musician-923526_1.nb.jpg" />
<Content Include="images\musician-923526_1.nb.xs.jpg" />
<Content Include="images\musician-923526_1.nb.xxs.jpg" />
<Content Include="images\musician-923526_1.nbb.jpg" />
<Content Include="images\musician-923526_1.nbb.xs.jpg" />
<Content Include="images\musician-923526_1.nbb.xxs.jpg" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Loading…