lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2,801 Commits 94 Branches 33 Tags
21c04e45da3ebac9c4371c1b11469c6edbfe2423
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Heskew 21c04e45da Adding a layout classification helper function to TheThemeMachine's layout 
--HG--
branch : dev
 2010-10-15 15:15:44 -07:00
Nathan Heskew cc13efad06 Merge 
--HG--
branch : dev
 2010-10-15 14:41:01 -07:00
Nathan Heskew 262f4a4559 Getting Orchard.Blogs on the new UI composition model (for display) 
--HG--
branch : dev
 2010-10-15 14:40:35 -07:00
Nathan Heskew 4fa953c150 Merge 
--HG--
branch : dev
 2010-10-14 21:12:45 -07:00
Nathan Heskew d6cdd6d239 Getting live writer support hooked back up to blogs 
...w/out breaking blogs' paging

--HG--
branch : dev
 2010-10-14 21:12:08 -07:00
Nathan Heskew 885ddaac26 Merge 
--HG--
branch : dev
 2010-10-14 17:17:38 -07:00
Nathan Heskew defe72cf52 No Cassini for new theme container proj 
--HG--
branch : dev
 2010-10-14 17:16:41 -07:00
Nathan Heskew 04c517931f Changing around Widget wrappers a little more... 
--HG--
branch : dev
 2010-10-14 16:04:36 -07:00
Nathan Heskew 1bbaf8f48f Merge 
--HG--
branch : dev
 2010-10-14 15:47:14 -07:00
Nathan Heskew fafb34f071 Changing around some default content created during setup 
--HG--
branch : dev
 2010-10-14 15:46:50 -07:00
Nathan Heskew dac29d3aef Changing up Widget wrappers a little 
--HG--
branch : dev
 2010-10-14 15:45:47 -07:00
Nathan Heskew c4621deae3 Adding a GetEnabledThemes() so the WidgetService can get the zones of only enabled themes 
--HG--
branch : dev
 2010-10-14 15:14:04 -07:00
Nathan Heskew 64c1bdf243 Updating TheThemeMachine's layout with zone awesomeness 
--HG--
branch : dev
 2010-10-14 13:21:46 -07:00
Nathan Heskew 39adeb5f5a Putting the shape table debug output into Orchard.Experimental 
--HG--
branch : dev
 2010-10-14 11:53:45 -07:00
Nathan Heskew 2ea7ef7f52 Fixing blog post links in the summary admin view 
Semi-related to http://orchardqa.codeplex.com/workitem/103

--HG--
branch : dev
 2010-10-14 11:28:21 -07:00
Nathan Heskew dc5cc339a7 Getting Blogs onto the new UI composotion model 
--HG--
branch : dev
 2010-10-14 11:15:22 -07:00
Nathan Heskew 38a20fb68f Some progress on getting blogs back in order. 
Definately still in progress. Even what has been changed is not necessarily baked.

--HG--
branch : dev
 2010-10-13 11:01:21 -07:00
Nathan Heskew 14aef1985f Reassembling* the admin content (management) list and content item edit 
* edit partially on the new UI composition model

--HG--
branch : dev
 2010-10-13 04:51:15 -07:00
Nathan Heskew ec7f111021 Adding a couple of widget wrappers including a manage version w/ edit link 
--HG--
branch : dev
 2010-10-13 01:30:10 -07:00
Nathan Heskew cfa1601676 Adding something for the page title to the core document template (and widget shape template)* 
*exploration work

--HG--
branch : dev
 2010-10-13 01:02:54 -07:00
Nathan Heskew 8e2f7e974a Changing the default theme to TheThemeMachine, adding some more content widgets @ startup (for lack of a better place ATM - distro or some filler content scheme) and some shape templates 
--HG--
branch : dev
 2010-10-12 23:34:41 -07:00
