diff --git a/.hgignore b/.hgignore index b61636dd2b..ac527b38fd 100644 --- a/.hgignore +++ b/.hgignore @@ -16,3 +16,4 @@ _ReSharper*/ [Tt]est[Rr]esult* [Bb]uild[Ll]og.* *.[Pp]ublish.xml +*.suo \ No newline at end of file diff --git a/.hgtags b/.hgtags new file mode 100644 index 0000000000..d2a455fe3d --- /dev/null +++ b/.hgtags @@ -0,0 +1,6 @@ +d0aba247db91d1b70c39c6397b965ca370a67497 Sprint-Juno-A +0b8f67be2ca8faf008151d87f232c698de69e735 Release-4.5.0 +5960c073250926d202861a09472f5f334da6e283 Sprint-Juno-B +f15d4ff81a8368e9d42788f7e0ae726f7a70a3b1 Release-4.0.3 +283065df4d3c27245267709dd2644a479c4f62a5 Release-4.0.4.2 +ffc34b23e1a03785e4098afa4290d8c03cf10115 Release-4.5.2 diff --git a/GettingStarted.txt b/GettingStarted.txt new file mode 100644 index 0000000000..3f8f2ef52c --- /dev/null +++ b/GettingStarted.txt @@ -0,0 +1,24 @@ +Hi! Thanks for grabbing the Umbraco sourcecode. + +=========================================== +NOTE - DEFAULT BRANCH EMPTY - December 2010 +=========================================== + + +- With the help of CodePlex we have migrated much of our previous changesets (as of Dec 13th 2010) from TFS to Mercurial. + +- However, not everything could be migrated to our new branching workflow. So for each nominal group of 4.x changes, we've created named branches. For upcoming 5.x changesets, we'll adhere to our new workflow which we'll describe on the Wiki for contributors. + +- FOR THE MOMENT, the 'default' branch is empty - pending the addition of the 5.0 changesets + +- To switch to the codebase on which you want to work, 'hg update' to the named branch (e.g. "4.6.0") or tag (e.g. "Release-4.5.2") and browse or work from that point. + + +Thanks to Matt Hawley at CodePlex for his help in our migration! + +Cheers, +The Umbraco Team + +http://umbraco.org +http://our.umbraco.org +http://umbraco.codeplex.com \ No newline at end of file diff --git a/README.txt b/README.txt new file mode 100644 index 0000000000..6fb37d5510 --- /dev/null +++ b/README.txt @@ -0,0 +1,9 @@ +!! Umbraco - the simple, flexible and friendly ASP.NET CMS +For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 57.000 active websites including Heinz.com, Peugeot.com, NAIAS.com and Microsofts documentinteropinitiative.org website you can be sure that the technology is proven, stable and scales. +[url:More info at http://umbraco.org|http://umbraco.org] + +!! Forums +We have a forum running on [url:http://our.umbraco.org]. The discussions area on CodePlex will be for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [url:http://our.umbraco.org]. + +!! Submitting Issues +Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [url:online guide|http://our.umbraco.org/wiki/how-tos/submitting-bug-reports]. \ No newline at end of file diff --git a/umbraco.sln b/umbraco.sln index 4bae3e0c38..79f29c34bc 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -229,7 +229,6 @@ Global {6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.Build.0 = Release|Any CPU {89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.Build.0 = Debug|Any CPU {89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.ActiveCfg = Release|Any CPU {89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/umbraco.suo b/umbraco.suo deleted file mode 100644 index bcd5d23a23..0000000000 Binary files a/umbraco.suo and /dev/null differ diff --git a/umbraco/presentation/config/Dashboard.config b/umbraco/presentation/config/Dashboard.config index 28226c02ad..fcb784a54e 100644 --- a/umbraco/presentation/config/Dashboard.config +++ b/umbraco/presentation/config/Dashboard.config @@ -49,7 +49,12 @@ content - + + + /usercontrols/propertyTest.ascx + + + /umbraco/dashboard/startupdashboardintro.ascx diff --git a/umbraco/presentation/install/css/all.css b/umbraco/presentation/install/css/all.css index 247e9d9293..345c2eb03e 100644 --- a/umbraco/presentation/install/css/all.css +++ b/umbraco/presentation/install/css/all.css @@ -479,7 +479,7 @@ figure{display: block;} overflow:hidden; float:left; } -.ui-progressbar-value { background-image: url(../images/pbar-ani.gif) !important; } +.ui-progressbar-value { background-image: url(../images/pbar-ani.gif) } .btn-continue span{ width:122px; height:84px; @@ -542,11 +542,11 @@ figure{display: block;} .validaing, .invalidaing, .basevalidaing{ float:left !Important; - display:inline !Important; + display:inline; margin:6px 0 0 10px !Important; padding:0 0 2px 28px !Important; line-height:13px !Important; - font-weight:normal !Important; + font-weight:bold !Important; color:#fff !Important; background-color: none !Important; } diff --git a/umbraco/presentation/install/js/jquery.main.js b/umbraco/presentation/install/js/jquery.main.js index 95c76ddf68..3824123dae 100644 --- a/umbraco/presentation/install/js/jquery.main.js +++ b/umbraco/presentation/install/js/jquery.main.js @@ -110,15 +110,15 @@ function initTabs() { var select = $(this); selectVal = select.val(); + jQuery('#database-step1').hide(); jQuery('#database-step1-2').hide(); + jQuery('#database-step2').hide(); select.change(function () { selectValNew = jQuery(this).val(); - if (selectVal != selectValNew) jQuery('#database-step1-2').show(); - else jQuery('#database-step1-2').hide(); toggleDatabaseOption(selectValNew); - }) + }); }) _links.each(function () { var _link = $(this); @@ -135,7 +135,6 @@ function initTabs() { _link.addClass('active'); _tab.show(); - jQuery('#database-step1-2').hide(); return false; }); }); @@ -146,33 +145,49 @@ function initTabs() { //add by pph function toggleDatabaseOption(selectValNew) { - if (selectValNew != '') { + var step1 = '#database-step1'; + + //Defensive if else to prevent this being executed on non database pages + if (jQuery(step1).length) { + var instructionText = jQuery(step1 + ' .instructionText'); + var buttonBox = jQuery('.btn-box'); + //hide instructions jQuery('#database-step2').hide(); - + instructionText.hide(); + buttonBox.hide(); + //hide all db options - jQuery('#database-step1-2 .row').hide(); + jQuery(step1 + ' .row').hide(); - jQuery(".btn-box").show(); - - if (selectValNew == 'SqlServer' || selectValNew == 'MySql') - jQuery('#database-step1-2 .sql').show(); - else if (selectValNew == 'Custom') - jQuery('#database-step1-2 .custom').show(); - else if (selectValNew.indexOf('SQLCE4Umbraco') > -1 && !hasEmbeddedDlls) { - jQuery('#database-step1-2 .embeddedError').show(); - jQuery(".btn-box").hide(); + if (selectValNew != '') { + if (selectValNew == 'SqlServer' || selectValNew == 'MySql') { + jQuery(step1 + ' .sql').show(); + instructionText.show(); + buttonBox.show(); + } + else if (selectValNew == 'Custom') { + jQuery(step1 + ' .custom').show(); + instructionText.show(); + buttonBox.show(); + } + else if (selectValNew.indexOf('SQLCE4Umbraco') > -1 && !hasEmbeddedDlls) { + jQuery(step1 + ' .embeddedError').show(); + } + else if (selectValNew.indexOf('SQLCE4Umbraco') > -1) { + jQuery(step1 + ' .embedded').show(); + instructionText.show(); + buttonBox.show(); + } } - else if (selectValNew.indexOf('SQLCE4Umbraco') > -1) - jQuery('#database-step1-2 .embedded').show(); - showDatabaseSettings(); } } //add by pph function showDatabaseSettings() { - jQuery('#database-step1').show(); - jQuery('#database-step1-2').show(); + var link = jQuery('.btn-yes > a'); + link.addClass('active'); + jQuery(link.attr('href')).show(); } diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index 968434670f..e3cfc191a0 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -22,7 +22,7 @@

