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
1,113 Commits 83 Branches 32 Tags
3e46d5f0b05ad1ffe49b7eac960273da1f6feb36
Commit Graph

210 Commits

Author SHA1 Message Date
Nathan Heskew
3e46d5f0b0 Changing Orchard.Themes' System.Web.Mvc reference to what's in the lib 
--HG--
branch : dev
 2010-04-22 15:20:01 -07:00
Nathan Heskew
515d687342 Pulling Themes from Orchard.Core into its own module, Orchard.Themes 
--HG--
branch : dev
rename : src/Orchard.Web/Core/Themes/AdminMenu.cs => src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs
rename : src/Orchard.Web/Core/Themes/Content/orchard.ico => src/Orchard.Web/Modules/Orchard.Themes/Content/orchard.ico
rename : src/Orchard.Web/Core/Themes/Controllers/AdminController.cs => src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
rename : src/Orchard.Web/Core/Themes/DesignerNotes/ZoneManagerEvents.cs => src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
rename : src/Orchard.Web/Core/Themes/Handlers/ThemeSiteSettingsHandler.cs => src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsHandler.cs
rename : src/Orchard.Web/Core/Themes/Models/Theme.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/Theme.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeRecord.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeRecord.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeSiteSettings.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettings.cs
rename : src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsRecord.cs => src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeSiteSettingsRecord.cs
rename : src/Orchard.Web/Core/Themes/Module.txt => src/Orchard.Web/Modules/Orchard.Themes/Module.txt
rename : src/Orchard.Web/Core/Themes/Permissions.cs => src/Orchard.Web/Modules/Orchard.Themes/Permissions.cs
rename : src/Orchard.Web/Core/Themes/Preview/IPreviewTheme.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/IPreviewTheme.cs
rename : src/Orchard.Web/Core/Themes/Preview/PreviewTheme.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewTheme.cs
rename : src/Orchard.Web/Core/Themes/Preview/PreviewThemeFilter.cs => src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeFilter.cs
rename : src/Orchard.Web/Core/Themes/Scripts/base.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
rename : src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.js
rename : src/Orchard.Web/Core/Themes/Scripts/jquery-1.4.1.min.js => src/Orchard.Web/Modules/Orchard.Themes/Scripts/jquery-1.4.1.min.js
rename : src/Orchard.Web/Core/Themes/Services/SafeModeThemeSelector.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/SafeModeThemeSelector.cs
rename : src/Orchard.Web/Core/Themes/Services/SiteThemeSelector.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs
rename : src/Orchard.Web/Core/Themes/Services/ThemeService.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
rename : src/Orchard.Web/Core/Themes/Services/ThemeZoneManagerEvents.cs => src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeZoneManagerEvents.cs
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarActiveButtonBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarActiveButtonBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/Images/toolBarHoverButtonBackground.gif => src/Orchard.Web/Modules/Orchard.Themes/Styles/Images/toolBarHoverButtonBackground.gif
rename : src/Orchard.Web/Core/Themes/Styles/special.css => src/Orchard.Web/Modules/Orchard.Themes/Styles/special.css
rename : src/Orchard.Web/Core/Themes/ViewModels/PreviewViewModel.cs => src/Orchard.Web/Modules/Orchard.Themes/ViewModels/PreviewViewModel.cs
rename : src/Orchard.Web/Core/Themes/ViewModels/ThemesIndexViewModel.cs => src/Orchard.Web/Modules/Orchard.Themes/ViewModels/ThemesIndexViewModel.cs
rename : src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
rename : src/Orchard.Web/Core/Themes/Views/Admin/Install.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.aspx
rename : src/Orchard.Web/Core/Themes/Views/Admin/ThemePreview.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx
rename : src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/DisplayTemplates/Items/ContentItem.ascx
rename : src/Orchard.Web/Core/Themes/Views/Document.aspx => src/Orchard.Web/Modules/Orchard.Themes/Views/Document.aspx
rename : src/Orchard.Web/Core/Themes/Views/EditorTemplates/Items/ContentItem.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/EditorTemplates/Items/ContentItem.ascx
rename : src/Orchard.Web/Core/Themes/Views/HeadPreload.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/HeadPreload.ascx
rename : src/Orchard.Web/Core/Themes/Views/Header.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Header.ascx
rename : src/Orchard.Web/Core/Themes/Views/Layout.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Layout.ascx
rename : src/Orchard.Web/Core/Themes/Views/Menu.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Menu.ascx
rename : src/Orchard.Web/Core/Themes/Views/Messages.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/Messages.ascx
rename : src/Orchard.Web/Core/Themes/Views/NotFound.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/NotFound.ascx
rename : src/Orchard.Web/Core/Themes/Views/User.ascx => src/Orchard.Web/Modules/Orchard.Themes/Views/User.ascx
rename : src/Orchard.Web/Core/Themes/Views/Web.config => src/Orchard.Web/Modules/Orchard.Themes/Views/Web.config
rename : src/Orchard.Web/Core/Themes/Views/Web.config => src/Orchard.Web/Modules/Orchard.Themes/Web.config
 2010-04-22 14:39:09 -07:00
