lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-20 19:03:25 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #6637 from jbuck79/master

Browse Source 
Fixing jQuery-UI resources
This commit is contained in:
Sébastien Ros
2016-03-24 12:46:27 -07:00
parent d556f701b8 ded813225a
commit 8f3eadb2ae
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
View File

@@ -822,6 +822,8 @@
<Content Include="Styles\jquery-colorbox.min.css" />
<Content Include="Styles\jquery-datetime-editor.css" />
<Content Include="Styles\jquery-datetime-editor.min.css" />
<Content Include="Styles\jquery-ui.css" />
<Content Include="Styles\jquery-ui.min.css" />
<Content Include="Styles\TimeEntry\jquery.timeentry.css" />
<Content Include="Styles\TimeEntry\jquery.timeentry.min.css" />
<Content Include="Web.config" />

2
src/Orchard.Web/Modules/Orchard.Resources/jQuery.cs
View File

@@ -52,7 +52,7 @@ namespace Orchard.Resources {
manifest.DefineStyle("jQueryCalendars_Picker").SetUrl("Calendars/jquery.calendars.picker.full.min.css", "Calendars/jquery.calendars.picker.full.css").SetDependencies("jQueryUI_Orchard").SetVersion("2.0.1");
// jQuery Time Entry.
manifest.DefineScript("jQueryTimeEntry").SetUrl("TimeEntry/timejquery.timeentry.min.js", "TimeEntry/jquery.timeentry.js").SetDependencies("jQueryPlugin").SetVersion("2.0.1");
manifest.DefineScript("jQueryTimeEntry").SetUrl("TimeEntry/jquery.timeentry.min.js", "TimeEntry/jquery.timeentry.js").SetDependencies("jQueryPlugin").SetVersion("2.0.1");
manifest.DefineStyle("jQueryTimeEntry").SetUrl("TimeEntry/jquery.timeentry.css").SetVersion("2.0.1");
// jQuery Date/Time Editor Enhancements.