paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 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
  93c18633b98b66feb90f6883e2d05a6aa1334134)

* 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
parent 0ec856db45
commit 630ddee841
31 changed files with 1602 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WorkFlowProvider/NpgsqlContentProvider.cs
View File

@ -4,10 +4,10 @@ using NpgsqlTypes;
using System.Configuration;
using System.Collections.Specialized;
using Yavsc.Model.WorkFlow;
using System.Web.Mvc;
using System.Configuration.Provider;
using System.Collections.Generic;
using Yavsc.Model.FrontOffice;
using Newtonsoft.Json;
namespace WorkFlowProvider
{
@ -19,9 +19,10 @@ namespace WorkFlowProvider
using (NpgsqlConnection cnx = CreateConnection ()) {
using (NpgsqlCommand cmd = cnx.CreateCommand ()) {
cmd.CommandText =
"insert into commandes (prdref,creation) values (@pref,@creat) returning id";
"insert into commandes (prdref,creation,params) values (@pref,@creat,@prs) returning id";
cmd.Parameters.Add ("@pref", com.ProdRef);
cmd.Parameters.Add ("@creat", com.CreationDate);
cmd.Parameters.Add ("@prs", JsonConvert.SerializeObject(com.Parameters));
cnx.Open ();
com.Id = id = (long)cmd.ExecuteScalar ();
}

4
WorkFlowProvider/NpgsqlWorkflow.csproj
View File

@ -36,6 +36,10 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Web.Mvc" />
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\..\..\..\..\usr\lib\mono\4.5\System.Net.Http.Formatting.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />

5
web/Controllers/AccountController.cs
View File

@ -271,6 +271,7 @@ namespace Yavsc.Controllers
/// <param name="AvatarFile">Avatar file.</param>
[Authorize]
[HttpPost]
// ASSERT("Membership.GetUser ().UserName is made of simple characters, no slash nor backslash"
public ActionResult Profile (Profile model, HttpPostedFileBase AvatarFile)
{
string username = Membership.GetUser ().UserName;
@ -282,9 +283,7 @@ namespace Yavsc.Controllers
string avdir = Server.MapPath (AvatarDir);
string avpath = Path.Combine (avdir, username + ".png");
AvatarFile.SaveAs (avpath);
model.avatar =
Path.Combine(AvatarDir.Substring(1),username)+".png";
model.avatar = Request.Url.Scheme+ "://"+ Request.Url.Authority + AvatarDir.Substring (1)+ "/" + username + ".png";
} else
ModelState.AddModelError ("Avatar",
string.Format ("Image type {0} is not supported (suported formats : {1})",

13
web/Controllers/BasketController.cs
View File

@ -26,6 +26,7 @@ namespace Yavsc.ApiControllers
base.Initialize (controllerContext);
wfmgr = new WorkFlowManager ();
}
/// <summary>
/// Validates the order.
///
@ -52,17 +53,5 @@ namespace Yavsc.ApiControllers
//return WFManager.Write(estid << from the basket, desc, ucost, count, productid);
throw new NotImplementedException ();
}
/// <summary>
/// Yours the estimates.
/// </summary>
/// <returns>The estimates.</returns>
[HttpGet]
[Authorize]
public Estimate[] YourEstimates()
{
return wfmgr.GetEstimates (
Membership.GetUser().UserName);
}
}
}

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;

3
web/Scripts/css/mapstyle-ie.css Normal file
View File

@ -0,0 +1,3 @@
.popup-content input[type=color] {
display:none;
}

207
web/Scripts/css/mapstyle.css Normal file
View File