Louis DeJardin
b12ded8eb5 Merge 
--HG--
branch : dev
 2010-04-22 12:25:03 -07:00
Louis DeJardin
79431a11a2 Further progress towards tenant-specific routing 
Ability to follow redirects from integration tests
Route publisher wraps handler with ShellRoute which controls request lifetime scope
ShellRoute at the moment is restricted to "Default" - host and prefix TBD
Route publisher remove-and-insert routes for a specific tenant to allow incremental and repeated shell route publish
Offers a more deterministic knowledge of which shell container is used than just-in-time http context
Removes Autofac default httpmodule, controller factory, httpapplication icontainerprovideraccessor, etc
Adds support for optional ~/Config/Sites.{yourtenantname}.config file for manual per-shell component override
Integration tests capture Orchard and NHibernate trace output. Levels are configurable in orchard.specs diagnostics.config
Concept of IRunningShellTable instroduced. Might not be needed - will be removed if so.

--HG--
branch : dev
 2010-04-22 12:23:58 -07:00
Suha Can
45c2b3ec7e - tenant info <tenantName> command... 
--HG--
branch : dev
 2010-04-22 11:31:24 -07:00
Suha Can
fb87c02273 - Adding some switches for host/urlprefix to the multi-tenancy command handler. 
- Moving connection string (for SQL) to be a switch instead of arg.
- Refining output text from multi-tenancy commands, adding better help text.

--HG--
branch : dev
 2010-04-22 11:23:18 -07:00
Louis DeJardin
eaf553b048 Working towards routing support for miti-tenancy 
Adding large-grained initialization steps for integration tests
Fixing a collection issue with shell descriptor records and manager
Adding index action to tenants controller

--HG--
branch : dev
 2010-04-21 19:41:37 -07:00
Suha Can
5936a86d60 - Partial view for adding a new tenant... 
--HG--
branch : dev
 2010-04-21 16:30:24 -07:00
Suha Can
3a497a0c7b - Simple create tenant command for the tenant command handler. 
--HG--
branch : dev
 2010-04-21 16:00:03 -07:00
Suha Can
ed6b6a879e - CreateTenant on the service and related simple admin UI. 
--HG--
branch : dev
 2010-04-21 15:43:41 -07:00
Suha Can
410c304bbc - MultiTenancy module lists current tenants of the site. 
- TenantService abstraction to list/add tenants.
- TenantCommand and multitenancy admin controllers on top of the tenantservice.
- Simple Tenant list UI for the backend.

--HG--
branch : dev
 2010-04-21 13:53:03 -07:00
Suha Can
ccd082f417 - Adding the multi-tenancy module. 
--HG--
branch : dev
 2010-04-21 12:25:23 -07:00
Louis DeJardin
fc6acf68e1 Fixing an issue with order-of-execution in setup 
Database created and schema generated before the rest of the setup info is applied
Known set of minimum modules are used to generate schema, and are saved in the shell's records

--HG--
branch : dev
 2010-04-19 18:29:45 -07:00
Louis DeJardin
78d5711e1a Creating feature for extension name implicitly 
Supports existing module.txt file format
Reduces the size of a minimalistic descriptor file

--HG--
branch : dev
 2010-04-19 16:34:35 -07:00
