diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index d7fc9ef3d7..edcfef719e 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -19,50 +19,62 @@
- 2. Now choose your database type below.
-+ 2. Now choose your database type below.
+3. Connection details: Please fill out the connection information for your database.
+ 2. Simple file-based database:
++ 2. Connection details: Please fill out the connection information for your database.
+ +Example: datalayer=MySQL;server=192.168.2.8;user id=user;password=***;database=umbraco
-
+ 2. Getting a database setup for umbraco.
+ For first time users, we recommend you select "quick-and-simple file-based database".
+ This will install an easy to use database, that does
+ not require any additional software to use.
+ Alternatively, you can install Microsoft SQL Server, which will require a bit more
+ work to get up and running.
+ We have provided a step-by-step guide in the video instructions below.
+
- 2. Getting a database setup for umbraco.
- For first time users, we recommend you select "SQL CE 4" in the dropdown box, after clicking the "yes" button.
- This will install an easy to use database, that does not require any additional software to use.
- Alternatively, you can install Microsoft SQL Server, which will require a bit more work to get up and running.
- We have provided a step-by-step guide in the video instructions below.
-
'); + h = h.replace(new RegExp('
'); - h = h.replace(new RegExp('
]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "
$1
"); - } + if (getParam(ed, "paste_convert_headers_to_strong")) { + h = h.replace(/]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "
$1
"); + } - if (getParam(ed, "paste_convert_middot_lists")) { - process([ - [//gi, '$&__MCE_ITEM__'], // Convert supportLists to a list item marker + if (getParam(ed, "paste_convert_middot_lists")) { + process([ + [//gi, '$&__MCE_ITEM__'], // Convert supportLists to a list item marker [/(]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'] // Convert mso-list and symbol spans to item markers ]); - } + } - process([ - // Word comments like conditional comments etc + process([ + // Word comments like conditional comments etc //gi, - // Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags + // Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags /<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, - // Convert"], [/<\/h[1-6][^>]*>/gi, "
"] ]); - } + } - // Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso"). - // Note:- paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation. - stripClass = getParam(ed, "paste_strip_class_attributes"); + // Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso"). + // Note:- paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation. + stripClass = getParam(ed, "paste_strip_class_attributes"); - if (stripClass !== "none") { - function removeClasses(match, g1) { - if (stripClass === "all") - return ''; + if (stripClass !== "none") { + function removeClasses(match, g1) { + if (stripClass === "all") + return ''; - var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "), - function(v) { - return (/^(?!mso)/i.test(v)); + var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "), + function (v) { + return (/^(?!mso)/i.test(v)); } ); - return cls.length ? ' class="' + cls.join(" ") + '"' : ''; - }; + return cls.length ? ' class="' + cls.join(" ") + '"' : ''; + }; - h = h.replace(/ class="([^"]+)"/gi, removeClasses); - h = h.replace(/ class=(\w+)/gi, removeClasses); - } + h = h.replace(/ class="([^"]+)"/gi, removeClasses); + h = h.replace(/ class=(\w+)/gi, removeClasses); + } - // Remove spans option - if (getParam(ed, "paste_remove_spans")) { - h = h.replace(/<\/?span[^>]*>/gi, ""); - } + // Remove spans option + if (getParam(ed, "paste_remove_spans")) { + h = h.replace(/<\/?span[^>]*>/gi, ""); + } - //console.log('After preprocess:' + h); + //console.log('After preprocess:' + h); - o.content = h; - }, + o.content = h; + }, - /** - * Various post process items. - */ - _postProcess : function(pl, o) { - var t = this, ed = t.editor, dom = ed.dom, styleProps; + /** + * Various post process items. + */ + _postProcess: function (pl, o) { + var t = this, ed = t.editor, dom = ed.dom, styleProps; - if (o.wordContent) { - // Remove named anchors or TOC links - each(dom.select('a', o.node), function(a) { - if (!a.href || a.href.indexOf('#_Toc') != -1) - dom.remove(a, 1); - }); + if (o.wordContent) { + // Remove named anchors or TOC links + each(dom.select('a', o.node), function (a) { + if (!a.href || a.href.indexOf('#_Toc') != -1) + dom.remove(a, 1); + }); - if (getParam(ed, "paste_convert_middot_lists")) { - t._convertLists(pl, o); - } + if (getParam(ed, "paste_convert_middot_lists")) { + t._convertLists(pl, o); + } - // Process styles - styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties + // Process styles + styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties - // Process only if a string was specified and not equal to "all" or "*" - if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) { - styleProps = tinymce.explode(styleProps.replace(/^none$/i, "")); + // Process only if a string was specified and not equal to "all" or "*" + if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) { + styleProps = tinymce.explode(styleProps.replace(/^none$/i, "")); - // Retains some style properties - each(dom.select('*', o.node), function(el) { - var newStyle = {}, npc = 0, i, sp, sv; + // Retains some style properties + each(dom.select('*', o.node), function (el) { + var newStyle = {}, npc = 0, i, sp, sv; - // Store a subset of the existing styles - if (styleProps) { - for (i = 0; i < styleProps.length; i++) { - sp = styleProps[i]; - sv = dom.getStyle(el, sp); + // Store a subset of the existing styles + if (styleProps) { + for (i = 0; i < styleProps.length; i++) { + sp = styleProps[i]; + sv = dom.getStyle(el, sp); - if (sv) { - newStyle[sp] = sv; - npc++; - } - } - } + if (sv) { + newStyle[sp] = sv; + npc++; + } + } + } - // Remove all of the existing styles - dom.setAttrib(el, 'style', ''); + // Remove all of the existing styles + dom.setAttrib(el, 'style', ''); - if (styleProps && npc > 0) - dom.setStyles(el, newStyle); // Add back the stored subset of styles - else // Remove empty span tags that do not have class attributes - if (el.nodeName == 'SPAN' && !el.className) - dom.remove(el, true); - }); - } - } + if (styleProps && npc > 0) + dom.setStyles(el, newStyle); // Add back the stored subset of styles + else // Remove empty span tags that do not have class attributes + if (el.nodeName == 'SPAN' && !el.className) + dom.remove(el, true); + }); + } + } - // Remove all style information or only specifically on WebKit to avoid the style bug on that browser - if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) { - each(dom.select('*[style]', o.node), function(el) { - el.removeAttribute('style'); - el.removeAttribute('_mce_style'); - }); - } else { - if (tinymce.isWebKit) { - // We need to compress the styles on WebKit since if you paste"],
[/\n/g, "
"]
]);
- }
+ }
- // This next piece of code handles the situation where we're pasting more than one paragraph of plain
- // text, and we are pasting the content into the middle of a block node in the editor. The block
- // node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining).
- // The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the
- // pasted text is prepended to "Para B". Any other paragraphs of pasted text are placed between
- // "Para A" and "Para B". This code solves a host of problems with the original plain text plugin and
- // now handles styles correctly. (Pasting plain text into a styled paragraph is supposed to make the
- // plain text take the same style as the existing paragraph.)
- if ((pos = h.indexOf("
")) != -1) { - rpos = h.lastIndexOf("
"); - node = sel.getNode(); - breakElms = []; // Get list of elements to break + // This next piece of code handles the situation where we're pasting more than one paragraph of plain + // text, and we are pasting the content into the middle of a block node in the editor. The block + // node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining). + // The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the + // pasted text is prepended to "Para B". Any other paragraphs of pasted text are placed between + // "Para A" and "Para B". This code solves a host of problems with the original plain text plugin and + // now handles styles correctly. (Pasting plain text into a styled paragraph is supposed to make the + // plain text take the same style as the existing paragraph.) + if ((pos = h.indexOf("
")) != -1) { + rpos = h.lastIndexOf("
");
+ node = sel.getNode();
+ breakElms = []; // Get list of elements to break
- do {
- if (node.nodeType == 1) {
- // Don't break tables and break at body
- if (node.nodeName == "TD" || node.nodeName == "BODY") {
- break;
- }
+ do {
+ if (node.nodeType == 1) {
+ // Don't break tables and break at body
+ if (node.nodeName == "TD" || node.nodeName == "BODY") {
+ break;
+ }
- breakElms[breakElms.length] = node;
- }
- } while (node = node.parentNode);
+ breakElms[breakElms.length] = node;
+ }
+ } while (node = node.parentNode);
- // Are we in the middle of a block node?
- if (breakElms.length > 0) {
- before = h.substring(0, pos);
- after = "";
+ // Are we in the middle of a block node?
+ if (breakElms.length > 0) {
+ before = h.substring(0, pos);
+ after = "";
- for (i=0, len=breakElms.length; i