@ -0,0 +1,207 @@
.google-map, .map-overlay
{
background-color: #DBDBDB;
background-image: url('../../src/img/map-load.gif');
background-position: center center;
background-repeat: no-repeat;
}
.map-overlay
{
background-color: rgba(219,219,219,0.5);
position: absolute;
display: none;
}
.map-overlay .btn-close
{
top: 50%;
margin-top: 80px;
margin-left: calc(50% - 40px);
position: absolute;
}
.popup-content input[type=color]
{
-webkit-appearance: none;
-moz-appearance: none;
/*border: 1px solid #ccc;*/
border: none;
border-radius: 3px;
display: inline-block;
height: 25px;
padding: 0px !important;
vertical-align: middle;
width: 25px;
}
.popup-content .btn-popup-delete, .popup-content .btn-popup-save, .popup-content .btn-popup-cancel, .map-overlay .btn-close
{
border: 1px solid #df0909;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
font-size: 12px;
font-family: arial, helvetica, sans-serif;
padding: 5px 5px 5px 5px;
text-decoration: none;
display: inline-block;
text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
font-weight: bold;
color: #FFFFFF;
background-color: #f62b2b;
min-width: 85px;
background-image: linear-gradient(to bottom, #f62b2b, #d20202);
}
.popup-content .btn-popup-delete:hover, .map-overlay .btn-close:hover
{
border: 1px solid #b30808;
background-color: #e40a0a;
background-image: linear-gradient(to bottom, #e40a0a, #9f0202);
}
.popup-content .btn-popup-cancel
{
color: #fef4e9;
border: solid 1px #da7c0c;
background: #f78d1d;
background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20));
background: -moz-linear-gradient(top, #faa51a, #f47a20);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20');
margin-right: 30px;
}
.popup-content .btn-popup-cancel:hover
{
background: #f47c20;
background: -webkit-gradient(linear, left top, left bottom, from(#f88e11), to(#f06015));
background: -moz-linear-gradient(top, #f88e11, #f06015);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f88e11', endColorstr='#f06015');
}
.popup-content .btn-popup-save
{
color: #e8f0de;
border: solid 1px #538312;
background: #64991e;
background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
background: -moz-linear-gradient(top, #7db72f, #4e7d0e);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e');
}
.popup-content .btn-popup-save:hover
{
background: #538018;
background: -webkit-gradient(linear, left top, left bottom, from(#6b9d28), to(#436b0c));
background: -moz-linear-gradient(top, #6b9d28, #436b0c);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6b9d28', endColorstr='#436b0c');
}
.popup-content input[type=text], .popup-content input[type=number], .popup-content select, .popup-content textarea
{
border: 1px solid #CCCCCC;
border-radius: 3px;
padding: 3px;
}
.popup-content textarea
{
height: 100px;
width: 530px;
}
.popup-content textarea.richtext-fix
{
margin-bottom: 35px;
}
.popup-content input[type=text], .popup-content input[type=number], .popup-content select
{
width: 150px;
}
.popup-content table tr
{
padding-top: 6px;
padding-bottom: 6px;
}
.error-icon
{
margin-left: 4px;
vertical-align: middle;
}
.fit-bound, .current-location, .map-style
{
margin-left: -4px;
margin-top: 5px;
background-color: #ffffff;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 2px;
box-shadow: 0 1px 4px -1px rgba(0, 0, 0, 0.3);
width: 26px;
height: 26px;
z-index: 999;
background-image: url(../img/fit-bounds.png);
background-position: center center;
background-repeat: no-repeat;
cursor: pointer;
}
.map-style
{
min-width:100px;
background-image:none;
width:auto !important;
}
.current-location
{
background-image: url(../img/current-location.png);
margin-left: 0px;
}
.fit-bound:hover, .current-location:hover
{
background-color: #EBEBEB;
}
/*JQuery simple color picker*/
html, body
{
height: 100%;
}
div.color-picker
{
border-left: 1px solid #000;
border-top: 1px solid #000;
position: absolute;
left: 0px;
top: 0px;
padding: 0px;
}
div.color-picker ul
{
list-style: none;
padding: 0px;
margin: 0px;
float: left;
}
div.color-picker ul li
{
display: block;
width: 15px;
height: 15px;
border-right: 1px solid #000;
border-bottom: 1px solid #000;
margin: 0px;
float: left;
cursor: pointer;
}

1
web/Scripts/css/mapstyle.min.css vendored Normal file
View File

@ -0,0 +1 @@
.google-map,.map-overlay{background-color:#DBDBDB;background-image:url(../../src/img/map-load.gif);background-position:center center;background-repeat:no-repeat}.map-overlay{background-color:rgba(219,219,219,.5);position:absolute;display:none}.map-overlay .btn-close{top:50%;margin-top:80px;margin-left:calc(50% - 40px);position:absolute}.popup-content input[type=color]{-webkit-appearance:none;-moz-appearance:none;border:none;border-radius:3px;display:inline-block;height:25px;padding:0!important;vertical-align:middle;width:25px}.map-overlay .btn-close,.popup-content .btn-popup-cancel,.popup-content .btn-popup-delete,.popup-content .btn-popup-save{border:1px solid #df0909;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;font-size:12px;font-family:arial,helvetica,sans-serif;padding:5px;text-decoration:none;display:inline-block;text-shadow:-1px -1px 0 rgba(0,0,0,.3);font-weight:700;color:#FFF;background-color:#f62b2b;min-width:85px;background-image:linear-gradient(to bottom,#f62b2b,#d20202)}.map-overlay .btn-close:hover,.popup-content .btn-popup-delete:hover{border:1px solid #b30808;background-color:#e40a0a;background-image:linear-gradient(to bottom,#e40a0a,#9f0202)}.popup-content .btn-popup-cancel{color:#fef4e9;border:1px solid #da7c0c;background:#f78d1d;background:-webkit-gradient(linear,left top,left bottom,from(#faa51a),to(#f47a20));background:-moz-linear-gradient(top,#faa51a,#f47a20);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20');margin-right:30px}.popup-content .btn-popup-cancel:hover{background:#f47c20;background:-webkit-gradient(linear,left top,left bottom,from(#f88e11),to(#f06015));background:-moz-linear-gradient(top,#f88e11,#f06015);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f88e11', endColorstr='#f06015')}.popup-content .btn-popup-save{color:#e8f0de;border:1px solid #538312;background:#64991e;background:-webkit-gradient(linear,left top,left bottom,from(#7db72f),to(#4e7d0e));background:-moz-linear-gradient(top,#7db72f,#4e7d0e);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e')}.popup-content .btn-popup-save:hover{background:#538018;background:-webkit-gradient(linear,left top,left bottom,from(#6b9d28),to(#436b0c));background:-moz-linear-gradient(top,#6b9d28,#436b0c);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#6b9d28', endColorstr='#436b0c')}.popup-content input[type=number],.popup-content input[type=text],.popup-content select,.popup-content textarea{border:1px solid #CCC;border-radius:3px;padding:3px}.popup-content textarea{height:100px;width:530px}.popup-content textarea.richtext-fix{margin-bottom:35px}.popup-content input[type=number],.popup-content input[type=text],.popup-content select{width:150px}.popup-content table tr{padding-top:6px;padding-bottom:6px}.error-icon{margin-left:4px;vertical-align:middle}.current-location,.fit-bound,.map-style{margin-left:-4px;margin-top:5px;background-color:#fff;border:1px solid rgba(0,0,0,.15);border-radius:2px;box-shadow:0 1px 4px -1px rgba(0,0,0,.3);width:26px;height:26px;z-index:999;background-image:url(../img/fit-bounds.png);background-position:center center;background-repeat:no-repeat;cursor:pointer}.map-style{min-width:100px;background-image:none;width:auto!important}.current-location{background-image:url(../img/current-location.png);margin-left:0}.current-location:hover,.fit-bound:hover{background-color:#EBEBEB}body,html{height:100%}div.color-picker{border-left:1px solid #000;border-top:1px solid #000;position:absolute;left:0;top:0;padding:0}div.color-picker ul{list-style:none;padding:0;margin:0;float:left}div.color-picker ul li{display:block;width:15px;height:15px;border-right:1px solid #000;border-bottom:1px solid #000;margin:0;float:left;cursor:pointer}

40
web/Scripts/html/popup-template-circle.html Normal file
View File

@ -0,0 +1,40 @@
<div class="popup-content">
<textarea cols="75" rows="10" class="richtext-fix"></textarea>
<table border="0">
<tr>
<td>Center coordinates</td>
<td><input type="number" min="1" step="any" name="centerLat" />&nbsp;<input type="number" min="1" step="any" name="centerLng" /></td>
</tr>
<tr>
<td>Radius</td>
<td><input type="number" min="1" step="any" name="radius" /></td>
</tr>
<tr>
<td>Border width</td>
<td><input type="number" min="1" name="borderWidth" /></td>
</tr>
<tr>
<td>Border color</td>
<td>
<input type="text" name="strokeColor" id="strokeColor" />
<input type="color" name="strokeColorPicker" id="strokeColorPicker" />
</td>
</tr>
<tr>
<td>Fill color</td>
<td>
<input type="text" name="fillColor" id="fillColor" />
<input type="color" name="fillColorPicker" id="fillColorPicker" />
</td>
</tr>
<tr>
<td colspan="2" align="right">
<input type="button" class="btn-popup-save" value="Save" />
<input type="button" class="btn-popup-cancel" value="Cancel" />
<input type="button" class="btn-popup-delete" value="Delete" />
</td>
</tr>
</table>
<input type="hidden" name="changed" value="false" />
</div>

32
web/Scripts/html/popup-template-marker.html Normal file
View File

@ -0,0 +1,32 @@
<div class="popup-content">
<textarea cols="75" rows="10" class="richtext-fix"></textarea>
<table border="0">
<tr>
<td>Coordinates</td>
<td>
<input type="number" min="1" name="locationLat" step="any" />&nbsp;<input type="number" name="locationLng" step="any" /></td>
</tr>
<tr>
<td>Icon
</td>
<td>
<select name="icon">
<option value="">default</option>
</select>
<select name="hover-icon">
<option value="">none</option>
</select>
</td>
</tr>
<tr>
<td colspan="2" align="right">
<input type="button" class="btn-popup-save" value="Save" />
<input type="button" class="btn-popup-cancel" value="Cancel" />
<input type="button" class="btn-popup-delete" value="Delete" />
</td>
</tr>
</table>
<input type="hidden" name="changed" value="false" />
</div>

32
web/Scripts/html/popup-template-polygon.html Normal file
View File

@ -0,0 +1,32 @@
<div class="popup-content">
<textarea cols="75" rows="10" class="richtext-fix"></textarea>
<table border="0">
<tr>
<td>Border width</td>
<td>
<input type="number" min="1" name="borderWidth" /></td>
</tr>
<tr>
<td>Border color</td>
<td>
<input type="text" name="strokeColor" id="strokeColor" />
<input type="color" name="strokeColorPicker" id="strokeColorPicker" />
</td>
</tr>
<tr>
<td>Fill color</td>
<td>
<input type="text" name="fillColor" id="fillColor" />
<input type="color" name="fillColorPicker" id="fillColorPicker" />
</td>
</tr>
<tr>
<td colspan="2" align="right">
<input type="button" class="btn-popup-save" value="Save" />
<input type="button" class="btn-popup-cancel" value="Cancel" />
<input type="button" class="btn-popup-delete" value="Delete" />
</td>
</tr>
</table>
<input type="hidden" name="changed" value="false" />
</div>

24
web/Scripts/html/popup-template-polyline.html Normal file
View File

@ -0,0 +1,24 @@
<div class="popup-content">
<textarea cols="75" rows="10" class="richtext-fix"></textarea>
<table border="0">
<tr>
<td>Line width</td>
<td><input type="number" min="1" name="borderWidth" /></td>
</tr>
<tr>
<td>Line color</td>
<td>
<input type="text" name="strokeColor" id="strokeColor" />
<input type="color" name="strokeColorPicker" id="strokeColorPicker" />
</td>
</tr>
<tr>
<td colspan="2" align="right">
<input type="button" class="btn-popup-save" value="Save" />
<input type="button" class="btn-popup-cancel" value="Cancel" />
<input type="button" class="btn-popup-delete" value="Delete" />
</td>
</tr>
</table>
<input type="hidden" name="changed" value="false" />
</div>

31
web/Scripts/html/popup-template-rectangle.html Normal file
View File

@ -0,0 +1,31 @@
<div class="popup-content">
<textarea cols="75" rows="10" class="richtext-fix"></textarea>
<table border="0">
<tr>
<td>Border width</td>
<td><input type="number" min="1" name="borderWidth" /></td>
</tr>
<tr>
<td>Border color</td>
<td>
<input type="text" name="strokeColor" id="strokeColor" />
<input type="color" name="strokeColorPicker" id="strokeColorPicker" />
</td>
</tr>
<tr>
<td>Fill color</td>
<td>
<input type="text" name="fillColor" id="fillColor" />
<input type="color" name="fillColorPicker" id="fillColorPicker" />
</td>
</tr>
<tr>
<td colspan="2" align="right">
<input type="button" class="btn-popup-save" value="Save" />
<input type="button" class="btn-popup-cancel" value="Cancel" />
<input type="button" class="btn-popup-delete" value="Delete" />
</td>
</tr>
</table>
<input type="hidden" name="changed" value="false" />
</div>

BIN
web/Scripts/img/current-location.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 430 B

BIN
web/Scripts/img/fit-bounds.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 352 B

BIN
web/Scripts/img/map-load.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
web/Scripts/img/pin/flag-azure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 824 B

BIN
web/Scripts/img/pin/flag-green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 836 B

BIN
web/Scripts/img/pin/needle-pink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
web/Scripts/img/pin/niddle-green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
web/Scripts/img/pin/pin-azure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
web/Scripts/img/pin/pin-green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
web/Scripts/img/pin/pin-pink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

1167
web/Scripts/jquery.googlemaps.js Normal file
View File

File diff suppressed because it is too large Load Diff

1
web/Scripts/jquery.googlemaps.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
web/Scripts/styles.json Normal file
View File

File diff suppressed because one or more lines are too long

27
web/Theme/style.css
View File

@ -23,8 +23,8 @@ main {
}
aside {background-color: rgba(32,16,16,0.8);
padding: 1em; margin: 0.5em;
border-radius:25px; border: solid 1px #000060;
padding: 0.5em; margin: 0.5em;
border-radius:5px; border: solid 1px #000060;
float: right;
}
@ -51,7 +51,7 @@ footer {
justify-content: space-around;
z-index:-1;
}
.actionlink img { top:4px; }
footer img { max-height: 2em; }
a {
@ -60,12 +60,9 @@ a {
background-color:rgba(0,30,0,0.5);
}
.actionlink:hover {
background-color:rgba(30,0,124,0.5);
border-color: white;
a:hover {
text-decoration: underline;
}
a:visited {
color: #90B090;
}
@ -91,6 +88,7 @@ label {
width: 95%;
height: 95%;
}
.metablog {
font-style: italic;
font-size: small;
@ -112,10 +110,7 @@ padding-left: 20px;
.actionlink {
color: #B0B080;
border: solid .5px;
right:3px;
padding: 4px;
border-radius:25px;
border-radius:5px;
background-color:rgba(0,0,32,0.8);
font-size:x-small;
z-index:1;
@ -123,6 +118,14 @@ padding-left: 20px;
font-family: 'Arial', cursive;
}
.actionlink img { top:4px; }
.actionlink: hover {
background-color:rgba(30,0,124,0.5);
border : solid 1px white;
text-decoration: underline;
}
.code {
font-family: "monospace";
background-color: rgba(0,0,256,0.1);

2
web/Views/Blogs/UserPost.aspx
View File

@ -6,7 +6,7 @@
<h1 class="blogtitle">
<%= Html.ActionLink(Model.Title,"UserPost",new{user=Model.UserName,title=Model.Title}) %> -
<a href="/Blog/<%=Model.UserName%>">
<% if ((bool)ViewData["HasAvatar"]) { %>
<% if (ViewData["Avatar"]!=null) { %>
<img class="avatar" src="<%=ViewData["Avatar"]%>" alt=""/>
<% } %>
<%=Html.Encode(ViewData["BlogTitle"])%>

2
web/Views/Blogs/UserPosts.aspx
View File

@ -7,7 +7,7 @@
<asp:Content ContentPlaceHolderID="overHeaderOne" ID="header1" runat="server">
<h1 class="blogtitle">
<a href="/Blog/<%=ViewData["BlogUser"]%>">
<% if ((bool)ViewData["Avatar"]==null) { %>
<% if ((bool)ViewData["Avatar"]!=null) { %>
<img class="avatar" src="<%=ViewData["Avatar"]%>" alt=""/>
<% } %>
<%=Html.Encode(ViewData["BlogTitle"])%></a>

30
web/Web.csproj
View File

@ -95,6 +95,12 @@
<HintPath>..\packages\PayPalCoreSDK.1.6.0\lib\net451\PayPalCoreSDK.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting" />
<Reference Include="GoogleMapsHelpers">
<HintPath>..\packages\GoogleMapsHelpers.0.1.4.1\lib\4.5\GoogleMapsHelpers.dll</HintPath>
</Reference>
<Reference Include="Mvc.GoogleMaps">
<HintPath>..\packages\MVC.GoogleMaps.1.0.0\lib\net45\Mvc.GoogleMaps.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />
@ -644,7 +650,28 @@
<Content Include="Views\Home\AssemblyInfo.aspx" />
<Content Include="Views\Admin\Created.aspx" />
<Content Include="Views\Admin\InitDb.aspx" />
<Content Include="Models\StaticPage.master" />
<Content Include="favicon.png" />
<Content Include="Models\NoLogin.master" />
<Content Include="Scripts\css\mapstyle-ie.css" />
<Content Include="Scripts\css\mapstyle.css" />
<Content Include="Scripts\css\mapstyle.min.css" />
<Content Include="Scripts\html\popup-template-circle.html" />
<Content Include="Scripts\html\popup-template-marker.html" />
<Content Include="Scripts\html\popup-template-polygon.html" />
<Content Include="Scripts\html\popup-template-polyline.html" />
<Content Include="Scripts\html\popup-template-rectangle.html" />
<Content Include="Scripts\img\pin\flag-azure.png" />
<Content Include="Scripts\img\pin\flag-green.png" />
<Content Include="Scripts\img\pin\needle-pink.png" />
<Content Include="Scripts\img\pin\niddle-green.png" />
<Content Include="Scripts\img\pin\pin-azure.png" />
<Content Include="Scripts\img\pin\pin-green.png" />
<Content Include="Scripts\img\pin\pin-pink.png" />
<Content Include="Scripts\img\current-location.png" />
<Content Include="Scripts\img\fit-bounds.png" />
<Content Include="Scripts\img\map-load.gif" />
<Content Include="Scripts\jquery.googlemaps.js" />
<Content Include="Scripts\jquery.googlemaps.min.js" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
@ -668,6 +695,7 @@
<None Include="install\instdb.sql" />
<None Include="packages.config" />
<None Include="Scripts\jquery-2.1.3.min.map" />
<None Include="Scripts\styles.json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NpgsqlMRPProviders\NpgsqlMRPProviders.csproj">

3
web/packages.config
View File

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GoogleMapsHelpers" version="0.1.4.1" targetFramework="net451" />
<package id="jQuery" version="2.1.3" targetFramework="net45" />
<package id="JQuery.GoogleMaps" version="2.2.4" targetFramework="net451" />
<package id="jquery-globalize" version="0.1.3" targetFramework="net45" />
<package id="log4net" version="2.0.3" targetFramework="net40" />
<package id="MVC.GoogleMaps" version="1.0.0" targetFramework="net451" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
<package id="PayPalCoreSDK" version="1.6.0" targetFramework="net451" />
</packages>