lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing that some files had line endings mixed up (both LF and CRLF)

Browse Source
This commit is contained in:
Lombiq
2015-12-03 00:00:36 +01:00
parent c2dd09af5e
commit 15d27043d7
23 changed files with 1905 additions and 1904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
View File

@@ -154,7 +154,7 @@ namespace Orchard.Core.Navigation.Controllers {
ModelState.AddModelError(key, errorMessage.ToString());
}
public ActionResult CreateMenuItem(string id, int menuId, string returnUrl, string parentMenuItemPosition = null) {
public ActionResult CreateMenuItem(string id, int menuId, string returnUrl, string parentMenuItemPosition = null) {
if (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
return new HttpUnauthorizedResult();
@@ -163,31 +163,31 @@ namespace Orchard.Core.Navigation.Controllers {
if (menuPart == null)
return HttpNotFound();
// load the menu
var menu = Services.ContentManager.Get(menuId);
if (menu == null)
return HttpNotFound();
try {
if (!String.IsNullOrEmpty(parentMenuItemPosition)) {
var menuEntries = _menuService.GetMenuParts(menuId).Select(CreateMenuItemEntries);
menuPart.MenuPosition = GetNextChildPosition(menuEntries, parentMenuItemPosition);
}
else {
// filter the content items for this specific menu
menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
}
try {
if (!String.IsNullOrEmpty(parentMenuItemPosition)) {
var menuEntries = _menuService.GetMenuParts(menuId).Select(CreateMenuItemEntries);
menuPart.MenuPosition = GetNextChildPosition(menuEntries, parentMenuItemPosition);
}
else {
// filter the content items for this specific menu
menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
}
var model = Services.ContentManager.BuildEditor(menuPart);
return View(model);
}
catch (Exception exception) {
if (exception.IsFatal()) {
throw;
}
}
Logger.Error(T("Creating menu item failed: {0}", exception.Message).Text);
Services.Notifier.Error(T("Creating menu item failed: {0}", exception.Message));
@@ -196,7 +196,7 @@ namespace Orchard.Core.Navigation.Controllers {
}
[HttpPost, ActionName("CreateMenuItem")]
public ActionResult CreateMenuItemPost(string id, int menuId, string returnUrl, string parentMenuItemPosition = null) {
public ActionResult CreateMenuItemPost(string id, int menuId, string returnUrl, string parentMenuItemPosition = null) {
if (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
return new HttpUnauthorizedResult();
@@ -210,17 +210,17 @@ namespace Orchard.Core.Navigation.Controllers {
if (menu == null)
return HttpNotFound();
var model = Services.ContentManager.UpdateEditor(menuPart, this);
if (!String.IsNullOrEmpty(parentMenuItemPosition)) {
var menuEntries = _menuService.GetMenuParts(menuId).Select(CreateMenuItemEntries);
menuPart.MenuPosition = GetNextChildPosition(menuEntries, parentMenuItemPosition);
}
else {
menuPart.MenuPosition = Position.GetNext( _navigationManager.BuildMenu(menu));
}
if (!String.IsNullOrEmpty(parentMenuItemPosition)) {
var menuEntries = _menuService.GetMenuParts(menuId).Select(CreateMenuItemEntries);
menuPart.MenuPosition = GetNextChildPosition(menuEntries, parentMenuItemPosition);
}
else {
menuPart.MenuPosition = Position.GetNext( _navigationManager.BuildMenu(menu));
}
menuPart.Menu = menu;
Services.ContentManager.Create(menuPart);
@@ -233,23 +233,23 @@ namespace Orchard.Core.Navigation.Controllers {
return this.RedirectLocal(returnUrl, () => RedirectToAction("Index"));
}
private static string GetNextChildPosition(IEnumerable<MenuItemEntry> menuItems, string parentMenuItemPosition) {
var parentMenuItemPositionPlusDot = parentMenuItemPosition + ".";
var childElements = menuItems.Where(childElement => childElement.Position.StartsWith(parentMenuItemPositionPlusDot));
if (childElements.Any()) {
var result = childElements
.Select(childElement => {
var positionParts = childElement.Position.Substring(parentMenuItemPositionPlusDot.Length).Split(new[] { '.' }, 2, StringSplitOptions.RemoveEmptyEntries);
return positionParts.Any() ? int.Parse(positionParts[0]) : 0;
})
.Max();
return parentMenuItemPositionPlusDot + (result + 1);
}
return parentMenuItemPositionPlusDot + "1";
}
private static string GetNextChildPosition(IEnumerable<MenuItemEntry> menuItems, string parentMenuItemPosition) {
var parentMenuItemPositionPlusDot = parentMenuItemPosition + ".";
var childElements = menuItems.Where(childElement => childElement.Position.StartsWith(parentMenuItemPositionPlusDot));
if (childElements.Any()) {
var result = childElements
.Select(childElement => {
var positionParts = childElement.Position.Substring(parentMenuItemPositionPlusDot.Length).Split(new[] { '.' }, 2, StringSplitOptions.RemoveEmptyEntries);
return positionParts.Any() ? int.Parse(positionParts[0]) : 0;
})
.Max();
return parentMenuItemPositionPlusDot + (result + 1);
}
return parentMenuItemPositionPlusDot + "1";
}
}
}

44
src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js
View File

@@ -52,27 +52,27 @@
}
});
$(function () {
$(".navigation-menu-item > div").on("click", function () {
if ($(".navigation-menu-item > div.menu-item-selected").length) {
if ($(this).hasClass("menu-item-selected")) {
$(this).removeClass("menu-item-selected");
}
else {
$(".navigation-menu-item > div").removeClass("menu-item-selected");
$(this).addClass("menu-item-selected")
}
}
else {
$(this).addClass("menu-item-selected");
}
});
$(".menu-item-actions > .button").on("click", function (e) {
if ($(".navigation-menu-item > div.menu-item-selected").length) {
e.originalEvent.currentTarget.href = $(this).attr("href") + "&parentMenuItemPosition=" + $(".navigation-menu-item > div.menu-item-selected > .navigation-position > input").val();
}
});
});
$(function () {
$(".navigation-menu-item > div").on("click", function () {
if ($(".navigation-menu-item > div.menu-item-selected").length) {
if ($(this).hasClass("menu-item-selected")) {
$(this).removeClass("menu-item-selected");
}
else {
$(".navigation-menu-item > div").removeClass("menu-item-selected");
$(this).addClass("menu-item-selected")
}
}
else {
$(this).addClass("menu-item-selected");
}
});
$(".menu-item-actions > .button").on("click", function (e) {
if ($(".navigation-menu-item > div.menu-item-selected").length) {
e.originalEvent.currentTarget.href = $(this).attr("href") + "&parentMenuItemPosition=" + $(".navigation-menu-item > div.menu-item-selected > .navigation-position > input").val();
}
});
});
})(jQuery);

18
src/Orchard.Web/Core/Navigation/Styles/navigation-admin.css
View File

@@ -172,13 +172,13 @@
.dir-rtl div.menu-item-actions {
left:10px;
right: inherit;
}
.navigation-menu li div.menu-item-selected {
background-color: #6a7b42;
color: #fff;
}
.navigation-menu li div.menu-item-selected a {
color: #edf9f5;
}
.navigation-menu li div.menu-item-selected {
background-color: #6a7b42;
color: #fff;
}
.navigation-menu li div.menu-item-selected a {
color: #edf9f5;
}

8
src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
View File

@@ -46,8 +46,8 @@
<div class="container">
<div class="navigation-menu">
@if (Model.MenuItemEntries.Any()) {
@Html.Hint(T("If you'd like to add a new menu item under another one directly then select the parent by clicking on it."))
@Html.Hint(T("If you'd like to add a new menu item under another one directly then select the parent by clicking on it."))
@RenderMenuItems(Model.MenuItemEntries, 0)
}
else {
@@ -79,8 +79,8 @@
}
@helper RenderMenuItems(IList<MenuItemEntry> menuItems, int index) {
@helper RenderMenuItems(IList<MenuItemEntry> menuItems, int index) {
@:<ol>
// store current level to detect lowerb or upper level

8
src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs
View File

@@ -26,10 +26,10 @@ namespace Orchard.Azure.Services.FileSystems.Media {
public bool TrySaveStream(string path, Stream inputStream) {
try {
if (FileExists(path)) {
return false;
}
if (FileExists(path)) {
return false;
}
SaveStream(path, inputStream);
}
catch {

22
src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
View File

@@ -84,10 +84,10 @@ namespace Orchard.Blogs {
.WithPart("CommonPart")
.WithPart("WidgetPart")
.WithSetting("Stereotype", "Widget")
.WithPart("IdentityPart")
.WithPart("IdentityPart")
);
return 7;
return 7;
}
public int UpdateFrom1() {
@@ -134,14 +134,14 @@ namespace Orchard.Blogs {
return 6;
}
public int UpdateFrom6() {
ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
cfg => cfg
.WithPart("IdentityPart")
);
return 7;
}
public int UpdateFrom6() {
ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
cfg => cfg
.WithPart("IdentityPart")
);
return 7;
}
}
}

4
src/Orchard.Web/Modules/Orchard.ImageEditor/Placement.info
View File

@@ -10,8 +10,8 @@
<Place Parts_Image_Editor_CropOptions="Options"/>
<Place Parts_Image_Editor_Resize="Buttons:6"/>
<Place Parts_Image_Editor_ResizeOptions="Options"/>
<Place Parts_Image_Editor_Rotate="Buttons:7"/>
<Place Parts_Image_Editor_RotateOptions="Options"/>
<Place Parts_Image_Editor_Rotate="Buttons:7"/>
<Place Parts_Image_Editor_RotateOptions="Options"/>
<Place Parts_Image_Editor_Filter="Buttons:7"/>
<Place Parts_Image_Editor_FilterOptions="Options"/>

16
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
View File

@@ -568,20 +568,20 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target> -->
<Target Name="AfterBuild" DependsOnTargets="AfterBuildCompiler">
<PropertyGroup>
<AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
</PropertyGroup>
<!-- If this is an area child project, uncomment the following line:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
<!-- If this is an area child project, uncomment the following line:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-->
<!-- If this is an area parent project, uncomment the following lines:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
<CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
<!-- If this is an area parent project, uncomment the following lines:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
<CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-->
</Target>
<Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">

3
src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.MediaLibrary.Actions.cshtml
View File

@@ -23,5 +23,6 @@
};
//]]>
</script>
</script>
}

4
src/Orchard.Web/Modules/Orchard.Setup/Annotations/SetupValidationAttributes.cs
View File

@@ -68,8 +68,8 @@ namespace Orchard.Setup.Annotations {
if (string.IsNullOrEmpty(_value))
return T("Password is required.").Text;
return _value.Length < (int)Minimum
? T("Password must be at least {0} characters.", Minimum).Text
return _value.Length < (int)Minimum
? T("Password must be at least {0} characters.", Minimum).Text
: T("Password can be no longer than {0} characters.", Maximum).Text;
}
}