Nathan Heskew 789b00a0f3 Pulling the FlatPositionComparer* out of Orchard.Core's CoreShapes and changing the widget managemen index to use that 
* need to reconcile this and the Orchard.UI.Navigation.PositionComparer and make the comparer work with negative numbers w/ null/""/0 as the default

--HG--
branch : dev
 2010-10-12 15:57:22 -07:00
Nathan Heskew f7b77808fc Adding a rudimentary recent blog posts widget 
--HG--
branch : dev
 2010-10-12 13:53:17 -07:00
Nathan Heskew 9c2923f781 Adding other zones from the theme machine to its theme.txt and giving the homepage's htmlwidget a position value that makes the widget management UI happy 
--HG--
branch : dev
 2010-10-12 11:29:17 -07:00
Nathan Heskew 09eec89a3f Addin the CommonPart to the WidgetPage 
--HG--
branch : dev
 2010-10-12 10:18:51 -07:00
Nathan Heskew 1506a588db pushing the composition branch 
--HG--
branch : composition
 2010-10-12 10:18:19 -07:00
Nathan Heskew 9e2c340be0 Setting the owner of the homepage created during setup 
--HG--
branch : dev
 2010-10-12 08:40:59 -07:00
Nathan Heskew 4e0f8430e2 Cleaning out the (commented out) code for creating the initial content page during setup 
--HG--
branch : dev
 2010-10-12 08:36:41 -07:00
Nathan Heskew 9536b74fa2 Adding an html widget to the homepage @ setup (w/ content from previous homepage page) 
--HG--
branch : dev
 2010-10-12 00:57:52 -07:00
Nathan Heskew f334a171c1 Adding an html widget to the homepage @ setup (w/ content from previous homepage page) 
--HG--
branch : dev
 2010-10-12 00:57:52 -07:00
Nathan Heskew b1e80feba8 Merge 
--HG--
branch : dev
 2010-10-12 09:39:34 -07:00
Nathan Heskew f1d8f3ee22 Merge 
--HG--
branch : dev
 2010-10-12 09:39:11 -07:00
Nathan Heskew 766ee10a6c Adding the "current" class back to the current menu item 
--HG--
branch : dev
 2010-10-12 09:04:48 -07:00
Nathan Heskew 302d0585b9 Changing primary content zone to "Primary" (from "primary") 
--HG--
branch : dev
 2010-10-11 15:45:32 -07:00
Nathan Heskew 41af6c2660 Fixing paste-into-vs js errors 
--HG--
branch : dev
 2010-10-11 12:55:48 -07:00
Nathan Heskew 62ddb9498a Adding html5shim to the core shapes (document template) 
--HG--
branch : dev
 2010-10-11 11:45:22 -07:00
Nathan Heskew b7510e014a Getting the comments display UI to render 
Only verified to display on a blog post. A little more work is still needed on the comments driver/templates (make more dynamic and a little cleanup).

--HG--
branch : dev
 2010-10-11 10:28:00 -07:00
Nathan Heskew 71ead6bae3 Changing parts shapes to use the "Parts_" prefix convention. 
Similart to content items now (Items_*) and what fields will use (Fields_*)

--HG--
branch : dev
 2010-10-11 09:45:29 -07:00
Nathan Heskew ddca57edd4 Making progress on updating the content manager API fit better with the new dynamic UI composition scheme 
- Includes changing display-related implementations (drivers & views) to work with shapes
- Editor implementations still on the old template model
- Orchard.Blogs is currently using a different display type instead of specifying alterations (for Blog and BlogPost)

--HG--
branch : dev
 2010-10-11 02:06:01 -07:00
Nathan Heskew b7c3ada825 Updating some file references in TheThemeMachine 
--HG--
branch : dev
 2010-10-09 14:57:49 -07:00
Nathan Heskew 51c1a8104a Getting the Orchard.Specs tests back up and running 
--HG--
branch : dev
 2010-10-09 07:34:35 -07:00
