swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
starfighter83
2010-12-17 08:04:09 -01:00
parent e29fe682b7 c9c7eed6d9
commit bf73588b6e
15 changed files with 159 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgignore
+1
View File
@@ -16,3 +16,4 @@ _ReSharper*/
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.suo
.hgtags
+6
View File
@@ -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
GettingStarted.txt
+24
View File
@@ -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
README.txt
+9
View File
@@ -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].
umbraco.sln
-1
View File
@@ -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
umbraco.suo
BIN
View File
Binary file not shown.
umbraco/presentation/config/Dashboard.config
+6 -1
View File
@@ -49,7 +49,12 @@
<areas>
<area>content</area>
</areas>
<tab caption="Get Started">
<tab caption="Property Test">
<control addPanel="true" panelCaption="PropertyTest" First="Hello World" Second="Even more" Third="[#userContentStartNode]" Fourth="yaddi">
/usercontrols/propertyTest.ascx
</control>
</tab>
<tab caption="Get Started">
<control showOnce="true" addPanel="true" panelCaption="">
/umbraco/dashboard/startupdashboardintro.ascx
</control>
umbraco/presentation/install/css/all.css
+3 -3
View File
@@ -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;
}
umbraco/presentation/install/js/jquery.main.js
+36 -21
View File
@@ -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();
}
umbraco/presentation/install/steps/database.ascx
+5 -7
View File
@@ -22,7 +22,7 @@
<p>
<strong>1. Do you have a blank database already installed?</strong></p>
<ul class="mini-tabset">
<li class="btn-yes"><a href="#database-sthttps://umbraco.unfuddle.com/svn/umbraco_juno/ep1" class="database-tab"><span>yes</span></a></li>
<li class="btn-yes"><a href="#database-step1" class="database-tab"><span>yes</span></a></li>
<li class="btn-no"><a href="#database-step2" class="database-tab"><span>no</span></a></li>
</ul>
</div>
@@ -33,7 +33,7 @@
<div class="container">
<p>
<strong>2. Now choose your database type below.</strong></p>
<div class="row select">
<div class="select">
<asp:DropDownList runat="server" ID="DatabaseType" CssClass="sel">
<asp:ListItem Value="" Text="Please choose" Selected="True" />
<asp:ListItem Value="SqlServer" Text="Microsoft SQL Server" />
@@ -44,12 +44,9 @@
</div>
</div>
</div>
</div>
<!-- step1-2 -->
<div id="database-step1-2">
<div class="step">
<div class="container">
<p>
<p class="instructionText">
<strong>3. Instructions:</strong> Please fill out the below fields to connect to
your database.</p>
<div class="instruction-hold">
@@ -159,7 +156,7 @@
<div class="hold">
<div class="progress-bar">
</div>
<span class="progress-bar-value">56%</span>
<span class="progress-bar-value">0%</span>
</div>
<strong></strong>
</div>
@@ -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)");
}
});
}
umbraco/presentation/install/steps/defaultUser.ascx
+12 -14
View File
@@ -25,41 +25,39 @@
<div class="instruction-hold">
<div class="row">
<asp:Label AssociatedControlID="tb_name" runat="server">Name:</asp:label>
<asp:label AssociatedControlID="tb_name" runat="server">Name:</asp:label>
<span><asp:TextBox ID="tb_name" CssClass="text" type="text" Text="admin" runat="server" /></span>
<asp:RequiredFieldValidator CssClass="invalidaing" ControlToValidate="tb_name" runat="server" ErrorMessage="Name is a mandatory field" />
<asp:RequiredFieldValidator Display="Dynamic" CssClass="invalidaing" ControlToValidate="tb_name" runat="server" ErrorMessage="Name is a mandatory field" />
</div>
<div class="row">
<asp:Label AssociatedControlID="tb_email" runat="server">Email:</asp:label>
<asp:label AssociatedControlID="tb_email" runat="server">Email:</asp:label>
<span><asp:TextBox ID="tb_email" CssClass="text" type="text" Text="admin@domain.com" runat="server" /></span>
<asp:RequiredFieldValidator CssClass="invalidaing" ControlToValidate="tb_email" runat="server" ErrorMessage="Email is a mandatory field" />
<asp:RequiredFieldValidator Display="Dynamic" CssClass="invalidaing" ControlToValidate="tb_email" runat="server" ErrorMessage="Email is a mandatory field" />
</div>
<div class="row">
<asp:Label AssociatedControlID="tb_login" runat="server">Username:</asp:label>
<asp:label AssociatedControlID="tb_login" runat="server">Username:</asp:label>
<span><asp:TextBox ID="tb_login" CssClass="text" type="text" Text="admin" runat="server" /></span>
<asp:RequiredFieldValidator CssClass="invalidaing" ControlToValidate="tb_login" runat="server" ErrorMessage="Username is a mandatory field" />
<asp:RequiredFieldValidator Display="Dynamic" CssClass="invalidaing" ControlToValidate="tb_login" runat="server" ErrorMessage="Username is a mandatory field" />
</div>
<div class="row" style="height: 35px; overflow: hidden;">
<asp:Label AssociatedControlID="tb_password" runat="server">Password:</asp:label>
<asp:label AssociatedControlID="tb_password" runat="server">Password:</asp:label>
<span><asp:TextBox ID="tb_password" CssClass="text" TextMode="Password" type="text" Text="" runat="server" /></span>
<asp:RequiredFieldValidator CssClass="invalidaing" ControlToValidate="tb_password" runat="server" ErrorMessage="Username is a mandatory field" />
<asp:RequiredFieldValidator Display="Dynamic" CssClass="invalidaing" ControlToValidate="tb_password" runat="server" ErrorMessage="Password is a mandatory field" />
</div>
<div class="row">
<asp:Label AssociatedControlID="tb_password_confirm" runat="server">Confirm Password:</asp:label>
<span><asp:TextBox ID="tb_password_confirm" CssClass="text" TextMode="Password" type="text" Text="" runat="server" /></span>
<asp:CompareValidator CssClass="invalidaing" ControlToCompare="tb_password" ControlToValidate="tb_password_confirm" ErrorMessage="The passwords must be identical" runat="server" />
<asp:RequiredFieldValidator CssClass="invalidaing" ControlToValidate="tb_password" runat="server" ErrorMessage="Username is a mandatory field" />
<span><asp:TextBox ID="tb_password_confirm" CssClass="text" TextMode="Password" type="text" Text="" runat="server" /></span>
<asp:RequiredFieldValidator Display="Dynamic" CssClass="invalidaing" ControlToValidate="tb_password_confirm" runat="server" ErrorMessage="Confirm Password is a mandatory field" />
<asp:CompareValidator Display="Dynamic" CssClass="invalidaing" ControlToCompare="tb_password" ControlToValidate="tb_password_confirm" ErrorMessage="The passwords must be identical" runat="server" />
</div>
<div class="check-hold">
<asp:CheckBox ID="cb_newsletter" runat="server" Checked="true" />
<asp:Label AssociatedControlID="cb_newsletter" runat="server">Sign up for our monthly newsletter</asp:label>
<asp:label AssociatedControlID="cb_newsletter" runat="server">Sign up for our monthly newsletter</asp:label>
</div>
</div>
</div>
umbraco/presentation/install/steps/skinning.ascx
+1
View File
@@ -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)");
}
});
}
umbraco/presentation/umbraco/dashboard.aspx.cs
+53
View File
@@ -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);
umbraco/presentation/web.config
+2 -2
View File
@@ -33,8 +33,8 @@
<Examine configSource="config\ExamineSettings.config" />
<ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
<appSettings>
<add key="umbracoDbDSN" value="server=.\sqlexpress;database=umbraco-nightly;integrated security=true;" />
<add key="umbracoConfigurationStatus" value="4.6.0.Alpha" />
<add key="umbracoDbDSN" value="server=.\sqlexpress;database=CNUG;user id=DBUSER;password=DBPASSWORD" />
<add key="umbracoConfigurationStatus" value="4.1.0.RC" />
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
<add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
<add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
umbraco/presentation/web.config.UMBRACOELISE.xslt
+1 -1
View File
@@ -4,7 +4,7 @@
<!-- Set up a local connection string -->
<xsl:template match="/configuration/appSettings/add[@key='umbracoDbDSN']/@value">
<xsl:attribute name="value">server=.\sqlexpress;database=41RC;user id=DBUSER;password=DBPASSWORD</xsl:attribute>
<xsl:attribute name="value">server=.\sqlexpress;database=CNUG;user id=DBUSER;password=DBPASSWORD</xsl:attribute>
</xsl:template>
<xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">