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
5,036 Commits 94 Branches 33 Tags
1dbc40c6acd6db3f5a606719aef8f2ed40f77a42
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Heskew a4248217cd Changing how user removal works. 
--HG--
branch : 1.x
 2011-04-08 15:01:33 -07:00
Nathan Heskew e81f1ed1ba Fixing some preliminary specflow tests. 
--HG--
branch : 1.x
 2011-04-08 14:32:05 -07:00
Nathan Heskew 6bf32dbbfb Getting the widget layer hinting on Page creation working reliably. 
work item: 17681

--HG--
branch : 1.x
 2011-04-08 13:09:13 -07:00
Nathan Heskew 9981dfe3ff Fixing the admin menu icon position for the content types in the "New" group. 
--HG--
branch : 1.x
 2011-04-08 11:23:06 -07:00
Nathan Heskew 64e0bb1048 Correcting the slashes in paths for specflow tests. 
Helps to correct the invalid values (according to Url.IsLocalUrl) for the return
URLs we've been seeing in the spec tests. Gets the "works on my box" stamp of approval.

--HG--
branch : 1.x
 2011-04-08 11:05:19 -07:00
Nathan Heskew 291f1b3503 Using Request.RawUrl for the returnUrl (in the Widgets module) to keep it relative. 
--HG--
branch : 1.x
 2011-04-08 11:02:13 -07:00
Nathan Heskew 9050dd7bd6 Merge 
--HG--
branch : 1.x
 2011-04-07 16:01:20 -07:00
Nathan Heskew 6b65d0a170 Merge 
--HG--
branch : 1.x
 2011-04-07 15:59:37 -07:00
Nathan Heskew 62fa1da5f2 Adding a specflow test for widgets (yeah, just one :|) and making some tweaks to the specflow capabilities to enable the flow required by that test... 
--HG--
branch : 1.x
 2011-04-07 15:58:30 -07:00
Nathan Heskew 8c336638b3 Changing the HttpRequestExtensions to use request.Url.Host instead of request.Headers["Host"] 
...since that's what WebPages' IsUrlLocalToHost uses for
local URL checking. This became an issue in the spec tests where the header
didn't match the Url property.

--HG--
branch : 1.x
 2011-04-07 15:53:35 -07:00
Nathan Heskew 4bae73efe2 Adding more Widget spec tests (progress...) 
--HG--
branch : 1.x
 2011-04-06 15:43:20 -07:00
Nathan Heskew ea11a4d2c9 Ensuring the layer change when adding a widget overrides the persisted container ID from the CommonPart 
work item: 17671

--HG--
branch : 1.x
 2011-04-06 14:16:15 -07:00
Nathan Heskew 5f28ffaa86 Adding the ability to put (CSS) classes on menu items. 
Making use of it by adding a "collapsed" class to the admin menu's settings
top-level item to have it collapse by default (with some adjustment to the admin.js)

work item: 17599

--HG--
branch : 1.x
 2011-04-06 14:09:54 -07:00
Nathan Heskew d37522e31c Fixing a couple of TheAdmin CSS (csproj) includes and adding a .group to the layout's content div. 
--HG--
branch : 1.x
 2011-04-06 11:13:32 -07:00
Nathan Heskew 8cf0dc7dec Cleaning up the widgets admin CSS a little. 
--HG--
branch : 1.x
 2011-04-06 10:51:24 -07:00
Nathan Heskew 48975f4ca4 Forbidding the use of backslashes in slugs. 
work item: 16593

--HG--
branch : 1.x
 2011-04-05 13:32:43 -07:00
Nathan Heskew dd210ab801 Ensuring the layer change when editing a widget overrides the persisted container ID from the CommonPart 
work item: 17650

--HG--
branch : 1.x
 2011-04-05 13:10:23 -07:00
Nathan Heskew 38f1039b7d Changing the usage of "slug" in error messages to "permalink" to match the field's label. 
work item: 17417

--HG--
branch : 1.x
 2011-04-04 10:50:04 -07:00
Nathan Heskew b3525798cd Getting the widget layer control and zone view switcher to work better in IE <=8 w/out breaking better browsers. 
--HG--
branch : 1.x
 2011-04-01 11:02:30 -07:00
Nathan Heskew 23849e7050 Giving the content admin menu items a default icon and fixing their hover and selected states. 
work item: 17412