Nathan Heskew 05f8b56de4 Merge 
--HG--
branch : dev
 2010-10-08 16:59:35 -07:00
Nathan Heskew cc3d6b1472 Making use of the ShapeAlterationBuilder OnDisplaying method to set appropriate (CSS) class names to Menu and Zone shapes 
--HG--
branch : dev
 2010-10-08 16:58:39 -07:00
Nathan Heskew 9fe274a7d4 Adding a new WidgetPage content type and WidgetsBagPart to support a widget only page and making *the* home page a WidgetPage to support the new default theme* 
- Current WidgetsBagPart only links to the widget management page so widget management isn't in more than one place (would be the case if Content zone widgets management were part of this part)

*could be configured through the distribution instead when that's implemented

--HG--
branch : dev
 2010-10-08 13:53:27 -07:00
Nathan Heskew ebdc937835 Merge 
--HG--
branch : dev
 2010-10-08 11:44:32 -07:00
Nathan Heskew 45933ca700 Merge 
--HG--
branch : dev
 2010-10-07 23:17:29 -07:00
Nathan Heskew 11d83885ce Adding a property and a couple methods to the base view class(es) 
- Layout (shortcut for WorkContext.Layout)
- HasText(object thing) (shortcut for !string.IsNullOrWhiteSpace(thing as string))
- Tag(dynamic shape, string tagName) (shortcut for Html.Resolve<ITagBuilderFactory>().Create(shape, tagName))

--HG--
branch : dev
 2010-10-07 22:29:11 -07:00
Nathan Heskew ada998da83 Merge 
--HG--
branch : dev
 2010-10-07 12:58:25 -07:00
Nathan Heskew 6dbbe6e1f0 Some minor post-mvc3 beta upgrade fixes 
--HG--
branch : dev
 2010-10-07 12:50:51 -07:00
Nathan Heskew 1e22892c71 WorkContext.Page -> WorkContext.Layout to be consistent with the shape's template and type names 
--HG--
branch : dev
 2010-10-07 12:11:49 -07:00
Nathan Heskew 7503606d74 More progress on defining new UI capabilities.. 
--HG--
branch : dev
 2010-10-06 14:02:37 -07:00
Nathan Heskew 1a2fdc10ff Accounting for themes with base themes with base themes with... 
--HG--
branch : dev
 2010-10-05 15:53:32 -07:00
Nathan Heskew 7b36d725b5 Adding a BaseTheme property to Theme 
--HG--
branch : dev
 2010-10-05 13:55:29 -07:00
Nathan Heskew f3af5ea7d9 More progress on defining new UI capabilities. 
--HG--
branch : dev
 2010-10-05 08:28:06 -07:00
Nathan Heskew 6e8880705f More progress on defining new UI capabilities 
--HG--
branch : dev
 2010-10-04 09:50:59 -07:00
Nathan Heskew bf5e85000d Fixing a setup specflow test 
--HG--
branch : dev
 2010-10-01 11:13:53 -07:00
Nathan Heskew 81fad6fb05 Starting to dream up the new theme...up 
--HG--
branch : dev
 2010-09-30 13:03:48 -07:00
Nathan Heskew df77d8229e Changing a bunch of .cshtml file references to "Content" (instead of "None") 
--HG--
branch : dev
 2010-09-24 07:58:44 -07:00
Nathan Heskew 2e3c05afcc Temporary solution to get zone items in order 
--HG--
branch : dev
 2010-09-22 17:22:48 -07:00
Nathan Heskew f6b895960c Fixing a Style.Require in a Core.Localization template 
--HG--
branch : dev
 2010-09-22 14:06:30 -07:00
Nathan Heskew a27b00ba7d Bringing in the base js for Navigation.EditMenuPart template 
--HG--
branch : dev
 2010-09-22 12:36:35 -07:00
