diff --git a/umbraco/cms/businesslogic/member/Member.cs b/umbraco/cms/businesslogic/member/Member.cs index e90118fc0a..ebbc082f3f 100644 --- a/umbraco/cms/businesslogic/member/Member.cs +++ b/umbraco/cms/businesslogic/member/Member.cs @@ -796,6 +796,25 @@ namespace umbraco.cms.businesslogic.member { value = StateHelper.Cookies.Member.GetValue(); } + // compatibility with .NET Memberships + else if (HttpContext.Current.User.Identity.IsAuthenticated) + { + int _currentMemberId = 0; + if (int.TryParse(Membership.GetUser().ProviderUserKey.ToString(), out _currentMemberId)) + { + if (memberExists(_currentMemberId)) + { + // current member is always in the cache, else add it! + Member m = GetMemberFromCache(_currentMemberId); + if (m == null) + { + m = new Member(_currentMemberId); + AddMemberToCache(m); + } + return new MemberState(m.Id, m.UniqueId, m.LoginName); + } + } + } else { var context = HttpContext.Current; diff --git a/umbraco/presentation/umbraco/settings/editTemplate.aspx b/umbraco/presentation/umbraco/settings/editTemplate.aspx index 299538d7d0..4b5dfc6666 100644 --- a/umbraco/presentation/umbraco/settings/editTemplate.aspx +++ b/umbraco/presentation/umbraco/settings/editTemplate.aspx @@ -1,17 +1,14 @@ -<%@ Page MasterPageFile="../masterpages/umbracoPage.Master" Language="c#" Codebehind="editTemplate.aspx.cs" ValidateRequest="false" - AutoEventWireup="True" Inherits="umbraco.cms.presentation.settings.editTemplate" %> +<%@ Page MasterPageFile="../masterpages/umbracoPage.Master" Language="c#" CodeBehind="editTemplate.aspx.cs" + ValidateRequest="false" AutoEventWireup="True" Inherits="umbraco.cms.presentation.settings.editTemplate" %> + <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> - - - - - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - -
+ - - -
- +
-
"> - <%# DataBinder.Eval(Container, "DataItem.Value") %> -
- - - -
- -
- - Insert Macro - -
- -
- - - -
" params="<%# DoesMacroHaveSettings(DataBinder.Eval(Container, "DataItem.id").ToString()) %>"> - <%# DataBinder.Eval(Container, "DataItem.macroName")%> +
"> + <%# DataBinder.Eval(Container, "DataItem.Value") %>
- - + +
+
+ + Insert Macro + +
+
+ + +
" + params="<%# DoesMacroHaveSettings(DataBinder.Eval(Container, "DataItem.id").ToString()) %>"> + <%# DataBinder.Eval(Container, "DataItem.macroName")%> +
+ +
- - diff --git a/umbraco/presentation/umbraco_client/CodeArea/javascript.js b/umbraco/presentation/umbraco_client/CodeArea/javascript.js index be8ace80e6..d217119c14 100644 --- a/umbraco/presentation/umbraco_client/CodeArea/javascript.js +++ b/umbraco/presentation/umbraco_client/CodeArea/javascript.js @@ -8,6 +8,13 @@ function resizeTextArea(textEditor, offsetX, offsetY) { } } +function UmbracoCodeSnippet() { + this.BeginTag = ""; + this.EndTag = ""; + this.TargetId = ""; + this.CursorPos = 0; +} + // Ctrl + S support var ctrlDown = false; @@ -29,6 +36,21 @@ function shortcutCheckKeysDown(e) { return false; } + //snippet + if (ctrlDown && keycode == 77) { + if (window.umbracoInsertSnippet) { + var snippetCode = umbracoInsertSnippet(); + if (window.UmbEditor) { + UmbEditor.Insert(snippetCode.BeginTag, snippetCode.EndTag, snippetCode.TargetId); + if (window.addEventListener) { + e.preventDefault(); + } else + return false; + } + } + + } + //load the insert value dialog: ctrl + g if (ctrlDown && keycode == 71) { umbracoInsertField('', 'xsltInsertValueOf', '', 'felt', 750, 230, ''); @@ -66,14 +88,14 @@ var tab = { tosp: true, watching: {}, results: {}, - $: function(id) { + $: function (id) { return document.getElementById(id); }, - watch: function(obj) { + watch: function (obj) { if (obj && this.$(obj)) { this.watching["_" + obj] = this.$(obj); - this.addEvent(this.$(obj), "keydown", function(evt) { + this.addEvent(this.$(obj), "keydown", function (evt) { var sct = tab.$(obj).scrollTop; var l = tab.$(obj).value.length; var evt = (evt) ? evt : ((window.event) ? event : null); @@ -118,9 +140,9 @@ var tab = { } }, - click: function(obj, fn) { + click: function (obj, fn) { if (obj && this.$(obj)) { - this.addEvent(this.$(obj), "click", function() { + this.addEvent(this.$(obj), "click", function () { tab.results["_" + this.id.split("_")[1]] = tab.parse(tab.watching["_" + this.id.split("_")[1]].value); if (fn && fn.constructor == Function) { @@ -130,13 +152,13 @@ var tab = { } }, - get: function(obj) { + get: function (obj) { if (obj && this.$(obj)) { return this.results["_" + obj]; } }, - parse: function(str) { + parse: function (str) { var str = (str) ? str : ""; if (str.length) { @@ -152,10 +174,10 @@ var tab = { return str; }, - addEvent: function(obj, type, fn) { + addEvent: function (obj, type, fn) { if (obj.attachEvent) { obj["e" + type + fn] = fn; - obj[type + fn] = function() { + obj[type + fn] = function () { obj["e" + type + fn](window.event); }