Merge

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Configuration;
 using System.Xml;
+using System.Xml.Linq;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -197,13 +198,19 @@ namespace Umbraco.Core.Configuration
                     vDir = v.PhysicalDirectory;
                 }
             }
-            
-            var doc = new XmlDocument();
-            doc.Load(String.Concat(vDir, "web.config"));
-            var root = doc.DocumentElement;
-            var setting = doc.SelectSingleNode(String.Concat("//appSettings/add[@key='", key, "']"));
-            setting.Attributes["value"].InnerText = value;
-            doc.Save(String.Concat(vDir, "web.config"));
+
+            string fileName = String.Concat(vDir, "web.config");
+            var xml = XDocument.Load(fileName);
+            var appSettings = xml.Root.Descendants("appSettings").Single();
+
+            // Update appSetting if it exists, or else create a new appSetting for the given key and value
+            var setting = appSettings.Descendants("add").Where(s => s.Attribute("key").Value == key).FirstOrDefault();
+            if (setting == null)
+                appSettings.Add(new XElement("add", new XAttribute("key", key), new XAttribute("value", value)));
+            else
+                setting.Attribute("value").Value = value;
+
+            xml.Save(fileName);
             ConfigurationManager.RefreshSection("appSettings");
         }
 

src/Umbraco.Web.UI/install/steps/database.ascx

@@ -173,7 +173,7 @@
                             <div class="container">
                                 <p>
                                     <strong>2. Getting a database setup for umbraco.</strong><br />
-                                    For first time users, we recommend you select "quick-and-simple file-based database".
+                                    For first time users, we recommend you select "quick-and-simple embedded database".
                                     This will install an easy to use database, that does
                                     not require any additional software to use.<br />
                                     Alternatively, you can install Microsoft SQL Server, which will require a bit more

src/Umbraco.Web.UI/install/steps/welcome.ascx

@@ -34,7 +34,7 @@
             </p>
             <p>
                 As this is an upgrade, <strong>the wizard might skip steps</strong> that are only needed for new umbraco installations. It might also ask you questions you've already answered once. But do not worry, 
-                everything is in order. Click <strong>Lets get started</strong> below to begin your upgrade.
+                everything is in order. Click <strong>Let's get started</strong> below to begin your upgrade.
             </p>
 		<span class="enjoy">Enjoy!</span>
          </asp:PlaceHolder>
@@ -43,7 +43,7 @@
 	<!-- btn box -->
 	<footer class="btn-box">
         <div class="t">&nbsp;</div>
-        <asp:LinkButton ID="btnNext" CssClass="btn btn-get" runat="server" OnClick="gotoNextStep"><span>Lets get started!</span></asp:LinkButton>
+        <asp:LinkButton ID="btnNext" CssClass="btn btn-get" runat="server" OnClick="gotoNextStep"><span>Let's get started!</span></asp:LinkButton>
     </footer>
 
 </div>

src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx

@@ -136,9 +136,6 @@
             <HeaderTemplate>
                 <table cellspacing="0" cellpadding="2" width="98%" border="0">
                     <tr>
-                        <td class="propertyHeader">
-                            <%=umbraco.ui.Text("show",this.getUser())%>
-                        </td>
                         <td class="propertyHeader">
                             <%=umbraco.ui.Text("general", "alias",this.getUser())%>
                         </td>
@@ -153,9 +150,6 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <tr>
-                    <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHidden" Checked='<%# macroIsVisible (DataBinder.Eval(Container.DataItem, "Public"))%>' />
-                    </td>
                     <td class="propertyContent">
                         <input type="hidden" id="macroPropertyID" runat="server" value='<%#DataBinder.Eval(Container.DataItem, "id")%>'
                             name="macroPropertyID" />
@@ -179,13 +173,10 @@
             <FooterTemplate>
                 <tr>
                     <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHiddenNew" />
+                        <asp:TextBox runat="server" ID="macroPropertyAliasNew" Text='' OnTextChanged="macroPropertyCreate" />
                     </td>
                     <td class="propertyContent">
-                        <asp:TextBox runat="server" ID="macroPropertyAliasNew" Text='New Alias' OnTextChanged="macroPropertyCreate" />
-                    </td>
-                    <td class="propertyContent">
-                        <asp:TextBox runat="server" ID="macroPropertyNameNew" Text='New Name' />
+                        <asp:TextBox runat="server" ID="macroPropertyNameNew" Text='' />
                     </td>
                     <td class="propertyContent">
                         <asp:DropDownList OnPreRender="AddChooseList" runat="server" ID="macroPropertyTypeNew"

src/Umbraco.Web.UI/umbraco_client/tabview/style.css