Louis DeJardin
3509843b48 Compacting code and removing some obsolete things 
--HG--
branch : dev
 2010-04-17 22:14:31 -07:00
Louis DeJardin
71e019a0b8 Incremental changes towards enabling setup module 
Setup controller can render initial screen
SafeMode container factory moved into Orchard.Setup module
ShellBuilders namespace files compacted a bit
Core feature named "Orchard.Framework" and is not used in setup mode

--HG--
branch : dev
 2010-04-17 21:33:36 -07:00
Louis DeJardin
a137d84732 Working towards re-enabling setup context 
--HG--
branch : dev
 2010-04-17 19:22:26 -07:00
Louis DeJardin
6fb6ef0033 Relocating extensions to environment namespace 
--HG--
branch : dev
 2010-04-17 16:09:53 -07:00
Louis DeJardin
122ea0b629 Reimplementing DefaultShellContainerFactory : IShellContainerFactory 
Based on new interface which takes ShellTopology and returns ILifetimeScope
Other partial changes to DefaultOrchardHost
Several tests and web app currently broken

--HG--
branch : dev
 2010-04-15 00:52:58 -07:00
Renaud Paquay
ca47a0b8fb Fix build errors after merge 
--HG--
branch : dev
 2010-04-13 11:25:11 -07:00
Renaud Paquay
6c74a37693 Merge 
--HG--
branch : dev
rename : src/Orchard.Tests/Orchard.Tests.csproj => src/Orchard.Tests/Orchard.Framework.Tests.csproj
rename : src/Orchard/Orchard.csproj => src/Orchard/Orchard.Framework.csproj
 2010-04-13 11:14:32 -07:00
Suha Can
c9a3913dbf - Importing patch from smwhit for issue 16373 2010-04-08 12:23:30 -07:00
Louis DeJardin
7172a784c0 Fixing an incomplete save/merge for previous commit 
--HG--
branch : dev
 2010-04-07 15:41:43 -07:00
Renaud Paquay
9647bb3f6b Rename "Orchard" to "Orchard.Framework" 
--HG--
branch : dev
rename : src/Orchard.Tests/Orchard.Tests.csproj => src/Orchard.Tests/Orchard.Framework.Tests.csproj
rename : src/Orchard/Orchard.csproj => src/Orchard/Orchard.Framework.csproj
 2010-04-07 14:48:11 -07:00
Anthony Steele
4b96ede0be Removed unneeded project references and using statements 2010-04-07 21:40:16 +01:00
Suha Can
c26b03d046 - Making some adjustments to the previous contributions. 
- Unit tests for StringExtensions belongs to the Utility\ folder.
- Unit tests files are named after classes.
- Use localizedstrings via the T localizer injected as a controller property instead of plain strings.
 2010-04-07 11:36:43 -07:00
smwhit
8fcbea38c2 Issue 16229. Validation for empty filenames when uploading media 2010-04-07 15:31:16 +01:00
Andrew Ma
fde6eef6b9 Fix for issue [workitem:16371] 
Removing FollowReturnUrl filter because it always gets executed and does not allow actions to return other view or redirect to other locations.
Replacing filter with a Controller extension method called ReturnUrlRedirect which parses the ReturnUrl in the querystring and returns a RedirectFilter action with that Url.
 2010-04-05 22:36:30 -07:00
rpaquay@microsoft.com
3f89eb1417 Fix issue with generating LINK tags for Live Writer manifests 
Use "AbsoluteAction" helper method instead of hard-coded
"http://localhost:30320".

--HG--
branch : dev
 2010-03-11 17:03:37 -08:00
jowall
7798083a8d Updated CSS to green, classic, and classic dark themes. 
--HG--
branch : dev
 2010-03-09 20:55:38 -08:00
Nathan Heskew
a9c7c8ea14 Giving the blog post metadata summary template a little inline info 
--HG--
branch : dev
 2010-03-09 19:51:38 -08:00
Michael Dorian Bach
189d1e9a10 Merge 
--HG--
branch : dev
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Highlights.html => src/Orchard.Web/Themes/Contoso/Zones/Highlights.html
 2010-03-09 19:41:09 -08:00
Michael Dorian Bach
1cd6b63006 Merge 
--HG--
branch : dev
 2010-03-09 19:35:57 -08:00
