mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-21 03:14:10 +08:00
Merge
--HG-- branch : 1.x
This commit is contained in:
Piotr Szmyd
@@ -32,12 +32,13 @@
|
||||
.Replace("Y", "y")
|
||||
.Replace("M", "m")
|
||||
;
|
||||
|
||||
}
|
||||
|
||||
@functions {
|
||||
|
||||
private string FormatJsList(string csv) {
|
||||
return "'" + String.Join("', '", csv.Split(',').Select(x => x.Trim())) + "'";
|
||||
return "'" + String.Join("', '", csv.Split(',').Select(x => HttpUtility.JavaScriptStringEncode(x.Trim()))) + "'";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -45,21 +46,21 @@
|
||||
//<![CDATA[
|
||||
$(function() {
|
||||
$.datepicker.regional[''] = {
|
||||
closeText: '@T("Done")', // Display text for close link
|
||||
prevText: '@T("Prev")', // Display text for previous month link
|
||||
nextText: '@T("Next")', // Display text for next month link
|
||||
currentText: '@T("Today")', // Display text for current month link
|
||||
closeText: '@HttpUtility.JavaScriptStringEncode(T("Done").Text)', // Display text for close link
|
||||
prevText: '@HttpUtility.JavaScriptStringEncode(T("Prev").Text)', // Display text for previous month link
|
||||
nextText: '@HttpUtility.JavaScriptStringEncode(T("Next").Text)', // Display text for next month link
|
||||
currentText: '@HttpUtility.JavaScriptStringEncode(T("Today").Text)', // Display text for current month link
|
||||
monthNames: [@Html.Raw(monthNames)], // Names of months for drop-down and formatting
|
||||
monthNamesShort: [@Html.Raw(monthNamesShort)], // For formatting
|
||||
dayNames: [@Html.Raw(dayNames)], // For formatting
|
||||
dayNamesShort: [@Html.Raw(dayNamesShort)], // For formatting
|
||||
dayNamesMin: [@Html.Raw(dayNamesMin)], // Column headings for days starting at Sunday
|
||||
weekHeader: '@T("Wk")', // Column header for week of the year
|
||||
dateFormat: '@dateFormat', // See format options on parseDate
|
||||
weekHeader: '@HttpUtility.JavaScriptStringEncode(T("Wk").Text)', // Column header for week of the year
|
||||
dateFormat: '@HttpUtility.JavaScriptStringEncode(dateFormat)', // See format options on parseDate
|
||||
firstDay: @dateTimeLocalization.FirstDay, // The first day of the week, Sun = 0, Mon = 1, ...
|
||||
isRTL: @(cultureInfo.TextInfo.IsRightToLeft ? "true" : "false"), // True if right-to-left language, false if left-to-right
|
||||
showMonthAfterYear: @(dateTimeLocalization.ShowMonthAfterYear ? "true" : "false"), // True if the year select precedes month, false for month then year
|
||||
yearSuffix: '@dateTimeLocalization.YearSuffix' // Additional text to append to the year in the month headers
|
||||
yearSuffix: '@HttpUtility.JavaScriptStringEncode(dateTimeLocalization.YearSuffix)' // Additional text to append to the year in the month headers
|
||||
};
|
||||
|
||||
$.datepicker.setDefaults($.datepicker.regional['']);
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}
|
||||
|
||||
WorkContext.SetState("TimePickerLocalization", new object());
|
||||
|
||||
|
||||
Style.Require("jQueryUI_TimePicker");
|
||||
Script.Require("jQueryUI_TimePicker");
|
||||
|
||||
var cultureInfo = CultureInfo.GetCultureInfo(WorkContext.CurrentCulture);
|
||||
|
||||
|
||||
var timeFormat = cultureInfo.DateTimeFormat.ShortTimePattern
|
||||
.Replace("H", "h");
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
$(function() {
|
||||
|
||||
$.timepicker.regional[''] = {
|
||||
timeOnlyTitle: '@T("Choose time")',
|
||||
timeText: '@T("Time")',
|
||||
hourText: '@T("Hour")',
|
||||
minuteText: '@T("Minute")',
|
||||
currentText: '@T("Now")', // Display text for current time link
|
||||
closeText: '@T("Done")', // Display text for close link
|
||||
timeFormat: '@timeFormat',
|
||||
timeOnlyTitle: '@HttpUtility.JavaScriptStringEncode(T("Choose time").Text)',
|
||||
timeText: '@HttpUtility.JavaScriptStringEncode(T("Time").Text)',
|
||||
hourText: '@HttpUtility.JavaScriptStringEncode(T("Hour").Text)',
|
||||
minuteText: '@HttpUtility.JavaScriptStringEncode(T("Minute").Text)',
|
||||
currentText: '@HttpUtility.JavaScriptStringEncode(T("Now").Text)', // Display text for current time link
|
||||
closeText: '@HttpUtility.JavaScriptStringEncode(T("Done").Text)', // Display text for close link
|
||||
timeFormat: '@HttpUtility.JavaScriptStringEncode(timeFormat)',
|
||||
amNames: ['@cultureInfo.DateTimeFormat.AMDesignator', 'AM', 'A'],
|
||||
pmNames: ['@cultureInfo.DateTimeFormat.PMDesignator', 'PM', 'P'],
|
||||
ampm: @ampm,
|
||||
|
||||
@@ -134,12 +134,10 @@
|
||||
<Content Include="Config\Sample.HostComponents.config">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
<Content Include="Media\web.config" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Global.asax" />
|
||||
<Content Include="Media\OrchardLogo.png" />
|
||||
<Content Include="Refresh.html" />
|
||||
<Content Include="Web.config">
|
||||
<SubType>Designer</SubType>
|
||||
@@ -168,6 +166,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="App_Data\" />
|
||||
<Folder Include="Properties\PublishProfiles\" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||
@@ -184,14 +183,14 @@
|
||||
<CopyAllFilesToSingleFolderForMsdeployDependsOn>
|
||||
CustomCollectFiles;
|
||||
$(CopyAllFilesToSingleFolderForMsdeployDependsOn);
|
||||
</CopyAllFilesToSingleFolderForMsdeployDependsOn>
|
||||
</CopyAllFilesToSingleFolderForMsdeployDependsOn>
|
||||
</PropertyGroup>
|
||||
<Target Name="CustomCollectFiles">
|
||||
<ItemGroup>
|
||||
<Orchard-Web-Bins Include="bin\*" />
|
||||
<SqlCeBinariesx86 Include="..\..\lib\sqlce\x86\**\*" />
|
||||
<SqlCeBinariesx64 Include="..\..\lib\sqlce\amd64\**\*" />
|
||||
<_CustomFiles Include="Media\**\*;App_Data\**\*;Modules\**\*;Themes\**\*;Core\**\*" Exclude="**\obj\**;**\bin\*.xml;**\.hgignore;**\.hgtags;**\.hg\**;@(Orchard-Web-Bins -> '**\%(Filename)%(Extension)');**\*.csproj.user;" />
|
||||
<_CustomFiles Include="Media\**\*;App_Data\**\*;Modules\**\*;Themes\**\*;Core\**\*;Config\**\*" Exclude="**\obj\**;**\bin\*.xml;**\.hgignore;**\.hgtags;**\.hg\**;@(Orchard-Web-Bins -> '**\%(Filename)%(Extension)');**\*.csproj.user;App_Data\Dependencies\*;App_Data\Logs\*" />
|
||||
<FilesForPackagingFromProject Include="%(_CustomFiles.Identity)">
|
||||
<DestinationRelativePath>%(RelativeDir)%(Filename)%(Extension)</DestinationRelativePath>
|
||||
</FilesForPackagingFromProject>
|
||||
@@ -213,6 +212,30 @@
|
||||
<Copy SourceFiles="@(SqlCeBinariesx86)" DestinationFolder="$(OutputPath)\x86\%(RecursiveDir)" SkipUnchangedFiles="true" />
|
||||
<Copy SourceFiles="@(SqlCeBinariesx86)" DestinationFolder="$(OutputPath)\x86\%(RecursiveDir)" SkipUnchangedFiles="true" />
|
||||
</Target>
|
||||
<Import Project="$(ProjectDir)..\..\lib\msbuild\MSBuild.Community.Tasks.Targets" />
|
||||
<UsingTask AssemblyFile="$(ProjectDir)\..\Tools\MSBuild.Orchard.Tasks\bin\Release\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.XmlDelete" />
|
||||
<Target Name="ProcessConfigurationFiles" AfterTargets="CopyAllFilesToSingleFolderForMsdeploy">
|
||||
<PropertyGroup>
|
||||
<PackageTmp>$(ProjectDir)obj\Release\Package\PackageTmp</PackageTmp>
|
||||
</PropertyGroup>
|
||||
<!-- extra processing of the staged config files -->
|
||||
<XmlUpdate XmlFileName="$(PackageTmp)\web.config" XPath="/configuration/system.web/compilation/@debug" Value="false" />
|
||||
<XmlDelete XmlFileName="$(PackageTmp)\web.config" XPath="/configuration/system.web/trust" />
|
||||
<XmlUpdate XmlFileName="$(PackageTmp)\web.config" XPath="/configuration/system.web/machineKey/@validationKey" Value="AutoGenerate" />
|
||||
<XmlUpdate XmlFileName="$(PackageTmp)\web.config" XPath="/configuration/system.web/machineKey/@decryptionKey" Value="AutoGenerate" />
|
||||
<XmlUpdate XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/appender/immediateFlush/@value" Value="false" />
|
||||
<XmlUpdate XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/logger/priority/@value" Value="ERROR" />
|
||||
<XmlUpdate XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/root/priority/@value" Value="ERROR" />
|
||||
<XmlDelete XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/appender[@name='debug-file']" />
|
||||
<XmlDelete XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/appender[@name='debugger']" />
|
||||
<XmlDelete XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/appender[@name='error-file']/filter" />
|
||||
<XmlDelete XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/logger[@name='Orchard.Localization']" />
|
||||
<XmlDelete XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/logger[@name='Orchard']" />
|
||||
<XmlDelete XmlFileName="$(PackageTmp)\Config\log4net.config" XPath="/log4net/root/appender-ref[@ref='debug-file']" />
|
||||
<!-- disable dynamic compilation loader -->
|
||||
<Copy SourceFiles="$(PackageTmp)\Config\Sample.HostComponents.config" DestinationFiles="$(PackageTmp)\Config\HostComponents.config" />
|
||||
<XmlUpdate XmlFileName="$(PackageTmp)\Config\HostComponents.config" XPath="/HostComponents/Components/Component[@Type='Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader']/Properties/Property/@Value" Value="true" />
|
||||
</Target>
|
||||
<Target Name="AfterBuild" DependsOnTargets="AfterBuildCompiler">
|
||||
<PropertyGroup>
|
||||
<AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
|
||||
|
||||
Reference in New Issue
Block a user