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,111 Commits 83 Branches 32 Tags
b12ded8eb599699fe9d865258587e39c867f5067
Commit Graph

1111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Heskew
ef03c8f608 Enabling Html.RegisterStyle("ie6.css").WithCondition("if lte IE 6").ForMedia("screen, projection"); 
- Added Condition property to FileRegistrationContext
- Added StyleFileRegistrationContext + Media property
- Updated Html helper methods for script and style reg to return registered context and added FileRegistrationContext extension methods for WithCondition and ForMedia

--HG--
branch : dev
 2010-03-08 01:49:53 -08:00
Nathan Heskew
3dcc0e4261 Moving zone/zoneitem debug rendering to ThemeZoneManagerEvents 
- still not permenant but better than being in DesignerNotes.ZoneManagerEvents

--HG--
branch : dev
 2010-03-07 23:01:12 -08:00
Jonathan Wall
3ca80c39d0 Update to Orchard web csproj file. 
--HG--
branch : dev
 2010-03-07 16:51:56 -08:00
Jonathan Wall
97e7b94018 Added an ie6 stylesheet for Admin. More cleanup still needed. 
--HG--
branch : dev
 2010-03-07 16:48:46 -08:00
Jonathan Wall
142422e34b Added an ie6 stylesheet for setup screen. 
--HG--
branch : dev
 2010-03-07 16:21:05 -08:00
Nathan Heskew
1a4ffc86fb Giving the addmedia file upload input a size *in addition to* the fixed width 
- since FF didn't wan't to fill the width with the browse UI :|

--HG--
branch : dev
 2010-03-07 03:36:25 -08:00
Nathan Heskew
3787fe341b Including the Blogs.Blog.Manage template part in the Orchard.Blogs csproj 
- the template was being used to render an edit blog link but was a pain to find (until template name hints were rendered in comments)

--HG--
branch : dev
 2010-03-07 03:12:50 -08:00
Nathan Heskew
995f30fec6 Adding some debug info for zone item rendering 
- begin and end comments w/ tempate names (covering RenderPartialZoneItem and ContentPartDisplayZoneItem only at the moment) for zone item rendering

Tossing them in debug compiler conditions for good measure. Likely to change to something runtime related so the app can be kicked into debug mode at any time (for any individual)

--HG--
branch : dev
 2010-03-07 03:11:09 -08:00
Nathan Heskew
f8b0317b8c Changing checkbox/radion display toggle to use click event 
- change event wasn't fired in IE when the page didn't first have focus. click seems to overlap with change in other change scenarios (label click, tab focus + space select) so we're all good

--HG--
branch : dev
 2010-03-07 02:50:35 -08:00
Nathan Heskew
ef5f7edca7 Changing the width of the addmedia input 
From a character count to fixed (to fit in a fixed-width window w/ different font sizes)

--HG--
branch : dev
 2010-03-07 00:42:42 -08:00
Nathan Heskew
abf6720a5e Removing an import from the TinyMceTextEditor template 
--HG--
branch : dev
 2010-03-07 00:11:47 -08:00
Louis DeJardin
0320862826 Providing designer notes html for zones 
IZoneManagerEvents interface added to inject designer notes in empty zones
Static html file matching zone names displayed when nothing else is in that location
An Edit link simulates the look of an html widget
Clicking it creates a widget with the designer notes html
Code that calculates media path refactored and moved to viewmodel state

--HG--
branch : dev
 2010-03-06 01:25:17 -08:00
Nathan Heskew
dab326c267 Adding the orchard.ico to the SafeMode theme 
--HG--
branch : dev
 2010-03-05 16:51:27 -08:00
Nathan Heskew
dff90c7725 Adding a bit of jquery to toggle elements based on checkbox/radio selection 
- + related template changes, using a data-controllerid to relate an element to a checkbox or radio button for visibility control

--HG--
branch : dev
 2010-03-05 16:41:29 -08:00
jowall
17a9065b3c Hid the blog edit link in the classic theme. Updated the dashboard title. 
--HG--
branch : dev
 2010-03-05 15:57:25 -08:00
jowall
4178d3f9ac Moved posted by string in blogs. 
--HG--
branch : dev
 2010-03-05 15:06:06 -08:00
jowall
f1554f5631 Some updates to the classic theme. Added a zone test file. 
--HG--
branch : dev
 2010-03-05 14:20:11 -08:00
Nathan Heskew
70f4b727c1 Fixing some issues IE (in compat mode of 8) had with the addmedia plugin 
Expanding browser verification of the plugin by 50% (if compat mode of a browser counts as an additional browser)

/me, sad for what was necessary

--HG--
branch : dev
 2010-03-05 14:07:26 -08:00
Suha Can
e64f0a3312 - Fixing 16263: Cannot Add Admin user to the Administrators role 
--HG--
branch : dev
 2010-03-05 12:12:14 -08:00
Nathan Heskew
458cfc41dc Pushing a smaller ico 
--HG--
branch : dev
 2010-03-05 02:56:31 -08:00
Nathan Heskew
3f609c8ed1 Adding an Orchard ico. Should make this easy to change (site setting?) later. 
--HG--
branch : dev
 2010-03-05 02:44:40 -08:00
Nathan Heskew
b5a2abb9de Compressing the addmedia (TinyMCE) plugin editor_plugin.js and adding src copy 
--HG--
branch : dev
 2010-03-05 02:12:14 -08:00
Nathan Heskew
c55bbb32ce Finishing up the initial functionality for the addmedia (tinyMCE) plugin 
--HG--
branch : dev
 2010-03-05 02:04:41 -08:00
