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

* styles.json:

Browse source 
* map-load.gif:
* mapstyle.css:
* fit-bounds.png:
* mapstyle-ie.css:
* jquery.googlemaps.js:
* pin-pink.png:
* mapstyle.min.css:
* pin-green.png:
* pin-azure.png:
* flag-azure.png:
* flag-green.png:
* needle-pink.png:
* jquery.googlemaps.min.js:
* current-location.png:
* niddle-green.png:
* popup-template-marker.html:
* popup-template-circle.html:
* popup-template-polygon.html:
* popup-template-polyline.html:
* popup-template-rectangle.html: GoogleMaps related add

* AccountController.cs: Fixes the conflict between external and custom
  avatar

* BasketController.cs: (Revert to revision
  93c18633b9)

* BlogsController.cs: Removes unused statment

* style.css:
* UserPost.aspx:
* UserPosts.aspx: an Avatar

* Web.csproj: Google Maps references and resources

* packages.config: Adds GoogleMapsHelpers, JQuery.GoogleMaps and
  MVC.GoogleMaps references

* NpgsqlWorkflow.csproj: The project now references Newtonsoft.Json

* NpgsqlContentProvider.cs: Saves the command parameters
This commit is contained in:
Paul Schneider 2015-02-08 01:01:08 +01:00
commit 630ddee841
31 changed files with 1602 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
web/Controllers/BlogsController.cs
View file

@ -155,7 +155,7 @@ namespace Yavsc.Controllers
return View ("TitleNotFound");
ViewData ["BlogUserProfile"] = pr;
ViewData ["BlogTitle"] = pr.BlogTitle;
ViewData ["HasAvatar"] = pr.avatar != null;
ViewData ["Avatar"] = pr.avatar;
MembershipUser u = Membership.GetUser ();
if (u != null)
ViewData ["UserName"] = u.UserName;
@ -302,6 +302,9 @@ namespace Yavsc.Controllers
if (avpath==null) {
FileInfo fia = new FileInfo (Server.MapPath (defaultAvatar));
return File (fia.OpenRead (), defaultAvatarMimetype);
}
if (avpath.StartsWith ("~/")) {
}
WebRequest wr = WebRequest.Create(avpath);
FileContentResult res;