1. Do you have a blank database already installed?

@@ -33,7 +33,7 @@

2. Now choose your database type below.

-
+
@@ -44,12 +44,9 @@
- - -
-

+

3. Instructions: Please fill out the below fields to connect to your database.

@@ -159,7 +156,7 @@
- 56% + 0%
@@ -207,6 +204,7 @@ if (data.percentage == 100) { clearInterval(intervalId); jQuery(".btn-box").show(); + jQuery('.ui-progressbar-value').css("background-image", "url(images/pbar.gif)"); } }); } diff --git a/umbraco/presentation/install/steps/defaultUser.ascx b/umbraco/presentation/install/steps/defaultUser.ascx index 99d89dd9dd..ed403d35a9 100644 --- a/umbraco/presentation/install/steps/defaultUser.ascx +++ b/umbraco/presentation/install/steps/defaultUser.ascx @@ -25,41 +25,39 @@
- Name: + Name: - +
- Email: + Email: - - +
- Username: + Username: - +
- Password: + Password: - +
Confirm Password: - - - - + + +
- Sign up for our monthly newsletter + Sign up for our monthly newsletter
diff --git a/umbraco/presentation/install/steps/skinning.ascx b/umbraco/presentation/install/steps/skinning.ascx index b92126cbfb..e6dd460934 100644 --- a/umbraco/presentation/install/steps/skinning.ascx +++ b/umbraco/presentation/install/steps/skinning.ascx @@ -64,6 +64,7 @@ if (data.percentage == 100) { clearInterval(intervalId); jQuery(".btn-box").show(); + jQuery('.ui-progressbar-value').css("background-image", "url(images/pbar.gif)"); } }); } diff --git a/umbraco/presentation/umbraco/dashboard.aspx.cs b/umbraco/presentation/umbraco/dashboard.aspx.cs index 815953631c..14f5cd8b62 100644 --- a/umbraco/presentation/umbraco/dashboard.aspx.cs +++ b/umbraco/presentation/umbraco/dashboard.aspx.cs @@ -3,6 +3,7 @@ using System.Collections; using System.ComponentModel; using System.Data; using System.Drawing; +using System.Reflection; using System.Web; using System.Web.SessionState; using System.Web.UI; @@ -88,6 +89,27 @@ namespace umbraco.cms.presentation { Control c = LoadControl(path); + // set properties + Type type = c.GetType(); + if (type != null) + { + foreach (XmlAttribute att in uc.Attributes) + { + string attributeName = att.Name; + string attributeValue = parseControlValues(att.Value).ToString(); // parse special type of values + + + PropertyInfo prop = type.GetProperty(attributeName); + if (prop == null) + { + continue; + } + + prop.SetValue(c, Convert.ChangeType(attributeValue, prop.PropertyType), null); + + } + } + //resolving files from dashboard config which probably does not map to a virtual fi tab.Controls.Add(AddPanel(uc, c)); } @@ -135,6 +157,37 @@ namespace umbraco.cms.presentation } } + private object parseControlValues(string value) + { + if (!String.IsNullOrEmpty(value)) + { + if (value.StartsWith("[#")) + { + value = value.Substring(2, value.Length - 3).ToLower(); + switch (value) + { + case "usertype": + return BusinessLogic.User.GetCurrent().UserType.Alias; + case "username": + return BusinessLogic.User.GetCurrent().Name; + case "userlogin": + return BusinessLogic.User.GetCurrent().LoginName; + case "usercontentstartnode": + return BusinessLogic.User.GetCurrent().StartNodeId; + break; + case "usermediastartnode": + return BusinessLogic.User.GetCurrent().StartMediaId; + break; + default: + return value; + break; + } + } + } + + return value; + } + private Control AddPanel(XmlNode node, Control c) { LiteralControl hide = AddShowOnceLink(node); diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config index 49c948647f..3eb293a29d 100644 --- a/umbraco/presentation/web.config +++ b/umbraco/presentation/web.config @@ -33,8 +33,8 @@ - - + + diff --git a/umbraco/presentation/web.config.UMBRACOELISE.xslt b/umbraco/presentation/web.config.UMBRACOELISE.xslt index 20e07d1d59..a5b4e0831b 100644 --- a/umbraco/presentation/web.config.UMBRACOELISE.xslt +++ b/umbraco/presentation/web.config.UMBRACOELISE.xslt @@ -4,7 +4,7 @@ - server=.\sqlexpress;database=41RC;user id=DBUSER;password=DBPASSWORD + server=.\sqlexpress;database=CNUG;user id=DBUSER;password=DBPASSWORD