Erik Porter
554d279795 Changed blog constraint to be a singleton like page constraint and made them consistent 
--HG--
branch : dev
rename : src/Orchard.Web/Modules/Orchard.Blogs/Routing/IsBlogConstraint.cs => src/Orchard.Web/Modules/Orchard.Blogs/Routing/BlogSlugConstraint.cs
rename : src/Orchard.Web/Modules/Orchard.Pages/Routing/ISlugConstraint.cs => src/Orchard.Web/Modules/Orchard.Pages/Routing/IPageSlugConstraint.cs
rename : src/Orchard.Web/Modules/Orchard.Pages/Routing/SlugConstraint.cs => src/Orchard.Web/Modules/Orchard.Pages/Routing/PageSlugConstraint.cs
rename : src/Orchard.Web/Modules/Orchard.Pages/Routing/SlugConstraintUpdator.cs => src/Orchard.Web/Modules/Orchard.Pages/Routing/PageSlugConstraintUpdator.cs
 2010-03-05 00:24:53 -08:00
Erik Porter
43eeb4e7d7 Made the path for where tinymce saves media dynamic 
--HG--
branch : dev
 2010-03-04 22:21:47 -08:00
rpaquay
2d97d57749 Adding back versioning properties 
They are needed by one of our contrib module

--HG--
branch : dev
 2010-03-04 21:07:01 -08:00
Nathan Heskew
b449360e75 Making the addmedia (TinyMCE) plugin upload media and insert appropriate markup 
a.k.a. fun with async file uploads

--HG--
branch : dev
 2010-03-04 17:47:35 -08:00
jowall
2d1cd3dc53 Merge 
--HG--
branch : dev
 2010-03-04 16:28:40 -08:00
jowall
0ff20da482 Adding pages.page.metadata files to classic and green themes. 
--HG--
branch : dev
 2010-03-04 16:27:46 -08:00
Suha Can
f546d4451b - Fixing the date shown for comments in the admin views (using the datetime htmlhelper to show date for the comments). 
--HG--
branch : dev
 2010-03-04 16:26:58 -08:00
jowall
6fc40f821c Removed "published by" text from classic and green themes. 
--HG--
branch : dev
 2010-03-04 16:08:50 -08:00
Suha Can
6f67e3cef9 Merge 
--HG--
branch : dev
 2010-03-04 15:59:10 -08:00
Suha Can
205f9a1381 - Fixing a typo... 
--HG--
branch : dev
 2010-03-04 15:58:22 -08:00
Erik Porter
74804bee17 Added a html helper to generate a media path for tinymce 
--HG--
branch : dev
 2010-03-04 15:37:07 -08:00
Suha Can
71f302277e - AntiForgerFilter now opt-in for Orchard extensions such as modules and areas. 
- "antiforgery: enabled" in your module.txt will enable the filter to do the antiforgery check on posts.

--HG--
branch : dev
 2010-03-04 15:15:06 -08:00
Suha Can
3f0c7e73dc - Fixing 16252: Add user exception when no email address entered 
--HG--
branch : dev
 2010-03-04 13:25:22 -08:00
Erik Porter
64aba896b1 Merge 
--HG--
branch : dev
 2010-03-04 13:11:07 -08:00
Erik Porter
a1e25ac1d6 Fixed a bug with background tasks that prevented them from being called 
--HG--
branch : dev
 2010-03-04 13:10:39 -08:00
Suha Can
7217a5f6f8 Merge 
--HG--
branch : dev
 2010-03-04 12:20:10 -08:00
Suha Can
99ec679363 - Fixing 16258: Save Comment throws SQLDateTime overflow or The view 'Create' was not found 
--HG--
branch : dev
 2010-03-04 12:19:03 -08:00
jowall
1741fc1e0c Updated the layout of the edit media page in the admin. 
--HG--
branch : dev
 2010-03-04 12:18:38 -08:00
Andrew Ma
c0b640c498 - Fixing 16274: If user is already logged on and goes to the LogOn page, user is redirected to ~/ 
--HG--
branch : dev
 2010-03-03 10:21:59 -08:00
Suha Can
b627b39193 Merge 
--HG--
branch : dev
 2010-03-04 11:07:51 -08:00
Suha Can
754381f858 - coding convention from previous checkin. 
- Please refer to the code for our coding conventions (we also have a Resharper file in the source tree under /src if you are using Resharper

--HG--
branch : dev
 2010-03-04 10:58:55 -08:00
Erik Porter
9ed55fc156 Merge 
--HG--
branch : dev
 2010-03-04 10:56:49 -08:00
Erik Porter
48ae1fc2be Made blog and page menu dynamic to hide the manage links when there are no items yet 
--HG--
branch : dev
 2010-03-04 10:55:29 -08:00
Nathan Heskew
7d52b4e7c9 Fixing a "null" slug suggestion bug 
- When the title was empty, null was suggested

--HG--
branch : dev
 2010-03-04 03:28:33 -08:00
Nathan Heskew
28e09002d7 Giving more style to the front end manage UI to keep it from being affected by Theme CSS 
First of many additions, most likely

--HG--
branch : dev
 2010-03-04 03:13:03 -08:00
Nathan Heskew
f2df4df51c Some more work on being able to add media from the (TinyMCE) editor 
- TinyMCE module takes a dependency on the current media module api with the addmedia plugin which is functional to the point of being able to add media*

* it still needs a setting of where the media should go (current spec and xmlrpc api say <blog slug>/<post slug> for a blog post but (1) I don't even have that context from the editor and (2) what about other content types)
* it (the plugin) still needs to do an async post and handle the returned JSON appropriatly (insert image tag into the editor using returned url and close the dialog otherwise present any given error)

--HG--
branch : dev
 2010-03-04 02:58:49 -08:00
Erik Porter
d1f9fad499 Added an action to the media admin controller to upload from javascript and return friendly strings 
--HG--
branch : dev
 2010-03-04 00:15:56 -08:00