58
src/Orchard.Web/Modules/Orchard.Tokens/Scripts/orchard-tokens-admin.js
View File

@@ -25,27 +25,27 @@
}
});
jQuery.fn.extend({
tokenized : function () {
return $(this).each(function () {
var _this = $(this);
jQuery.fn.extend({
tokenized : function () {
return $(this).each(function () {
var _this = $(this);
// add an icon to tokenized inputs
_this.wrap('<span class="token-wrapper"></span>');
var popup = $('<div><span class="tokenized-popup">&nbsp;</span></div>')
_this.parent().prepend(popup);
// show the full list of tokens when the icon is clicked
popup.children('.tokenized-popup').click(function () {
var input = $(this).parent().next();
// pass empty string as value to search for, displaying all results
input.autocomplete("search", "");
input.focus();
});
$(this).autocomplete({
// add an icon to tokenized inputs
_this.wrap('<span class="token-wrapper"></span>');
var popup = $('<div><span class="tokenized-popup">&nbsp;</span></div>')
_this.parent().prepend(popup);
// show the full list of tokens when the icon is clicked
popup.children('.tokenized-popup').click(function () {
var input = $(this).parent().next();
// pass empty string as value to search for, displaying all results
input.autocomplete("search", "");
input.focus();
});
$(this).autocomplete({
minLength: 0,
source: $.tokens,
source: $.tokens,
select: function (event, ui) {
$(this).insertAtCaret(ui.item.value);
return false;
@@ -62,18 +62,18 @@ jQuery.fn.extend({
.appendTo(ul);
};
});
});
},
});
});
},
});
$(function() {
$(function() {
$.tokens = {};
$.tokens = {};
// provide autocomplete behavior to tokenized inputs
// tokensUrl is initialized from the view
$.get(tokensUrl, function (data) {
$.tokens = data;
$('.tokenized').tokenized();
// provide autocomplete behavior to tokenized inputs
// tokensUrl is initialized from the view
$.get(tokensUrl, function (data) {
$.tokens = data;
$('.tokenized').tokenized();
});
});

2
src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css
View File

@@ -284,4 +284,4 @@
.dir-rtl .toolbox-event div {
margin-left: inherit;
margin-right: 36px;
}
}

2
src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars-me.js
View File

@@ -1,5 +1,5 @@
/* http://keith-wood.name/calendars.html
Montenegrin localisation for Gregorian/Julian calendars for jQuery.
Montenegrin localisation for Gregorian/Julian calendars for jQuery.
By Miloš Milošević - fleka d.o.o. */
(function($) {
$.calendars.calendars.gregorian.prototype.regionalOptions['me'] = {

4
src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.lang.js
View File

@@ -1014,7 +1014,7 @@
}
})(jQuery);
/* http://keith-wood.name/calendars.html
Montenegrin localisation for Gregorian/Julian calendars for jQuery.
Montenegrin localisation for Gregorian/Julian calendars for jQuery.
By Miloš Milošević - fleka d.o.o. */
(function($) {
$.calendars.calendars.gregorian.prototype.regionalOptions['me-ME'] = {
@@ -1037,7 +1037,7 @@
}
})(jQuery);
/* http://keith-wood.name/calendars.html
Montenegrin localisation for Gregorian/Julian calendars for jQuery.
Montenegrin localisation for Gregorian/Julian calendars for jQuery.
By Miloš Milošević - fleka d.o.o. */
(function($) {
$.calendars.calendars.gregorian.prototype.regionalOptions['me'] = {

84
src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.picker.lang.js
View File

@@ -933,48 +933,48 @@
};
$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['lv']);
})(jQuery);
/* http://keith-wood.name/calendars.html
Montenegrin localisation for calendars datepicker for jQuery.
Written by Miloš Milošević - fleka d.o.o. */
(function($) {
$.calendarsPicker.regionalOptions['me-ME'] = {
renderer: $.calendarsPicker.defaultRenderer,
prevText: '&#x3c;', prevStatus: 'Prikaži prethodni mjesec',
prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Prikaži prethodnu godinu',
nextText: '&#x3e;', nextStatus: 'Prikaži sljedeći mjesec',
nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Prikaži sljedeću godinu',
currentText: 'Danas', currentStatus: 'Tekući mjesec',
todayText: 'Danas', todayStatus: 'Tekući mjesec',
clearText: 'Obriši', clearStatus: 'Obriši trenutni datum',
closeText: 'Zatvori', closeStatus: 'Zatvori kalendar',
yearStatus: 'Prikaži godine', monthStatus: 'Prikaži mjesece',
weekText: 'Sed', weekStatus: 'Sedmica',
dayStatus: '\'Datum\' DD, M d', defaultStatus: 'Odaberi datum',
isRTL: false
};
$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me-ME']);
})(jQuery);
/* http://keith-wood.name/calendars.html
Montenegrin localisation for calendars datepicker for jQuery.
Written by Miloš Milošević - fleka d.o.o. */
(function($) {
$.calendarsPicker.regionalOptions['me'] = {
renderer: $.calendarsPicker.defaultRenderer,
prevText: '&#x3c;', prevStatus: 'Прикажи претходни мјесец',
prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Прикажи претходну годину',
nextText: '&#x3e;', nextStatus: 'Прикажи сљедећи мјесец',
nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Прикажи сљедећу годину',
currentText: 'Данас', currentStatus: 'Текући мјесец',
todayText: 'Данас', todayStatus: 'Текући мјесец',
clearText: 'Обриши', clearStatus: 'Обриши тренутни датум',
closeText: 'Затвори', closeStatus: 'Затвори календар',
yearStatus: 'Прикажи године', monthStatus: 'Прикажи мјесеце',
weekText: 'Сед', weekStatus: 'Седмица',
dayStatus: '\'Датум\' DD d MM', defaultStatus: 'Одабери датум',
isRTL: false
};
$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me']);
})(jQuery);
/* http://keith-wood.name/calendars.html
Montenegrin localisation for calendars datepicker for jQuery.
Written by Miloš Milošević - fleka d.o.o. */
(function($) {
$.calendarsPicker.regionalOptions['me-ME'] = {
renderer: $.calendarsPicker.defaultRenderer,
prevText: '&#x3c;', prevStatus: 'Prikaži prethodni mjesec',
prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Prikaži prethodnu godinu',
nextText: '&#x3e;', nextStatus: 'Prikaži sljedeći mjesec',
nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Prikaži sljedeću godinu',
currentText: 'Danas', currentStatus: 'Tekući mjesec',
todayText: 'Danas', todayStatus: 'Tekući mjesec',
clearText: 'Obriši', clearStatus: 'Obriši trenutni datum',
closeText: 'Zatvori', closeStatus: 'Zatvori kalendar',
yearStatus: 'Prikaži godine', monthStatus: 'Prikaži mjesece',
weekText: 'Sed', weekStatus: 'Sedmica',
dayStatus: '\'Datum\' DD, M d', defaultStatus: 'Odaberi datum',
isRTL: false
};
$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me-ME']);
})(jQuery);
/* http://keith-wood.name/calendars.html
Montenegrin localisation for calendars datepicker for jQuery.
Written by Miloš Milošević - fleka d.o.o. */
(function($) {
$.calendarsPicker.regionalOptions['me'] = {
renderer: $.calendarsPicker.defaultRenderer,
prevText: '&#x3c;', prevStatus: 'Прикажи претходни мјесец',
prevJumpText: '&#x3c;&#x3c;', prevJumpStatus: 'Прикажи претходну годину',
nextText: '&#x3e;', nextStatus: 'Прикажи сљедећи мјесец',
nextJumpText: '&#x3e;&#x3e;', nextJumpStatus: 'Прикажи сљедећу годину',
currentText: 'Данас', currentStatus: 'Текући мјесец',
todayText: 'Данас', todayStatus: 'Текући мјесец',
clearText: 'Обриши', clearStatus: 'Обриши тренутни датум',
closeText: 'Затвори', closeStatus: 'Затвори календар',
yearStatus: 'Прикажи године', monthStatus: 'Прикажи мјесеце',
weekText: 'Сед', weekStatus: 'Седмица',
dayStatus: '\'Датум\' DD d MM', defaultStatus: 'Одабери датум',
isRTL: false
};
$.calendarsPicker.setDefaults($.calendarsPicker.regionalOptions['me']);
})(jQuery);
/* http://keith-wood.name/calendars.html
Македонски MK localisation for calendars datepicker for jQuery.
Hajan Selmani (hajan [at] live [dot] com). */

6
src/Orchard.Web/Modules/Orchard.jQuery/Scripts/calendars/jquery.calendars.ummalqura-ar.js
View File

@@ -1,5 +1,5 @@
/* http://keith-wood.name/calendars.html
Arabic localisation for UmmAlQura calendar for jQuery v2.0.0.
/* http://keith-wood.name/calendars.html
Arabic localisation for UmmAlQura calendar for jQuery v2.0.0.
Written by Amro Osama March 2013. */
(function ($) {
$.calendars.calendars.ummalqura.prototype.regionalOptions['ar'] = {
@@ -14,4 +14,4 @@
firstDay: 6, // The first day of the week, Sat = 0, Sun = 1, ...
isRTL: true // True if right-to-left language, false if left-to-right
};
})(jQuery);
})(jQuery);

2
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -1575,4 +1575,4 @@ html.dir-rtl {
padding-left: inherit;
padding-right: 20px;
}
}
}