Skip to content

Commit

Permalink
Set to lowercase - all files/catalogs in the wwwroot folder
Browse files Browse the repository at this point in the history
  • Loading branch information
KrzysztofPajak committed Oct 2, 2018
1 parent 518d702 commit 758f4c3
Show file tree
Hide file tree
Showing 64 changed files with 175 additions and 178 deletions.
2 changes: 1 addition & 1 deletion Grand.Framework/Extensions/HtmlExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static IHtmlContent LocalizedEditor<T, TLocalizedModelLocal>(this IHtmlHe

tabStrip.AppendLine("<li>");
var urlHelper = new UrlHelper(helper.ViewContext);
var iconUrl = urlHelper.Content("~/Content/Images/flags/" + language.FlagImageFileName);
var iconUrl = urlHelper.Content("~/content/images/flags/" + language.FlagImageFileName);
tabStrip.AppendLine(string.Format("<img class='k-image' alt='' src='{0}'>", iconUrl));
tabStrip.AppendLine(WebUtility.HtmlEncode(language.Name));
tabStrip.AppendLine("</li>");
Expand Down
10 changes: 5 additions & 5 deletions Grand.Framework/Security/FilePermissionHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ public static IEnumerable<string> GetDirectoriesWrite()
var dirsToCheck = new List<string>();
dirsToCheck.Add(Path.Combine(rootDir, "App_Data"));
dirsToCheck.Add(Path.Combine(rootDir, "bin"));
dirsToCheck.Add(Path.Combine(rootDir, "Content"));
dirsToCheck.Add(Path.Combine(rootDir, "Content\\Images"));
dirsToCheck.Add(Path.Combine(rootDir, "Content\\Images\\Thumbs"));
dirsToCheck.Add(Path.Combine(rootDir, "Content\\Images\\uploaded"));
dirsToCheck.Add(Path.Combine(rootDir, "Content\\files\\Exportimport"));
dirsToCheck.Add(Path.Combine(rootDir, "content"));
dirsToCheck.Add(Path.Combine(rootDir, "content\\images"));
dirsToCheck.Add(Path.Combine(rootDir, "content\\images\\thumbs"));
dirsToCheck.Add(Path.Combine(rootDir, "content\\images\\uploaded"));
dirsToCheck.Add(Path.Combine(rootDir, "content\\files\\Exportimport"));
dirsToCheck.Add(Path.Combine(rootDir, "plugins"));
dirsToCheck.Add(Path.Combine(rootDir, "plugins\\bin"));
return dirsToCheck;
Expand Down
2 changes: 1 addition & 1 deletion Grand.Services/Common/PdfService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public virtual string PrintOrderToPdf(Order order, string languageId, string ven
throw new ArgumentNullException("order");

string fileName = string.Format("order_{0}_{1}.pdf", order.OrderGuid, CommonHelper.GenerateRandomDigitCode(4));
string filePath = Path.Combine(CommonHelper.MapPath("~/wwwroot/Content/files/ExportImport"), fileName);
string filePath = Path.Combine(CommonHelper.MapPath("~/wwwroot/content/files/exportimport"), fileName);
using (var fileStream = new FileStream(filePath, FileMode.Create))
{
var orders = new List<Order>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public CodeFirstInstallationService(

protected virtual string GetSamplesPath()
{
return Path.Combine(_hostingEnvironment.WebRootPath, "Content/samples/");
return Path.Combine(_hostingEnvironment.WebRootPath, "content/samples/");
}


Expand Down
12 changes: 6 additions & 6 deletions Grand.Services/Media/PictureService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ protected virtual void DeletePictureOnFileSystem(Picture picture)
protected virtual void DeletePictureThumbs(Picture picture)
{
string filter = string.Format("{0}*.*", picture.Id);
var thumbDirectoryPath = Path.Combine(_hostingEnvironment.WebRootPath, "Content/Images/Thumbs");
var thumbDirectoryPath = Path.Combine(_hostingEnvironment.WebRootPath, "content/images/thumbs");
string[] currentFiles = System.IO.Directory.GetFiles(thumbDirectoryPath, filter, SearchOption.AllDirectories);
foreach (string currentFileName in currentFiles)
{
Expand All @@ -224,7 +224,7 @@ protected virtual void DeletePictureThumbs(Picture picture)
/// <returns>Local picture thumb path</returns>
protected virtual string GetThumbLocalPath(string thumbFileName)
{
var thumbsDirectoryPath = Path.Combine(_hostingEnvironment.WebRootPath, "Content/Images/Thumbs");
var thumbsDirectoryPath = Path.Combine(_hostingEnvironment.WebRootPath, "content/images/thumbs");
if (_mediaSettings.MultipleThumbDirectories)
{
//get the first two letters of the file name
Expand Down Expand Up @@ -254,7 +254,7 @@ protected virtual string GetThumbUrl(string thumbFileName, string storeLocation
storeLocation = !String.IsNullOrEmpty(storeLocation)
? storeLocation
: _webHelper.GetStoreLocation();
var url = storeLocation + "Content/Images/Thumbs/";
var url = storeLocation + "content/images/thumbs/";

if (_mediaSettings.MultipleThumbDirectories)
{
Expand All @@ -279,7 +279,7 @@ protected virtual string GetThumbUrl(string thumbFileName, string storeLocation
/// <returns>Local picture path</returns>
protected virtual string GetPictureLocalPath(string fileName)
{
return Path.Combine(_hostingEnvironment.WebRootPath, "Content/Images", fileName);
return Path.Combine(_hostingEnvironment.WebRootPath, "content/images", fileName);
}

/// <summary>
Expand Down Expand Up @@ -382,7 +382,7 @@ public virtual string GetDefaultPictureUrl(int targetSize = 0,
string url = (!String.IsNullOrEmpty(storeLocation)
? storeLocation
: _webHelper.GetStoreLocation())
+ "Content/Images/" + defaultImageFileName;
+ "content/images/" + defaultImageFileName;
return url;
}
else
Expand Down Expand Up @@ -610,7 +610,7 @@ public virtual void DeletePicture(Picture picture)
public virtual void ClearThumbs()
{
const string searchPattern = "*.*";
string path = Path.Combine(_hostingEnvironment.WebRootPath, "Content/Images/Thumbs");
string path = Path.Combine(_hostingEnvironment.WebRootPath, "content/images/thumbs");

if (!System.IO.Directory.Exists(path))
return;
Expand Down
3 changes: 0 additions & 3 deletions Grand.Web/App_Data/Localization/defaultResources.grandres.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7323,9 +7323,6 @@
<LocaleResource Name="Admin.Configuration.Settings.Media.PicturesStoredIntoDatabase.Note">
<Value>NOTE: Do not forget to backup your database before changing this option</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.Media.PingoNotFound">
<Value>Pingo.exe not found inside \Content\Images\Thumbs</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.Media.ProductDetailsPictureSize">
<Value>Product detail image size</Value>
</LocaleResource>
Expand Down
2 changes: 1 addition & 1 deletion Grand.Web/Areas/Admin/Controllers/JbimagesController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public virtual IActionResult Upload()
return View();
}

var directory = "~/wwwroot/Content/Images/uploaded/";
var directory = "~/wwwroot/content/images/uploaded/";
var filePath = Path.Combine(CommonHelper.MapPath(directory), fileName);

var fileExtension = Path.GetExtension(filePath);
Expand Down
2 changes: 1 addition & 1 deletion Grand.Web/Areas/Admin/Controllers/LanguageController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected virtual void PrepareFlagsModel(LanguageModel model)
throw new ArgumentNullException("model");

model.FlagFileNames = Directory
.EnumerateFiles(CommonHelper.MapPath("~/wwwroot/Content/Images/flags/"), "*.png", SearchOption.TopDirectoryOnly)
.EnumerateFiles(CommonHelper.MapPath("~/wwwroot/content/images/flags/"), "*.png", SearchOption.TopDirectoryOnly)
.Select(Path.GetFileName)
.ToList();
}
Expand Down
8 changes: 4 additions & 4 deletions Grand.Web/Areas/Admin/Controllers/RoxyFilemanController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ public class RoxyFilemanController : BaseAdminController
/// <summary>
/// Default path to root directory of uploaded files (if appropriate settings are not specified)
/// </summary>
private const string DEFAULT_ROOT_DIRECTORY = "/Content/Images/uploaded";
private const string DEFAULT_ROOT_DIRECTORY = "/content/images/uploaded";

/// <summary>
/// Path to directory of language files
/// </summary>
private const string LANGUAGE_DIRECTORY = "/Content/Roxy_Fileman/lang";
private const string LANGUAGE_DIRECTORY = "/content/roxy_fileman/lang";

/// <summary>
/// Path to configuration file
/// </summary>
private const string CONFIGURATION_FILE = "/Content/Roxy_Fileman/conf.json";
private const string CONFIGURATION_FILE = "/content/roxy_fileman/conf.json";

#endregion

Expand Down Expand Up @@ -131,7 +131,7 @@ public virtual void CreateConfiguration()
//create configuration
var configuration = new
{
FILES_ROOT = existingConfiguration?.FILES_ROOT ?? "Content/Images/uploaded",
FILES_ROOT = existingConfiguration?.FILES_ROOT ?? "content/images/uploaded",
SESSION_PATH_KEY = existingConfiguration?.SESSION_PATH_KEY ?? string.Empty,
THUMBS_VIEW_WIDTH = existingConfiguration?.THUMBS_VIEW_WIDTH ?? "140",
THUMBS_VIEW_HEIGHT = existingConfiguration?.THUMBS_VIEW_HEIGHT ?? "120",
Expand Down
6 changes: 3 additions & 3 deletions Grand.Web/Areas/Admin/Views/Blog/_CreateOrUpdate.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<input type="hidden" id="selected-tab-index" name="selected-tab-index" value="@(GetSelectedTabIndex())">
@{
//resources for product tags input
Html.AppendCssFileParts("~/Content/tagEditor/jquery.tag-editor.css", excludeFromBundle: true);
Html.AppendScriptParts("~/Scripts/tagEditor/jquery.tag-editor.min.js", excludeFromBundle: true);
Html.AppendScriptParts("~/Scripts/tagEditor/jquery.caret.min.js", excludeFromBundle: true);
Html.AppendCssFileParts("~/content/tagEditor/jquery.tag-editor.css", excludeFromBundle: true);
Html.AppendScriptParts("~/scripts/tagEditor/jquery.tag-editor.min.js", excludeFromBundle: true);
Html.AppendScriptParts("~/scripts/tagEditor/jquery.caret.min.js", excludeFromBundle: true);
}
2 changes: 1 addition & 1 deletion Grand.Web/Areas/Admin/Views/Category/Tree.cshtml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@{
//page title
ViewBag.Title = T("Admin.Catalog.Categories.Manage").Text;
Html.AppendScriptParts("~/Scripts/bootstrap-treeview.js");
Html.AppendScriptParts("~/scripts/bootstrap-treeview.js");
}
<antiforgery-token />
<div class="row">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model CheckoutAttributeValueModel
@{
Html.AddScriptParts("~/Scripts/farbtastic.js", excludeFromBundle: true);
Html.AddCssFileParts("~/Content/farbtastic/farbtastic.css", excludeFromBundle: true);
Html.AddScriptParts("~/scripts/farbtastic.js", excludeFromBundle: true);
Html.AddCssFileParts("~/content/farbtastic/farbtastic.css", excludeFromBundle: true);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model ContactAttributeValueModel
@{
Html.AddScriptParts("~/Scripts/farbtastic.js", excludeFromBundle: true);
Html.AddCssFileParts("~/Content/farbtastic/farbtastic.css", excludeFromBundle: true);
Html.AddScriptParts("~/scripts/farbtastic.js", excludeFromBundle: true);
Html.AddCssFileParts("~/content/farbtastic/farbtastic.css", excludeFromBundle: true);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
Expand Down
6 changes: 3 additions & 3 deletions Grand.Web/Areas/Admin/Views/Customer/_CreateOrUpdate.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<input asp-for="Id" type="hidden" />
@{
//resources for product tags input
Html.AppendCssFileParts("~/Content/tagEditor/jquery.tag-editor.css", excludeFromBundle: true);
Html.AppendScriptParts("~/Scripts/tagEditor/jquery.tag-editor.min.js", excludeFromBundle: true);
Html.AppendScriptParts("~/Scripts/tagEditor/jquery.caret.min.js", excludeFromBundle: true);
Html.AppendCssFileParts("~/content/tagEditor/jquery.tag-editor.css", excludeFromBundle: true);
Html.AppendScriptParts("~/scripts/tagEditor/jquery.tag-editor.min.js", excludeFromBundle: true);
Html.AppendScriptParts("~/scripts/tagEditor/jquery.caret.min.js", excludeFromBundle: true);
}
<script>
$(document).ready(function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@inject IEventPublisher eventPublisher
@using Grand.Framework.UI;
@{
Html.AddScriptParts("~/Scripts/jquery.tmpl.min.js", excludeFromBundle: true);
Html.AddScriptParts("~/scripts/jquery.tmpl.min.js", excludeFromBundle: true);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
Expand Down
14 changes: 7 additions & 7 deletions Grand.Web/Areas/Admin/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
</div>
<div class="portlet-body">
<div class="partialContents" data-url="@Url.Action("DashboardActivity")">
<img src="~/Administration/images/loading.gif" /> Loading ...
<img src="~/administration/images/loading.gif" /> Loading ...
</div>
</div>
</div>
Expand All @@ -128,7 +128,7 @@
</div>
<div class="portlet-body">
<div class="partialContents Dashboard_GoogleAnalytics_Data" data-url="@Url.Action("DashboardGeneralData", "GoogleAnalytics")">
<img src="~/Administration/images/loading.gif" /> Loading ...
<img src="~/administration/images/loading.gif" /> Loading ...
</div>
</div>
</div>
Expand Down Expand Up @@ -159,7 +159,7 @@
</div>
<div class="portlet-body">
<div class="partialContents Dashboard_GoogleAnalytics_Data" data-url="@Url.Action("DashboardDataBySource", "GoogleAnalytics")">
<img src="~/Administration/images/loading.gif" /> Loading ...
<img src="~/administration/images/loading.gif" /> Loading ...
</div>
</div>
</div>
Expand All @@ -174,7 +174,7 @@
</div>
<div class="portlet-body">
<div class="partialContents Dashboard_GoogleAnalytics_Data" data-url="@Url.Action("DashboardDataByExit", "GoogleAnalytics")">
<img src="~/Administration/images/loading.gif" /> Loading ...
<img src="~/administration/images/loading.gif" /> Loading ...
</div>
</div>
</div>
Expand All @@ -193,7 +193,7 @@
</div>
<div class="portlet-body">
<div class="partialContents Dashboard_GoogleAnalytics_Data" data-url="@Url.Action("DashboardDataByDevice", "GoogleAnalytics")">
<img src="~/Administration/images/loading.gif" /> Loading ...
<img src="~/administration/images/loading.gif" /> Loading ...
</div>
</div>
</div>
Expand All @@ -208,7 +208,7 @@
</div>
<div class="portlet-body">
<div class="partialContents Dashboard_GoogleAnalytics_Data" data-url="@Url.Action("DashboardDataByLocalization", "GoogleAnalytics")">
<img src="~/Administration/images/loading.gif" /> Loading ...
<img src="~/administration/images/loading.gif" /> Loading ...
</div>
</div>
</div>
Expand Down Expand Up @@ -329,7 +329,7 @@
}
$(".Dashboard_GoogleAnalytics_Data").each(function (index, item) {
$(item).html('<img src="Administration/images/loading.gif" /> Loading ...');
$(item).html('<img src="administration/images/loading.gif" /> Loading ...');
var url = $(item).data("url") + '?startDate=' + $('#dashboard-report-range').data('daterangepicker').startDate.format('YYYY-MM-DD') + '&endDate=' + $('#dashboard-report-range').data('daterangepicker').endDate.format('YYYY-MM-DD');
if (url && url.length > 0) {
$(item).load(url);
Expand Down
2 changes: 1 addition & 1 deletion Grand.Web/Areas/Admin/Views/Knowledgebase/List.cshtml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@{
//page title
ViewBag.Title = T("Admin.ContentManagement.Knowledgebase.Manage").Text;
Html.AppendScriptParts("~/Scripts/bootstrap-treeview.js");
Html.AppendScriptParts("~/scripts/bootstrap-treeview.js");
}
<antiforgery-token />
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion Grand.Web/Areas/Admin/Views/Language/List.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
title: "@T("Admin.Configuration.Languages.Fields.FlagImage")",
width: 22,
attributes: { style: "text-align:center" },
template: '<img src="@Url.Content("~/Content/Images/flags/")#=FlagImageFileName#" />'
template: '<img src="@Url.Content("~/content/images/flags/")#=FlagImageFileName#" />'
},
{
field: "LanguageCulture",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<select id="FlagImageFileName" class="form-control" Name="FlagImageFileName">
@foreach (var fileName in Model.FlagFileNames.OrderBy(x=>x))
{
<option value="@fileName" img="@Url.Content("~/Content/Images/flags/" + fileName)">
<option value="@fileName" img="@Url.Content("~/content/images/flags/" + fileName)">
@fileName
</option>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
}
</table>
<div style="padding-top: 15px;">
<img alt="google maps" src="@Url.Content("~/Administration/images/google-maps.gif")" />
<img alt="google maps" src="@Url.Content("~/administration/images/google-maps.gif")" />
<a href="@Html.Raw(Model.ShippingAddressGoogleMapsUrl)" target="_blank">@T("Admin.Orders.Fields.ShippingAddress.ViewOnGoogleMaps")</a>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
@inject IProductTagService productTagService
@{
//resources for product tags input
Html.AppendCssFileParts("~/Content/tagEditor/jquery.tag-editor.css", excludeFromBundle: true);
Html.AppendScriptParts("~/Scripts/tagEditor/jquery.tag-editor.min.js", excludeFromBundle: true);
Html.AppendScriptParts("~/Scripts/tagEditor/jquery.caret.min.js", excludeFromBundle: true);
Html.AppendCssFileParts("~/content/tagEditor/jquery.tag-editor.css", excludeFromBundle: true);
Html.AppendScriptParts("~/scripts/tagEditor/jquery.tag-editor.min.js", excludeFromBundle: true);
Html.AppendScriptParts("~/scripts/tagEditor/jquery.caret.min.js", excludeFromBundle: true);
}
@using Grand.Core.Domain.Catalog;
@using Grand.Services.Catalog;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@using Grand.Core.Domain.Catalog
@model ProductModel.ProductAttributeValueModel
@{
Html.AddScriptParts("~/Scripts/farbtastic.js", excludeFromBundle: true);
Html.AddCssFileParts("~/Content/farbtastic/farbtastic.css", excludeFromBundle: true);
Html.AddScriptParts("~/scripts/farbtastic.js", excludeFromBundle: true);
Html.AddCssFileParts("~/content/farbtastic/farbtastic.css", excludeFromBundle: true);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $(document).ready(function () {

@if (!(Model.Allowed == 0 && Model.Denied == 0))
{
<script src="~/Scripts/Chart.min.js" type="text/javascript"></script>
<script src="~/scripts/" type="text/javascript"></script>
<script>
$(document).ready(function () {
var config = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ $(document).ready(function() {

@if (!(Model.Allowed == 0 && Model.Denied == 0))
{
<script src="~/Scripts/Chart.min.js" type="text/javascript"></script>
<script src="~/scripts/chart.min.js" type="text/javascript"></script>
<script>
$(document).ready(function () {
var config = {
Expand Down
Loading

0 comments on commit 758f4c3

Please sign in to comment.