Merge

--HG-- branch : dev
2025-10-15 19:54:57 +08:00 · 2010-11-30 14:03:24 -08:00
parent 902769569f b7e6292d69
commit d6f36f1d45
23 changed files with 179 additions and 191 deletions
--- a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
+++ b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Models;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
 using Orchard.Localization;
@@ -67,9 +66,11 @@ namespace Orchard.Core.Common.Handlers {
        bool ContentTypeWithACommonPart(string typeName) {
            //Note: What about content type handlers which activate "CommonPart" in code?
            var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(typeName);
-            if (contentTypeDefinition == null)
-                return false;
-            return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
+            
+            if (contentTypeDefinition != null)
+                return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
+
+            return false;
        }

        void AssignCreatingOwner(InitializingContentContext context, CommonPart part) {
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml
@@ -1,5 +1,5 @@
@if (HasText(Model.Description)) {
-<div class="blog-description">
+<div class="content-description blog-description">
    <p>@Model.Description</p>
 </div>
 }
--- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
@@ -45,6 +45,8 @@ namespace Orchard.Setup {
            // standard services needed in setup mode
            builder.RegisterModule(new MvcModule());
            builder.RegisterModule(new CommandModule());
+            builder.RegisterModule(new WorkContextModule());
+
            builder.RegisterType<RoutePublisher>().As<IRoutePublisher>().InstancePerLifetimeScope();
            builder.RegisterType<ModelBinderPublisher>().As<IModelBinderPublisher>().InstancePerLifetimeScope();
            builder.RegisterType<WebFormViewEngineProvider>().As<IViewEngineProvider>().As<IShapeTemplateViewEngine>().InstancePerLifetimeScope();
@@ -58,7 +60,7 @@ namespace Orchard.Setup {
            builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>().InstancePerLifetimeScope();
            builder.RegisterType<DefaultCommandManager>().As<ICommandManager>().InstancePerLifetimeScope();
            builder.RegisterType<HelpCommand>().As<ICommandHandler>().InstancePerLifetimeScope();
-            builder.RegisterType<DefaultWorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
+            builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
            builder.RegisterType<ResourceManifest>().As<IResourceManifestProvider>().InstancePerLifetimeScope();
            builder.RegisterType<ResourceManager>().As<IResourceManager>().InstancePerLifetimeScope();
            builder.RegisterType<ResourceFilter>().As<IFilterProvider>().InstancePerLifetimeScope();
--- a/src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs
@@ -38,32 +38,30 @@ namespace Orchard.Users.Services {
        public ILogger Logger { get; set; }

        public string VerifyUserUnicity(string userName, string email) {
-            IEnumerable<UserPart> allUsers = _contentManager.Query<UserPart, UserPartRecord>().List();
+            string normalizedUserName = userName.ToLower();

-            foreach (var user in allUsers) {
-                if (String.Equals(userName.ToLower(), user.NormalizedUserName, StringComparison.OrdinalIgnoreCase)) {
-                    return "A user with that name already exists";
-                }
-                if (String.Equals(email, user.Email, StringComparison.OrdinalIgnoreCase)) {
-                    return "A user with that email already exists";
-                }
+            if (_contentManager.Query<UserPart, UserPartRecord>()
+                                   .Where(user => 
+                                          user.NormalizedUserName == normalizedUserName || 
+                                          user.Email == email)
+                                   .List().Any()) {
+                return "User with that username and/or email already exists.";
            }

            return null;
        }

        public string VerifyUserUnicity(int id, string userName, string email) {
-            IEnumerable<UserPart> allUsers = _contentManager.Query<UserPart, UserPartRecord>().List();
-            foreach (var user in allUsers) {
-                if (user.Id == id)
-                    continue;
-                if (String.Equals(userName.ToLower(), user.NormalizedUserName, StringComparison.OrdinalIgnoreCase)) {
-                    return "A user with that name already exists";
-                }
-                if (String.Equals(email, user.Email, StringComparison.OrdinalIgnoreCase)) {
-                    return "A user with that email already exists";
-                }
+            string normalizedUserName = userName.ToLower();
+
+            if (_contentManager.Query<UserPart, UserPartRecord>()
+                                   .Where(user =>
+                                          user.NormalizedUserName == normalizedUserName ||
+                                          user.Email == email)
+                                   .List().Any(user => user.Id != id)) {
+                return "User with that username and/or email already exists.";
            }
+
            return null;
        }

--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -321,26 +321,25 @@ nav ul
 /* Main
 ***************************************************************/

-/* Blogs */
-.blog-description { font-size: 1.231em; }
-.blog-post .tags { margin-top: 12px; }
-.blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; }
-.blog-posts { padding: 0; margin: 0; list-style: none; }
-.blog-posts li { padding: 0; margin: 0; }
-.blog-posts .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
-.blog-posts .blog-post header {}
-.blog-posts .blog-post header h1 { font-size: 1.308em; }
-.blog-posts .blog-post header h1 a { color: #434343; }
-.blog-posts .blog-post header h1 a:hover {}
-.blog-posts .blog-post .tags { margin-top: 12px; }
-.blog-posts .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.blog-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
-.blog-posts .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 0.846em; }
-.blog-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
-.blog-posts .blog-post .metadata .commentcount { display: inline; }
-.blog-post {}
-.blog-post-title {}
+/* Content lists and details */
+.content-description { font-size: 1.154em; }
+.content-items { padding: 0; margin: 0; list-style: none; }
+.content-items li { padding: 0; margin: 0; }
+.content-items .content-item { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
+.content-items .content-item header {}
+.content-items .content-item header h1 { font-size: 1.308em; color:#ff0000; }
+.content-items .content-item header h1 a { color: #434343; }
+.content-items .content-item header h1 a:hover {}
+
+/* Tags */
+.tags { margin-top: 12px; }
+.tags a { background-color: #dbdbdb; padding: 3px 6px; color: #434343; }
+.tags a:hover { background-color: #434343; padding: 3px; color: #fff; }
+
+/* Metadata */
+.metadata { margin: 0 0 12px 0; color: #999; font-size: 0.846em; }
+.metadata .published { display: inline; margin: 0 6px 0 0; }
+.metadata .commentcount { display: inline; }
 .meta {}

 /* Comments */
@@ -359,38 +358,6 @@ nav ul
 .comment-disabled {}
 .comment-count { font-size: 1.231em; }

-/* Tag Search */
-.tagged-posts {}
-.tagged-posts { padding: 0; margin: 0; list-style: none; }
-.tagged-posts li { padding: 0; margin: 0; }
-.tagged-posts .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
-.tagged-posts .blog-post header {}
-.tagged-posts .blog-post header h1 { font-size: 1.308em; }
-.tagged-posts .blog-post header h1 a { color: #434343; }
-.tagged-posts .blog-post header h1 a:hover {}
-.tagged-posts .blog-post .tags { margin-top: 12px; }
-.tagged-posts .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.tagged-posts .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
-.tagged-posts .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 1.1em; }
-.tagged-posts .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
-.tagged-posts .blog-post .metadata .commentcount { display: inline; }
-
-/* Search Results */
-.search-results {}
-.search-results { padding: 0; margin: 0; list-style: none; }
-.search-results li { padding: 0; margin: 0; }
-.search-results .blog-post { border-top: 1px solid #dbdbdb; padding: 6px 0 6px 0; }
-.search-results .blog-post header {}
-.search-results .blog-post header h1 { font-size: 1.308em; }
-.search-results .blog-post header h1 a { color: #434343; }
-.search-results .blog-post header h1 a:hover {}
-.search-results .blog-post .tags { margin-top: 12px; }
-.search-results .blog-post .tags a { background-color: #dbdbdb; padding: 3px; color: #434343; }
-.search-results .blog-post .tags a:hover { background-color: #434343; padding: 3px; color: #fff; text-decoration: none; }
-.search-results .blog-post .metadata { margin: 0 0 12px 0; color: #999; font-size: 0.846em; }
-.search-results .blog-post .metadata .published { display: inline; margin: 0 6px 0 0; }
-.search-results .blog-post .metadata .commentcount { display: inline; }
-
 /* Confirmations */
 .message, .validation-summary-errors { margin:10px 0 4px 0; padding:4px; }
 .messages a { font-weight:bold; }
@@ -455,18 +422,11 @@ nav ul
 /* Widgets
 ***************************************************************/
 .widgets {}
+.widget h1 { font-size: 1.077em; }

 /* Search */
 /* Search widget shuld go into the sidebar for proper styling */
 /* TODO: (mibach) Generic any zone compatible search widget */
-.widget-search-form 
-{
-    position: absolute;
-    top: 30px;
-    right: 12px;
-}
-.widget-search-form h1 { font-size: 1.077em; }
-
 .search-form {}
 .search-form input[type="text"] { float: left; }
 .search-form button[type="submit"] { float: left; margin: 0; margin-left: 6px; }
@@ -477,12 +437,6 @@ nav ul
 .widget-control .manage-actions { position:absolute; top: 0px; right: 0px; }
 .widget-control .manage-actions a { display: block; background-color: #dbdbdb; color: #434343; padding: 3px 6px;  }
 .widget-control .manage-actions a:hover { background-color: #434343; color: #fff; text-decoration: none; }
-.widget-control .widget-search-form /* TODO: (mibach) Remove special case for Search Widget */
-{
-    position: absolute;
-    top: 0px;
-    right: 12px;
-}

 /* Content Mode */
 .content-control { position: relative; border: 1px dotted #5f97af; }