Michael Dorian Bach
bdff945dbc CSS Fixes for Contoso Theme. 
Add HTML for markup around various elements in module views index/search

--HG--
branch : dev
 2010-03-09 19:35:06 -08:00
Michael Dorian Bach
c52f802827 Wrapping div around archive bread-crumb trail and added class to H1 page header 
--HG--
branch : dev
 2010-03-09 18:11:12 -08:00
Nathan Heskew
fa9dc2d728 Wrapping up some cleanup work in the admin. 
--HG--
branch : dev
 2010-03-09 17:08:37 -08:00
Erik Porter
4b41550957 Renamed "DesignerNotes" to "Zones" 
--HG--
branch : dev
rename : src/Orchard.Web/Themes/Classic/DesignerNotes/Sidebar.html => src/Orchard.Web/Themes/Classic/Zones/Sidebar.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Highlights.html => src/Orchard.Web/Themes/Contoso/Zones/Highlights.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Home-Hero-Gallery.html => src/Orchard.Web/Themes/Contoso/Zones/Home-Hero-Gallery.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Home-Hero.html => src/Orchard.Web/Themes/Contoso/Zones/Home-Hero.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Sidebar-w2.html => src/Orchard.Web/Themes/Contoso/Zones/Sidebar-w2.html
rename : src/Orchard.Web/Themes/Contoso/DesignerNotes/Sidebar-w3.html => src/Orchard.Web/Themes/Contoso/Zones/Sidebar-w3.html
rename : src/Orchard.Web/Themes/Green/DesignerNotes/User1.html => src/Orchard.Web/Themes/Green/Zones/User1.html
rename : src/Orchard.Web/Themes/Green/DesignerNotes/User2.html => src/Orchard.Web/Themes/Green/Zones/User2.html
rename : src/Orchard.Web/Themes/Green/DesignerNotes/User3.html => src/Orchard.Web/Themes/Green/Zones/User3.html
 2010-03-09 16:19:45 -08:00
Nathan Heskew
390538a744 Fixing the page.summary display title link when used from a different module 
--HG--
branch : dev
 2010-03-09 15:45:59 -08:00
Nathan Heskew
86722cad7e Fixing up the existing comment UI in the HasComments editor template 
--HG--
branch : dev
 2010-03-09 11:43:21 -08:00
Nathan Heskew
5a34ad7c19 Changing the zone target for the blog archives "widget" to "sidebar" 
...from "secondary"

--HG--
branch : dev
 2010-03-09 07:42:04 -08:00
Nathan Heskew
069a6f5439 Setting up "Add to home page" for page create 
--HG--
branch : dev
 2010-03-09 02:29:11 -08:00
Nathan Heskew
0291653273 Setting up "Add to home page" for blog create 
--HG--
branch : dev
 2010-03-09 02:16:08 -08:00
Erik Porter
012137726e Changed DiscardDraft actions on page/blogpost to be antiforgery checked 
--HG--
branch : dev
 2010-03-09 02:01:52 -08:00
Erik Porter
21bcaa1139 Ensuring that usage of "Add/Edit/Remove" for actions is consistent across modules 
--HG--
branch : dev
 2010-03-09 01:13:07 -08:00
Nathan Heskew
7daf068e30 Merge 
--HG--
branch : dev
 2010-03-09 01:01:54 -08:00
Nathan Heskew
4a0b3f8468 Adding some helpful focus the form functionality for logon and setup 
--HG--
branch : dev
 2010-03-09 00:55:56 -08:00
Erik Porter
b435e81533 Converted LogOn, LogOff, AccessDenied to use the new FollowReturnUrl attribute 
--HG--
branch : dev
 2010-03-09 00:41:17 -08:00
Erik Porter
64a5415725 Add a FollowReturnUrl attribute to honor ReturnUrl in the querystring 
--HG--
branch : dev
 2010-03-08 23:54:18 -08:00
Erik Porter
60d1d8d652 Merge 
--HG--
branch : dev
 2010-03-08 16:46:00 -08:00
Erik Porter
6b27c2b2c7 Made blogpost getting its blog property filled more generic (fixes last checkin) 
--HG--
branch : dev
 2010-03-08 16:45:11 -08:00