Merge pull request #386 from Orckestra/feature-branding-change

Branding change - now C1 CMS - ya'll call us C1 anyway ;)

Composite.Workflows/Plugins/Elements/ElementProviders/PackageElementProvider/ViewAvailablePackageInfoWorkflowWorkflow.cs

@@ -125,7 +125,7 @@ private string GetDocumentTitle(PackageDescription packageDescription)
         {
             // Valid package names:
             //  "Composite.Community.Versioning"
-            //  "Orckestra CMS 3.0"
+            //  "C1 CMS 3.0"
             string name = packageDescription.Name.Trim();
 
             string documentTitle = name;

Composite.Workflows/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly. See also Composite SharedAssemblyInfo.cs
-[assembly: AssemblyDescription("Orckestra CMS Workflow Foundation classes")]
+[assembly: AssemblyDescription("C1 CMS Workflow Foundation classes")]
 [assembly: AssemblyConfiguration("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 

Composite/AspNet/Razor/CompositeC1WebPage.cs

@@ -10,7 +10,7 @@
 namespace Composite.AspNet.Razor
 {
     /// <summary>
-    /// Defines a Orckestra CMS razor control
+    /// Defines a C1 CMS razor control
     /// </summary>
 	public abstract class CompositeC1WebPage : WebPage, IDisposable
 	{

Composite/C1Console/Commands/IConsoleCommandHandler.cs

@@ -4,7 +4,7 @@
 namespace Composite.C1Console.Commands
 {
     /// <summary>
-    /// Handles hash based deep links to Orckestra CMS console (/Composite/top.aspx#&lt;command name&gt;;&lt;command payload&gt; )
+    /// Handles hash based deep links to C1 CMS console (/Composite/top.aspx#&lt;command name&gt;;&lt;command payload&gt; )
     /// </summary>
     [CustomFactory(typeof(ConsoleCommandHandlerCustomFactory))]
     public interface IConsoleCommandHandler

Composite/C1Console/Security/EntityToken.cs

@@ -26,7 +26,7 @@ public object Deserialize(string serializedObject)
 
 
     /// <summary>
-    /// EntityToken is used through out Orckestra CMS to describe artifacts that can have security settings. Also see <see cref="Composite.Data.DataEntityToken"/>.
+    /// EntityToken is used through out C1 CMS to describe artifacts that can have security settings. Also see <see cref="Composite.Data.DataEntityToken"/>.
     /// </summary>
     /// <remarks>
     /// When subclassing this class and adding properties that have an impack when identity (equiallity)

Composite/Core/Configuration/BuildinPlugins/GlobalSettingsProvider/BuildinGlobalSettingsProvider.cs

@@ -8,7 +8,7 @@ namespace Composite.Core.Configuration.BuildinPlugins.GlobalSettingsProvider
 {
     internal sealed class BuildinGlobalSettingsProvider : IGlobalSettingsProvider
     {
-        private string _applicationName = "Orckestra CMS";
+        private string _applicationName = "C1 CMS";
         private string _applicationShortName = "C1";
         private string _brandedVersionAssemblySource = "Composite";
         private string _configurationDirectory = "~";

Composite/Core/Configuration/GlobalSettingsFacade.cs

@@ -440,7 +440,7 @@ public static bool OnlyTranslateWhenApproved
 
         /// <summary>
         /// The maximum number of characters the path to the application root (like 'C:\InetPub\MySite') can contain.
-        /// Orckestra CMS create files below this path, some of which have very long paths - if the root path is long enough the combined length
+        /// C1 CMS create files below this path, some of which have very long paths - if the root path is long enough the combined length
         /// can exceed a limitation in Microsoft Windows - see http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx#paths
         /// </summary>
         public static int MaximumRootPathLength

Composite/Core/Log.cs

@@ -7,12 +7,12 @@
 namespace Composite.Core
 {
     /// <summary>
-    /// Provide write access to the Orckestra CMS log. Note that 'verbose' messages are typically only shown in run-time log viewers.
+    /// Provide write access to the C1 CMS log. Note that 'verbose' messages are typically only shown in run-time log viewers.
     /// </summary>
     public static class Log
     {
         /// <summary>
-        /// Logs a 'information' message to the Orckestra CMS log.
+        /// Logs a 'information' message to the C1 CMS log.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="message">Message to log</param>
@@ -24,7 +24,7 @@ public static void LogInformation(string title, string message)
 
 
         /// <summary>
-        /// Logs a 'information' message to the Orckestra CMS log.
+        /// Logs a 'information' message to the C1 CMS log.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="messageFormat">Message to log in a String.Format() style using {0} etc.</param>
@@ -38,7 +38,7 @@ public static void LogInformation(string title, string messageFormat, params obj
 
 
         /// <summary>
-        /// Logs a 'verbose' message to the Orckestra CMS log. Verbose messages are typically only shown in developer log viewers.
+        /// Logs a 'verbose' message to the C1 CMS log. Verbose messages are typically only shown in developer log viewers.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="message">Message to log</param>
@@ -50,7 +50,7 @@ public static void LogVerbose(string title, string message)
 
 
         /// <summary>
-        /// Logs a 'verbose' message to the Orckestra CMS log.
+        /// Logs a 'verbose' message to the C1 CMS log.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="messageFormat">Message to log in a String.Format() style using {0} etc.</param>
@@ -64,7 +64,7 @@ public static void LogVerbose(string title, string messageFormat, params object[
 
 
         /// <summary>
-        /// Logs a 'warning' message to the Orckestra CMS log. 
+        /// Logs a 'warning' message to the C1 CMS log. 
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="message">Message to log</param>
@@ -76,7 +76,7 @@ public static void LogWarning(string title, string message)
 
 
         /// <summary>
-        /// Logs a 'warning' message to the Orckestra CMS log.
+        /// Logs a 'warning' message to the C1 CMS log.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="messageFormat">Message to log in a String.Format() style using {0} etc.</param>
@@ -90,7 +90,7 @@ public static void LogWarning(string title, string messageFormat, params object[
 
 
         /// <summary>
-        /// Logs a 'verbose' message to the Orckestra CMS log. 
+        /// Logs a 'verbose' message to the C1 CMS log. 
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="exception">Exception to log</param>
@@ -102,7 +102,7 @@ public static void LogWarning(string title, Exception exception)
 
 
         /// <summary>
-        /// Logs a 'error' message to the Orckestra CMS log. 
+        /// Logs a 'error' message to the C1 CMS log. 
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="message">Message to log</param>
@@ -114,7 +114,7 @@ public static void LogError(string title, string message)
 
 
         /// <summary>
-        /// Logs a 'error' message to the Orckestra CMS log.
+        /// Logs a 'error' message to the C1 CMS log.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="messageFormat">Message to log in a String.Format() style using {0} etc.</param>
@@ -128,7 +128,7 @@ public static void LogError(string title, string messageFormat, params object[]
 
 
         /// <summary>
-        /// Logs a 'error' message to the Orckestra CMS log. 
+        /// Logs a 'error' message to the C1 CMS log. 
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="exception">Exception to log</param>
@@ -140,7 +140,7 @@ public static void LogError(string title, Exception exception)
 
 
         /// <summary>
-        /// Logs a 'critical' message to the Orckestra CMS log. You should only use 'critical' when a major system failure occur.
+        /// Logs a 'critical' message to the C1 CMS log. You should only use 'critical' when a major system failure occur.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="message">Message to log</param>
@@ -152,7 +152,7 @@ public static void LogCritical(string title, string message)
 
 
         /// <summary>
-        /// Logs a 'critical' message to the Orckestra CMS log. You should only use 'critical' when a major system failure occur.
+        /// Logs a 'critical' message to the C1 CMS log. You should only use 'critical' when a major system failure occur.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="messageFormat">Message to log in a String.Format() style using {0} etc.</param>
@@ -166,7 +166,7 @@ public static void LogCritical(string title, string messageFormat, params object
 
 
         /// <summary>
-        /// Logs a 'critical' message to the Orckestra CMS log. You should only use 'critical' when a major system failure occur.
+        /// Logs a 'critical' message to the C1 CMS log. You should only use 'critical' when a major system failure occur.
         /// </summary>
         /// <param name="title">Title of log message</param>
         /// <param name="exception">Exception to log</param>

Composite/Core/PackageSystem/PackageFragmentInstallers/DllPackageFragmentInstaller.cs

@@ -403,7 +403,7 @@ public void AddRedirectsForAssembly(AssemblyName assemblyName)
                     <assemblyBinding xmlns=""urn:schemas-microsoft-com:asm.v1"">
                      <dependentAssembly>
                         <assemblyIdentity name=""{0}"" publicKeyToken=""{1}"" culture=""neutral""/>
-                        <!-- This binding redirect was added by Orckestra CMS package installer -->
+                        <!-- This binding redirect was added by C1 CMS package installer -->
                         <bindingRedirect oldVersion=""0.0.0.0-{2}"" newVersion=""{2}"" />
                      </dependentAssembly>
                     </assemblyBinding>", assemblyName.Name, publicKeyToken, newTargetVersionStr)).Elements().Single());

Composite/Core/PageTemplates/IPageTemplateProvider.cs

@@ -19,7 +19,7 @@ public interface IPageTemplateProvider
         IEnumerable<PageTemplateDescriptor> GetPageTemplates();
 
         /// <summary>
-        /// Factory that give Orckestra CMS a IPageLayouter capable of rendering a Orckestra CMS page with the specified layout ID.
+        /// Factory that give C1 CMS a IPageLayouter capable of rendering a C1 CMS page with the specified layout ID.
         /// The factory will be called for each individual page rendering 
         /// </summary>
         /// <returns></returns>

Composite/Core/PageTemplates/PageTemplateDescriptor.cs

@@ -6,7 +6,7 @@
 namespace Composite.Core.PageTemplates
 {
     /// <summary>
-    /// Describes a page layout to the Orckestra CMS core so it may set up editing UI
+    /// Describes a page layout to the C1 CMS core so it may set up editing UI
     /// </summary>
     public class PageTemplateDescriptor
     {

Composite/Core/PageTemplates/PageTemplateFacade.cs

@@ -63,7 +63,7 @@ public static IPageRenderer BuildPageRenderer(Guid pageTemplateId)
         {
             var provider = PageTemplateProviderRegistry.GetProviderByTemplateId(pageTemplateId);
 
-            Verify.IsNotNull(provider, "Failed to get page template with id '{0}'. The template may contain errors preventing it to compile. Check the Orckestra CMS log for possible compilation errors.", pageTemplateId);
+            Verify.IsNotNull(provider, "Failed to get page template with id '{0}'. The template may contain errors preventing it to compile. Check the C1 CMS log for possible compilation errors.", pageTemplateId);
 
             return provider.BuildPageRenderer(pageTemplateId);
         }

Composite/Core/ResourceSystem/LocalizationFiles.cs

@@ -3770,7 +3770,7 @@ public static class Composite_Plugins_PackageElementProvider {
 public static string AddPackageSource_Step1_UrlHelp=>T("AddPackageSource.Step1.UrlHelp");
 ///<summary>&quot;The entered text was not a valid URL&quot;</summary> 
 public static string AddPackageSource_Step1_UrlNotValid=>T("AddPackageSource.Step1.UrlNotValid");
-///<summary>&quot;The server is not a Orckestra CMS package server&quot;</summary> 
+///<summary>&quot;The server is not a C1 CMS package server&quot;</summary> 
 public static string AddPackageSource_Step1_UrlNonPackageServer=>T("AddPackageSource.Step1.UrlNonPackageServer");
 ///<summary>&quot;Add Package Server Source&quot;</summary> 
 public static string AddPackageSource_Step2_LayoutLabel=>T("AddPackageSource.Step2.LayoutLabel");
@@ -5196,7 +5196,7 @@ public static class Composite_Plugins_StandardFunctions {
 public static string Composite_Web_Html_Template_CommonMetaTags_param_Designer_help=>T("Composite.Web.Html.Template.CommonMetaTags.param.Designer.help");
 ///<summary>&quot;Show generator&quot;</summary> 
 public static string Composite_Web_Html_Template_CommonMetaTags_param_ShowGenerator_label=>T("Composite.Web.Html.Template.CommonMetaTags.param.ShowGenerator.label");
-///<summary>&quot;Show the world you support Orckestra CMS Foundation - free open source!&quot;</summary> 
+///<summary>&quot;Show the world you support C1 CMS Foundation - free open source!&quot;</summary> 
 public static string Composite_Web_Html_Template_CommonMetaTags_param_ShowGenerator_help=>T("Composite.Web.Html.Template.CommonMetaTags.param.ShowGenerator.help");
 ///<summary>&quot;Appends a lang=&apos;(language code)&apos; attribute the the parent element, reflecting the language of the current page. You can put this just below the &lt;html /&gt; tag.&quot;</summary> 
 public static string Composite_Web_Html_Template_LangAttribute_description=>T("Composite.Web.Html.Template.LangAttribute.description");

Composite/Core/Routing/PageUrlData.cs

@@ -7,7 +7,7 @@
 namespace Composite.Core.Routing
 {
     /// <summary>
-    /// Information stored in a Orckestra CMS page url
+    /// Information stored in a C1 CMS page url
     /// </summary>
     public class PageUrlData
     {

Composite/Core/WebClient/ApplicationLevelEventHandlers.cs

@@ -29,7 +29,7 @@
 namespace Composite.Core.WebClient
 {
     /// <summary>    
-    /// ASP.NET Application level logic. This class primarily interact between Orckestra CMS and the ASP.NET Application.  
+    /// ASP.NET Application level logic. This class primarily interact between C1 CMS and the ASP.NET Application.  
     /// Most of the members on this class is not documented, except for those which developers may find useful to interact with.
     /// </summary>
     public static class ApplicationLevelEventHandlers

Composite/Core/WebClient/Renderings/Page/PageRenderer.cs

@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Web;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using System.Xml.Linq;
 using Composite.Core.Caching;
 using Composite.Core.Extensions;
 using Composite.Core.Routing;
+using Composite.Core.Routing.Pages;
 using Composite.Data;
 using Composite.Data.Types;
 using Composite.Functions;
@@ -334,9 +336,9 @@ public static void AppendC1MetaTags(IPage page, XhtmlDocument xhtmlDocument)
             if (UserValidationFacade.IsLoggedIn())
             {
                 bool emitMenuTitleMetaTag = string.IsNullOrEmpty(page.MenuTitle) == false;
-                bool emitUrlTitleMetaTag = string.IsNullOrEmpty(page.UrlTitle) == false;
+                bool emitUrlMetaTag = string.IsNullOrEmpty(page.UrlTitle) == false;
 
-                if (emitMenuTitleMetaTag || emitUrlTitleMetaTag)
+                if (emitMenuTitleMetaTag || emitUrlMetaTag)
                 {
                     xhtmlDocument.Head.Add(
                         new XComment("The C1.* meta tags are only emitted when you are logged in"),
@@ -352,12 +354,19 @@ public static void AppendC1MetaTags(IPage page, XhtmlDocument xhtmlDocument)
                                 new XAttribute("content", page.MenuTitle)));
                     }
 
-                    if (emitUrlTitleMetaTag)
+                    if (emitUrlMetaTag)
                     {
+                        var editPreview = PageRenderer.RenderingReason == RenderingReason.PreviewUnsavedChanges;
+
+                        var pageUrl = string.Format("{0}{1}{2}",
+                            PageUrls.BuildUrl(page, UrlKind.Public).Replace("/c1mode(unpublished)", "").Replace("/c1mode(relative)",""),
+                            editPreview ? "/" + page.UrlTitle : C1PageRoute.GetPathInfo(),
+                            editPreview ? "" : HttpContext.Current.Request.Url.Query);
+
                         xhtmlDocument.Head.Add(
                             new XElement(Namespaces.Xhtml + "meta",
-                                new XAttribute("name", "C1.urltitle"),
-                                new XAttribute("content", page.UrlTitle)));
+                                new XAttribute("name", "C1.urlseowords"),
+                                new XAttribute("content", pageUrl)));
                     }
                 }
             }

Composite/Core/WebClient/Renderings/Plugins/RenderingResponseHandler/IDataRenderingResponseHandler.cs

@@ -4,7 +4,7 @@
 namespace Composite.Core.WebClient.Renderings.Plugins.RenderingResponseHandler
 {
     /// <summary>
-    /// Orckestra CMS allow you to build a RenderingResponseHandler plug-in. It enables developers to intercept 
+    /// C1 CMS allow you to build a RenderingResponseHandler plug-in. It enables developers to intercept 
     /// page and media requests and control if the request should be accepted or redirected and if the rendered 
     /// resource is allowed to be publicly cached.
     /// </summary>

Composite/Core/WebClient/Renderings/RenderingResponseHandlerFacade.cs

@@ -5,7 +5,7 @@ namespace Composite.Core.WebClient.Renderings
 {
     /// <summary>
     /// Pass information about a request through all <see cref="Composite.Core.WebClient.Renderings.Plugins.RenderingResponseHandler.IDataRenderingResponseHandler"/> 
-    /// plugins registered on the Orckestra CMS site. Use this if you are handling raw page / media http requests yourself.
+    /// plugins registered on the C1 CMS site. Use this if you are handling raw page / media http requests yourself.
     /// 
     /// </summary>
 	public static class RenderingResponseHandlerFacade
@@ -18,7 +18,7 @@ public static class RenderingResponseHandlerFacade
 
         /// <summary>
         /// Pass information about a request through all <see cref="Composite.Core.WebClient.Renderings.Plugins.RenderingResponseHandler.IDataRenderingResponseHandler"/> 
-        /// plugins registered on the Orckestra CMS site. The resulting <see cref="RenderingResponseHandlerResult"/> define how you should treat the request.
+        /// plugins registered on the C1 CMS site. The resulting <see cref="RenderingResponseHandlerResult"/> define how you should treat the request.
         /// </summary>
         /// <param name="requestedItemEntityToken">The data being rendered. This can be <see cref="Composite.Data.Types.IPage"/> and <see cref="Composite.Data.Types.IMediaFile"/>.</param>
         /// <returns>A <see cref="RenderingResponseHandlerResult"/> object detailing what should happen to the user request. Returning null means no special handling should be done (request should continue).</returns>

Composite/Core/Xml/Namespaces.cs

@@ -74,7 +74,7 @@ static Namespaces()
         public static XNamespace Localization10 { get; private set; }
 
         /// <summary>
-        /// Namespace for ASP.NET Web Forms in Orckestra CMS pages: http://www.composite.net/ns/asp.net/controls
+        /// Namespace for ASP.NET Web Forms in C1 CMS pages: http://www.composite.net/ns/asp.net/controls
         /// </summary>
         public static XNamespace AspNetControls { get; private set; }
 
@@ -94,7 +94,7 @@ static Namespaces()
         public static XNamespace XmlNs { get; private set; }
 
         /// <summary>
-        /// Namespace for XHTML documents in Orckestra CMS: http://www.w3.org/1999/xhtml
+        /// Namespace for XHTML documents in C1 CMS: http://www.w3.org/1999/xhtml
         /// </summary>
         public static XNamespace Xhtml { get; private set; }