--HG--
branch : 1.x
 2011-03-31 14:37:11 -07:00
Nathan Heskew bd100ff27c Fixing the widgets UI in IE <= 8 
--HG--
branch : 1.x
 2011-03-31 14:17:22 -07:00
Nathan Heskew be9d68bcdb Adding a hover state on widgets to reveal which layer it's in and which widgets are in the same layer. 
--HG--
branch : 1.x
 2011-03-31 13:52:20 -07:00
Nathan Heskew 2d468fa229 Merge 
--HG--
branch : 1.x
 2011-03-31 12:36:02 -07:00
Nathan Heskew 60b68312c2 Fixing the layer visibility UI. IE <= 8 didn't deal with the invalid markup very well. 
--HG--
branch : 1.x
 2011-03-31 12:27:48 -07:00
Nathan Heskew 4f6a021beb Making sure the layer edit and delete actions return to the correct location. 
work item: 17616

--HG--
branch : 1.x
 2011-03-31 12:02:01 -07:00
Nathan Heskew e179e821b3 Getting the widget management actions to work back to at least IE7... 
work item: 17521

--HG--
branch : 1.x
 2011-03-31 11:42:32 -07:00
Nathan Heskew 7a630fc480 Redirecting to the widget management page with the correct layer context after creating a layer. 
work item: 17591

--HG--
branch : 1.x
 2011-03-30 14:28:46 -07:00
Nathan Heskew e74b2855a0 +1 (file missing from the previous checkin) 
--HG--
branch : 1.x
 2011-03-30 12:18:38 -07:00
Nathan Heskew 275ec294e1 Merge 
--HG--
branch : 1.x
 2011-03-30 12:10:20 -07:00
Nathan Heskew 4c5e5664e0 Having the global widget management UI not blow up if a widget has no CommonPart. 
Also added something in the UI to show prominantly widgets which really have problems. Currently problems == no CommonPart.

work item: 17381

--HG--
branch : 1.x
 2011-03-30 12:09:22 -07:00
Nathan Heskew 12980d09c4 Making sure changes to the (CommonPart) Owner field are applied. 
work item: 17143

--HG--
branch : 1.x
 2011-03-29 15:59:44 -07:00
Nathan Heskew 38fd85900a Merge 
--HG--
branch : 1.x
 2011-03-29 15:30:08 -07:00
Nathan Heskew 75f51b52fc Making sure the nearest defined zones in the theme/basetheme chain are considered as the zones for the theme in question. 
work item: 17575

--HG--
branch : 1.x
 2011-03-29 15:28:14 -07:00
Nathan Heskew e1b24f8678 Cleaning up the menu for when a user with limited admin access is given orphaned admin menu headers. 
work item: 17420

--HG--
branch : 1.x
 2011-03-29 14:33:18 -07:00
Nathan Heskew 2d2ff2d9a4 Fixing the logic for the toggleWhatYouControl show/hide bit. 
work item: 17528

--HG--
branch : 1.x
 2011-03-29 13:14:04 -07:00
Nathan Heskew ee38c329e9 Ensuring duplicate notification messages aren't displayed. 
A problem in general. Helps to resolve...

work item: 17529

--HG--
branch : 1.x
 2011-03-28 11:00:17 -07:00
Nathan Heskew b369eaa11b Making sure the global widget admin page is still usable when no layers are defined. 
work item: 17538

--HG--
branch : 1.x
 2011-03-28 10:27:35 -07:00
Nathan Heskew adbd9da232 Merge 
--HG--
branch : 1.x
 2011-03-28 10:15:22 -07:00