@@ -127,13 +127,4 @@
     }
     
     .footer .status{height: 12px; margin: 0px; overflow: hidden; background: url(images/footer_statusBar_bg.gif) top left no-repeat;}
-    .footer .status h2{display: block; height: 12px; overflow: hidden; margin: 0px; padding: 0px; background: url(images/footer_statusBar_h2_bg.gif) top right no-repeat;}
-
-.treePickerTooltip {
-	display: none;
-	position: absolute;
-	border: 1px solid #333;
-	background-color: #fff8cb;
-	padding: 3px;
-	color: #000;
-}
+    .footer .status h2{display: block; height: 12px; overflow: hidden; margin: 0px; padding: 0px; background: url(images/footer_statusBar_h2_bg.gif) top right no-repeat;}

src/Umbraco.Web.UI/umbraco_client/ui/default.css

@@ -712,4 +712,13 @@ guiEditor {
     background: -moz-linear-gradient(100% 100% 90deg, #fefefe, #ddd);
     background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ddd), to(#fefefe));
     cursor:pointer;
+}
+
+.treePickerTooltip {
+	display: none;
+	position: absolute;
+	border: 1px solid #333;
+	background-color: #fff8cb;
+	padding: 3px;
+	color: #000;
 }

src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs

@@ -89,7 +89,8 @@ namespace umbraco.presentation.install
             InstallerStep _s;
 
             //if this is not an upgrade we will log in with the default user.
-            if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim()))
+            // It's not considered an upgrade if the ConfigurationStatus is missing or empty.
+            if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus) == false)
             {
                 try
                 {

src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/Skinning.cs

@@ -28,7 +28,7 @@ namespace umbraco.presentation.install.steps.Definitions
 
         public override bool Completed()
         {
-            if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim()))
+            if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus) == false)
                 return true;
 
             if (InstalledPackage.GetAllInstalledPackages().Count > 0)

src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx

@@ -173,7 +173,7 @@
                             <div class="container">
                                 <p>
                                     <strong>2. Getting a database setup for umbraco.</strong><br />
-                                    For first time users, we recommend you select "quick-and-simple file-based database".
+                                    For first time users, we recommend you select "quick-and-simple embedded database".
                                     This will install an easy to use database, that does
                                     not require any additional software to use.<br />
                                     Alternatively, you can install Microsoft SQL Server, which will require a bit more

src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs

@@ -92,7 +92,7 @@ namespace umbraco.presentation.install.steps
                 }
 
 
-                if (GlobalSettings.ConfigurationStatus.Trim() == "")
+                if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus))
                     BasePages.UmbracoEnsuredPage.doLogin(u);
 
                 Helper.RedirectToNextStep(this.Page);                

src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx

@@ -34,7 +34,7 @@
             </p>
             <p>
                 As this is an upgrade, <strong>the wizard might skip steps</strong> that are only needed for new umbraco installations. It might also ask you questions you've already answered once. But do not worry, 
-                everything is in order. Click <strong>Lets get started</strong> below to begin your upgrade.
+                everything is in order. Click <strong>Let's get started</strong> below to begin your upgrade.
             </p>
 		<span class="enjoy">Enjoy!</span>
          </asp:PlaceHolder>
@@ -43,7 +43,7 @@
 	<!-- btn box -->
 	<footer class="btn-box">
         <div class="t">&nbsp;</div>
-        <asp:LinkButton ID="btnNext" CssClass="btn btn-get" runat="server" OnClick="gotoNextStep"><span>Lets get started!</span></asp:LinkButton>
+        <asp:LinkButton ID="btnNext" CssClass="btn btn-get" runat="server" OnClick="gotoNextStep"><span>Let's get started!</span></asp:LinkButton>
     </footer>
 
 </div>

src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs

@@ -17,8 +17,8 @@ namespace umbraco.presentation.install
 
 		protected void Page_Load(object sender, System.EventArgs e)
 		{
-
-            if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim()))
+            // Display the Umbraco upgrade message if Umbraco is already installed
+            if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus) == false)
             {
                 ph_install.Visible = false;
                 ph_upgrade.Visible = true;

src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx

@@ -136,9 +136,6 @@
             <HeaderTemplate>
                 <table cellspacing="0" cellpadding="2" width="98%" border="0">
                     <tr>
-                        <td class="propertyHeader">
-                            <%=umbraco.ui.Text("show",this.getUser())%>
-                        </td>
                         <td class="propertyHeader">
                             <%=umbraco.ui.Text("general", "alias",this.getUser())%>
                         </td>
@@ -153,9 +150,6 @@
             </HeaderTemplate>
             <ItemTemplate>
                 <tr>
-                    <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHidden" Checked='<%# macroIsVisible (DataBinder.Eval(Container.DataItem, "Public"))%>' />
-                    </td>
                     <td class="propertyContent">
                         <input type="hidden" id="macroPropertyID" runat="server" value='<%#DataBinder.Eval(Container.DataItem, "id")%>'
                             name="macroPropertyID" />
@@ -178,9 +172,6 @@
             </ItemTemplate>
             <FooterTemplate>
                 <tr>
-                    <td class="propertyContent">
-                        <asp:CheckBox runat="server" ID="macroPropertyHiddenNew" />
-                    </td>
                     <td class="propertyContent">
                         <asp:TextBox runat="server" ID="macroPropertyAliasNew" Text='New Alias' OnTextChanged="macroPropertyCreate" />
                     </td>

src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs

@@ -136,7 +136,6 @@ namespace umbraco.cms.presentation.developer
                     DropDownList macroElementType = (DropDownList)item.FindControl("macroPropertyType");
 
                     MacroProperty mp = new MacroProperty(int.Parse(macroPropertyID.Value));
-                    mp.Public = macroElementShow.Checked;
                     mp.Type = new MacroPropertyType(int.Parse(macroElementType.SelectedValue));
                     mp.Alias = macroElementAlias.Text;
                     mp.Name = macroElementName.Text;
@@ -253,7 +252,6 @@ namespace umbraco.cms.presentation.developer
 
         public void macroPropertyCreate(object sender, EventArgs e)
         {
-            CheckBox macroPropertyHiddenNew = (CheckBox)((Control)sender).Parent.FindControl("macroPropertyHiddenNew");
             TextBox macroPropertyAliasNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyAliasNew");
             TextBox macroPropertyNameNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyNameNew");
             DropDownList macroPropertyTypeNew = (DropDownList)((Control)sender).Parent.FindControl("macroPropertyTypeNew");
@@ -277,7 +275,7 @@ namespace umbraco.cms.presentation.developer
                 {
                     MacroProperty mp = new MacroProperty();
                     mp.Macro = m_macro;
-                    mp.Public = macroPropertyHiddenNew.Checked;
+                    mp.Public = true;
                     mp.Type = new MacroPropertyType(int.Parse(macroPropertyTypeNew.SelectedValue));
                     mp.Alias = macroPropertyAliasNew.Text;
                     mp.Name = macroPropertyNameNew.Text;

src/umbraco.cms/businesslogic/macro/MacroProperty.cs

@@ -65,6 +65,7 @@ namespace umbraco.cms.businesslogic.macro
         /// 
         /// If not, the field can be manipulated by a default value given by the MacroPropertyType, this is s
         /// </summary>
+        [Obsolete]
         public bool Public
         {
             get { return _public; }

src/umbraco.cms/businesslogic/web/Document.cs

@@ -185,7 +185,7 @@ namespace umbraco.cms.businesslogic.web
                 select count(children.id) as children, umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, 
 	                cmsDocument.documentUser, coalesce(cmsDocument.templateId, cmsDocumentType.templateNodeId) as templateId, 
 	                umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0) as isPublished, umbracoNode.createDate, 
-	                cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, 
+                    cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsDocument.releaseDate, cmsDocument.expireDate, cmsContentType.icon, cmsContentType.alias,
 	                cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId as contentTypeId,
                     umbracoNode.nodeUser
                 from umbracoNode
@@ -202,7 +202,7 @@ namespace umbraco.cms.businesslogic.web
 	                cmsDocument.templateId, cmsDocumentType.templateNodeId, umbracoNode.path, umbracoNode.sortOrder, 
 	                coalesce(publishCheck.published,0), umbracoNode.createDate, cmsDocument.text, 
 	                cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, 
-	                cmsContentType.masterContentType, cmsContentType.nodeId, cmsDocument.updateDate, cmsContentVersion.versionDate, umbracoNode.nodeUser
+                    cmsContentType.masterContentType, cmsContentType.nodeId, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsDocument.releaseDate, cmsDocument.expireDate, umbracoNode.nodeUser
                 order by {1}
                 ";
 
@@ -1697,6 +1697,11 @@ namespace umbraco.cms.businesslogic.web
                 , masterContentType
                 , dr.GetInt("contentTypeId")
                 , dr.GetInt("templateId"));
+
+            if (!dr.IsNull("releaseDate"))
+                _release = dr.GetDateTime("releaseDate");
+            if (!dr.IsNull("expireDate"))
+                _expire = dr.GetDateTime("expireDate");
         }
 
         protected void SaveXmlPreview(XmlDocument xd)