Nathan Heskew 732bc5ffa9 Clean up a couple of Style.Require's in Core.Localization templates 
--HG--
branch : dev
 2010-09-22 12:31:18 -07:00
Nathan Heskew 5b18a3f0c4 Changing the page (content type) configuration during setup to not add the CommentsPart 
- content type configuration should go to the appropriate modules (blog & post in orchard.blogs, page in a new orchard.pages that's pretty much only initially for page content type configuration)

--HG--
branch : dev
 2010-09-22 12:16:03 -07:00
Nathan Heskew 9b5e9c9633 Finished conversion of Core.Localization 
--HG--
branch : dev
 2010-09-22 12:08:06 -07:00
Nathan Heskew d8342b9776 Re-enabling the rest of what was disabled in the SetupService 
- also tossed out some Orchard.Comments specific code

--HG--
branch : dev
 2010-09-22 11:36:39 -07:00
Nathan Heskew 7c4d00ee01 Converting/cleaning a few templates in Core.Shapes 
--HG--
branch : dev
 2010-09-21 21:43:46 -07:00
Nathan Heskew df66338fd1 Finished converting Core.Contents 
--HG--
branch : dev
 2010-09-21 21:38:20 -07:00
Nathan Heskew 17eade34db Some progress on converting Core.Contents 
--HG--
branch : dev
 2010-09-21 16:09:31 -07:00
Nathan Heskew fd9152eb4f Changed the default theme back to "Classic" for now and making "Classic" look decent w/ existing CSS and minimal template overrides 
--HG--
branch : dev
 2010-09-21 13:56:51 -07:00
Nathan Heskew 8b0d80f0bf Merge 
--HG--
branch : dev
 2010-09-21 00:59:52 -07:00
Nathan Heskew 305fd9ef22 Getting setup looking a little more as it should 
--HG--
branch : dev
 2010-09-21 00:58:56 -07:00
Nathan Heskew 6f59fbabc9 Merge 
--HG--
branch : dev
 2010-09-17 01:09:37 -07:00
Nathan Heskew f6d4d05c22 Migrating Orchard.Blogs 
--HG--
branch : dev
 2010-09-17 01:00:24 -07:00
Nathan Heskew 63760e53c4 Removing the last of Orchard.Pages 
--HG--
branch : theming
 2010-09-14 13:26:49 -07:00
Nathan Heskew 5cb5d0868f Tweaking the UI debugging...UI...so it's not so "in yo' face" by default 
--HG--
branch : theming
 2010-09-14 07:24:54 -07:00
Nathan Heskew a0188e8aca Taking the Contoso footer out of the display for now 
--HG--
branch : theming
 2010-09-13 18:28:54 -07:00
Nathan Heskew f4b7e29a07 Added work context providers for the current site and user 
--HG--
branch : theming
 2010-09-13 18:27:42 -07:00
Nathan Heskew 5e53b4dd46 Getting display in order for the (routable-specified) home page 
--HG--
branch : theming
 2010-09-13 14:48:22 -07:00
Nathan Heskew a996aac51f A bit more work getting content display in order 
- content title added to the item shape (@Model.Title)
- some rough content item shape structure - needs real body zones and footer (need header @ footer markup at least as zone wrappers in a way so if there is nothing in the zone the tags aren't rendered)
- page title usage back in the picture though (impl.) not really touched
- contents and routable display type actions all falling back to the core shaped "Display" view

--HG--
branch : theming
 2010-09-13 14:26:07 -07:00
Nathan Heskew 91862c6672 Getting the routable display to work and added a display part template (for the title) 
- the title should probably be linked
- would it be useful for some route part properties to be on the model (for Model.Title) or is there already an easy way to get at that?

--HG--
branch : theming
 2010-09-13 00:09:59 -07:00
Nathan Heskew 2c19ba8ed2 A little more tweaking of the (devtools) UI debugging template 
--HG--
branch : theming
 2010-09-10 13:04:28 -07:00
Nathan Heskew 78f4923efc Getting the main menu rendering again (from a fresh setup) 
--HG--
branch : theming
 2010-09-10 13:03:29 -07:00
Nathan Heskew 7ec1fa74e4 Shaping up the admin contents list a bit more and giving the UI shape template debug style a little something extra* 
*still not meant as *the* long-term UI debugging solution but it does the trick for now

--HG--
branch : theming
 2010-09-10 08:56:10 -07:00
Nathan Heskew 88f2ec10eb Roughly hooking up more of the content admin list rendering 
--HG--
branch : theming
 2010-09-09 13:53:06 -07:00
Nathan Heskew b78e47cad8 Some work on getting the content admin list rendering 
--HG--
branch : theming
 2010-09-09 00:01:46 -07:00
Nathan Heskew ecf192dc65 Getting child content rendered in the core layout 
--HG--
branch : theming
 2010-09-08 22:41:46 -07:00
Nathan Heskew e758d63fb7 Moved base templates from the Themes module to a new (Orchard.Core) Shapes module (to become core shape templates) 
--HG--
branch : theming
 2010-09-07 16:00:04 -07:00
Nathan Heskew 3fa536d7a8 Removing BaseViewModel and ContentItemViewModel for good 
--HG--
branch : theming
 2010-09-07 13:45:50 -07:00
Nathan Heskew 043bcf54ee Retiring ContentItemViewModel 
...and all that entails
- things like IZone and IZoneCollection are barely roughed in

--HG--
branch : theming
 2010-09-03 16:04:42 -07:00
Nathan Heskew 33d47b3c39 Build*Model -> Build*Shape (in process of changing to work with (Clay) shapes instead of ContentItemViewModel) 
--HG--
branch : dev
 2010-09-02 15:11:33 -07:00
Nathan Heskew 203b3e09c6 Retiring IContentItemDriver 
--HG--
branch : dev
 2010-09-02 15:10:27 -07:00
Nathan Heskew a40ebd5f7e Cleaned out remaining dependencies on BaseViewModel (sln builds once again - yay) 
--HG--
branch : dev
 2010-09-01 15:51:41 -07:00
Nathan Heskew d6e3ac97dd Repairing some action filters and changing one more to use IWorkContextAccessor (have a few still to go) 
--HG--
branch : dev
 2010-09-01 15:43:14 -07:00
Nathan Heskew 1c9141a988 Refactoring framework (action) filters to use IWorkContextAccessor instead of BaseViewModel 
--HG--
branch : dev
 2010-09-01 15:35:13 -07:00
Nathan Heskew 026764544a Making all of the view models not inherit from BaseViewModel 
--HG--
branch : dev
 2010-09-01 15:33:31 -07:00
Nathan Heskew 7dd863624a Some initial work towards the new rendering scheme 
--HG--
branch : dev
 2010-09-01 13:46:13 -07:00
Nathan Heskew dfb6e98af0 Also pulling AdaptedViewModel 
--HG--
branch : dev
 2010-09-01 11:41:06 -07:00
Nathan Heskew 61210404fa Removing the BaseViewModel. It has no place in the new world of rendering. 
--HG--
branch : dev
 2010-09-01 11:34:16 -07:00
Nathan Heskew 69a18e8a53 Pulling references to a bunch of modules not necessary for a minimum configuration 
--HG--
branch : dev
 2010-09-01 11:31:26 -07:00
Nathan Heskew dec2775d47 Starting to break stuff in order to make things better...(starting w/ the Contents module) 
Many modules are disabled by default to keep them out of the way for now. Run through the setup and hit ~/Contents/Item/Display/3 to get the homepage page

--HG--
branch : dev
extra : transplant_source : %8EH%F5%06%12%1D%3D%FC%7Bl%D6p%CF%DB%DAp%BF%1C%DB%A5
 2010-08-31 11:50:07 -07:00