Nathan Heskew 6425afd199 Making sure the edit content control style contains its children('s floats) 
work item: 17405

--HG--
branch : 1.x
 2011-03-28 10:14:43 -07:00
Nathan Heskew f8467c108e Bringing the widget layer control back to the front. 
--HG--
branch : dev
 2011-03-25 20:20:33 -07:00
Nathan Heskew b5ae02717d Switching the layer visibility and zone preview image sections. 
--HG--
branch : dev
 2011-03-25 15:49:03 -07:00
Nathan Heskew 78c1367f22 Not attempting to show a widget zone preview image if the currently active theme doesn't have one. 
--HG--
branch : dev
 2011-03-25 14:32:40 -07:00
Nathan Heskew cdc7ae00f7 Merge 
--HG--
branch : dev
 2011-03-25 11:26:54 -07:00
Nathan Heskew 7106068dc8 Part II of the previous checkin. 
--HG--
branch : dev
 2011-03-25 11:26:38 -07:00
Nathan Heskew 9cc26b20cc Splitting the widget global management zone placement UI into zones which are 
applicable to the current theme and zones which are not.

--HG--
branch : dev
 2011-03-25 11:25:42 -07:00
Nathan Heskew 10f46dadf7 Adding a pipe ('|') in between action links on available themes. 
--HG--
branch : dev
 2011-03-25 10:30:06 -07:00
Nathan Heskew ccd27a4944 Very minor cleanup in the LayerHintHandler 
--HG--
branch : dev
 2011-03-24 14:59:13 -07:00
Nathan Heskew 6d6d7fbb5b Merge 
--HG--
branch : dev
 2011-03-24 14:53:14 -07:00
Nathan Heskew 12e1769cd3 Show the widget layer creation hint only when a "Page" type is taken from an unpublished -> published state. 
The hint won't appear with subsequent publishes of the page *but* it will appear if the page is unpublished then later published.

--HG--
branch : dev
 2011-03-24 14:52:04 -07:00
Nathan Heskew b84da10a4d Showing all layers in the widget layer visibility block. 
--HG--
branch : dev
 2011-03-24 12:04:08 -07:00
Nathan Heskew 5f18d79cf7 Fixing the ChooseWidget layer retrieval. 
--HG--
branch : dev
 2011-03-24 11:27:26 -07:00
Nathan Heskew f51dc24032 Putting the widget layer hinting notification into it's own feature... 
...so it can be disabled when it becomes annoying.

It's enabled by default in the blog and default recipies.

--HG--
branch : dev
 2011-03-23 14:47:35 -07:00
Nathan Heskew 1f4248fe6a The LayerHintHandler is indeed a Handler (was left in Drivers) 
--HG--
branch : dev
 2011-03-23 14:07:44 -07:00
Nathan Heskew 9ab3d21e48 Fixing the Widgets module dependencies 
--HG--
branch : dev
 2011-03-23 12:18:46 -07:00
Nathan Heskew 86c6e4052f Adding something for the theme zone preview image. 
--HG--
branch : dev
 2011-03-23 12:00:45 -07:00
Nathan Heskew f98505d75f Merge 
--HG--
branch : dev
 2011-03-23 11:13:51 -07:00
Nathan Heskew dd31fbdfe3 Merge 
--HG--
branch : dev
 2011-03-23 11:05:40 -07:00
Nathan Heskew 4703aa1429 Getting the "add layer" hint hooked up for published content. 
Hint notification message appears anytime the content is published, not just on
creation. Need to recognize an existing layer for the to be hinted layer rule so
we don't send the user down the path of duplicate layer creation.

--HG--
branch : dev
 2011-03-23 11:04:51 -07:00
Nathan Heskew 8f77ef608e Touching up the global widget management UI a little. 
--HG--
branch : dev
 2011-03-23 09:57:40 -07:00
Nathan Heskew 343f447244 Adding an info notification to newly created (RoutePart) content 
--HG--
branch : dev
 2011-03-22 15:55:37 -07:00
Nathan Heskew 37d4b9242a Merge 
--HG--
branch : dev
 2011-03-22 13:15:45 -07:00
Nathan Heskew 56d4914bbb Adding a bit of JS-only UI for layer visibility. 
A little rough and might consider showing layers w/o widgets in some way...

--HG--
branch : dev
 2011-03-22 13:14:29 -07:00
Nathan Heskew d95de559cb Cleaning out some duplicate file includes in the Orchard.Widgets.csproj 
--HG--
branch : dev
 2011-03-22 10:55:17 -07:00
Nathan Heskew 893c626d99 Breaking the global widget management UI into seperate, more task-focused, tempaltes 
--HG--
branch : dev
 2011-03-22 10:43:36 -07:00
Nathan Heskew f8c6994b1c Some more global widget management work 
- added "remove" widget link if the widget is in the current layer
- added "move to current layer" link if the widgets is in a different layer
- added an interim visual cue for widgets in the current layer

--HG--
branch : dev
 2011-03-21 12:41:28 -07:00
Nathan Heskew f8fea3303b Updating the Core Document shape template to better recognize if the app root is being displayed. 
--HG--
branch : dev
 2011-03-21 10:10:58 -07:00
Nathan Heskew 49558c0594 Merge 
--HG--
branch : dev
 2011-03-18 13:58:41 -07:00
Nathan Heskew f26a1d8f60 Using the returnUrl in the rest of the Widget's admin controller 
--HG--
branch : dev
 2011-03-18 13:56:59 -07:00
Nathan Heskew c6f0974af4 Changing widget placement movement to also make use of MakeRoomForWidgetPosition(widgetPart) 
--HG--
branch : dev
 2011-03-18 13:49:27 -07:00
Nathan Heskew 2663d1d9ba Making sure widget positions don't conflict when the WidgetPart is updated so the widget position in a zone is known by order alone and not also partially by FIFO 
Pulling UpdateWidget and UpdateLayer since they're not really needed

--HG--
branch : dev
 2011-03-18 13:38:12 -07:00
Nathan Heskew 7c082f8781 Merge 
--HG--
branch : dev
 2011-03-17 14:49:20 -07:00
Nathan Heskew f12e91ba03 Swapping out the widget movement arrows to something closer to what will be in the final UI 
--HG--
branch : dev
 2011-03-17 14:46:12 -07:00
Nathan Heskew 8972dcf45b Hooking the widget movement arrows back up. 
--HG--
branch : dev
 2011-03-17 13:03:59 -07:00
Nathan Heskew 7251fd9140 Merge 
--HG--
branch : dev
 2011-03-17 09:38:01 -07:00
Nathan Heskew d77cfce85e Making the zones view "switchable". 
It could use some more relevant icons but what is there by default is fine for now.

--HG--
branch : dev
 2011-03-16 14:38:54 -07:00
Nathan Heskew 3c41eea22f Updating the widgets spec test to keep up with the UI changes. 
--HG--
branch : dev
 2011-03-16 11:28:05 -07:00
Nathan Heskew 90c16e0274 More progress on the next rev of the global widget management UI. 
Starting to come together. Widgets can be added once again.

--HG--
branch : dev
 2011-03-15 15:10:24 -07:00
Nathan Heskew c17cdf41a5 Initial bit of progress on the next rev of the global widget management UI. 
--HG--
branch : dev
 2011-03-14 15:15:21 -07:00
Nathan Heskew 60f7f167ae Fixing a Modules.feature spec test to follow recent admin UI changes. 
--HG--
branch : dev
 2011-03-02 10:14:36 -08:00
Nathan Heskew 894a3aa505 Adding back a DisplayType shape display alternate for the "Content" shape. 
Also tweaked the order of alternates to minimize the need for additional templates when any non-DisplayType contained alternate is used.

In other words. If there is a Content-BlogPost.Summary template and a Content-42 template is used to override the detail display of a blog post with an id of 42 - then a Content-42.Summary is not necessary.

--HG--
branch : dev
 2011-02-28 06:15:59 -08:00
Nathan Heskew 10bba3b135 Making all of the admin menu (imageset) stylesheets' filenames end with -admin. 
--HG--
branch : dev
rename : src/Orchard.Web/Core/Contents/Styles/menu.content.css => src/Orchard.Web/Core/Contents/Styles/menu.content-admin.css
rename : src/Orchard.Web/Core/Dashboard/styles/menu.dashboard.css => src/Orchard.Web/Core/Dashboard/styles/menu.dashboard-admin.css
rename : src/Orchard.Web/Core/Navigation/Styles/menu.navigation.css => src/Orchard.Web/Core/Navigation/Styles/menu.navigation-admin.css
rename : src/Orchard.Web/Core/Reports/Styles/menu.reports.css => src/Orchard.Web/Core/Reports/Styles/menu.reports-admin.css
rename : src/Orchard.Web/Core/Settings/Styles/menu.settings.css => src/Orchard.Web/Core/Settings/Styles/menu.settings-admin.css
rename : src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog.css => src/Orchard.Web/Modules/Orchard.Blogs/Styles/menu.blog-admin.css
rename : src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments.css => src/Orchard.Web/Modules/Orchard.Comments/Styles/menu.comments-admin.css
rename : src/Orchard.Web/Modules/Orchard.Experimental/Styles/menu.experimental.css => src/Orchard.Web/Modules/Orchard.Experimental/Styles/menu.experimental-admin.css
rename : src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list.css => src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list-admin.css
rename : src/Orchard.Web/Modules/Orchard.Media/Styles/menu.media.css => src/Orchard.Web/Modules/Orchard.Media/Styles/menu.media-admin.css
rename : src/Orchard.Web/Modules/Orchard.Modules/styles/menu.modules.css => src/Orchard.Web/Modules/Orchard.Modules/styles/menu.modules-admin.css
rename : src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page.css => src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page-admin.css
rename : src/Orchard.Web/Modules/Orchard.Tags/Styles/menu.tags.css => src/Orchard.Web/Modules/Orchard.Tags/Styles/menu.tags-admin.css
rename : src/Orchard.Web/Modules/Orchard.Themes/Styles/menu.themes.css => src/Orchard.Web/Modules/Orchard.Themes/Styles/menu.themes-admin.css
rename : src/Orchard.Web/Modules/Orchard.Users/Styles/menu.users.css => src/Orchard.Web/Modules/Orchard.Users/Styles/menu.users-admin.css
rename : src/Orchard.Web/Modules/Orchard.Widgets/Styles/menu.widgets.css => src/Orchard.Web/Modules/Orchard.Widgets/Styles/menu.widgets-admin.css
 2011-02-26 08:37:19 -08:00
Nathan Heskew a04173a43b Adding the X-UA-Compatible meta tag back into TheAdmin theme's Layout.cshtml 
--HG--
branch : dev
 2011-02-26 08:20:11 -08:00
Nathan Heskew 944bc02076 Going back to the inline links for installing a local module or theme. 
--HG--
branch : dev
 2011-02-26 07:07:16 -08:00
Nathan Heskew d991e12f48 Making the admin submenu item hover style apply to a selected subitem too. 
--HG--
branch : dev
 2011-02-24 21:16:14 -08:00
Nathan Heskew 8873882ad2 Adding admin menu icons for experimental and settings 
--HG--
branch : dev
 2011-02-23 20:55:02 -08:00
Nathan Heskew 2a4b7f1cd2 Adding the Reports admin menu icon. 
--HG--
branch : dev
 2011-02-23 19:31:17 -08:00
Nathan Heskew 13f3ca08bd More admin menu adjustments. 
--HG--
branch : dev
 2011-02-23 16:56:14 -08:00
Nathan Heskew 73ad14185b Making it so grouped settings can actually be saved. #minordetail 
--HG--
branch : dev
 2011-02-23 12:35:58 -08:00
Nathan Heskew cac1ed7c12 A little admin menu reorg. 
--HG--
branch : dev
 2011-02-23 12:25:58 -08:00
Nathan Heskew 4923c12126 Theme and module install links from inline linke in installed page to an "Install" tab (LocalNav) 
--HG--
branch : dev
 2011-02-23 12:25:30 -08:00
Nathan Heskew 4a3ba3b4d6 Selected admin menu items get the :hover style on .selected 
--HG--
branch : dev
 2011-02-23 12:24:27 -08:00
Nathan Heskew c0dfcfae22 A little cleanup for the Setting admin menu group 
--HG--
branch : dev
 2011-02-23 10:22:30 -08:00
Nathan Heskew 4a7930d33f More fine-grained admin menu classification to limit accidental item iconification. 
--HG--
branch : dev
 2011-02-23 10:09:30 -08:00
Nathan Heskew d2e0b764d7 Deduping the GroupInfos 
--HG--
branch : dev
 2011-02-23 09:48:26 -08:00
Nathan Heskew c5766465d3 Adding support for editor groups. Still need to hook up dedup and ordering of groupinfos in GetEditorGroupInfos and GetDisplayGroupInfos. 
--HG--
branch : dev
 2011-02-22 14:51:04 -08:00
Nathan Heskew 988d60e306 "versioning" the TheAdmin theme's main CSS file 
--HG--
branch : dev
 2011-02-22 10:58:30 -08:00
Nathan Heskew c07a806c20 Merge 
--HG--
branch : dev
 2011-02-22 10:19:44 -08:00
Nathan Heskew 1e4820166e Fixing a spec test. 
--HG--
branch : dev
 2011-02-22 10:18:56 -08:00
Nathan Heskew 21b4db2281 Including some images in csprojs which hadn't been committed. 
--HG--
branch : dev
 2011-02-22 10:13:33 -08:00
Nathan Heskew 0aa6537238 Merge 
--HG--
branch : dev
 2011-02-21 15:30:55 -08:00