Merge remote-tracking branch 'origin/6.1.2' into 7.0.0
Conflicts: .hgignore
This commit is contained in:
Shannon
@@ -2582,9 +2582,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
|
||||
<WebProjectProperties>
|
||||
<UseIIS>True</UseIIS>
|
||||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>61637</DevelopmentServerPort>
|
||||
<DevelopmentServerPort>6120</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:61638</IISUrl>
|
||||
<IISUrl>http://localhost:6120/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
<div class="row">
|
||||
<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>
|
||||
<span><asp:TextBox ID="tb_email" CssClass="text" type="text" Text="admin@example.com" runat="server" /></span>
|
||||
<asp:RequiredFieldValidator Display="Dynamic" CssClass="invalidaing" ControlToValidate="tb_email" runat="server" ErrorMessage="Email is a mandatory field" />
|
||||
</div>
|
||||
|
||||
|
||||
@@ -432,13 +432,13 @@ Dette er en automatisk mail for at fortælle at handlingen '%1%'
|
||||
er blevet udført på siden '%2%'
|
||||
af brugeren '%3%'
|
||||
|
||||
Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for at redigere.
|
||||
Gå til http://%4%/default.aspx?section=content&id=%5% for at redigere.
|
||||
|
||||
Ha' en dejlig dag!
|
||||
|
||||
Mange hilsner fra umbraco robotten
|
||||
]]></key>
|
||||
<key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p> <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong> er blevet udførtpå siden <a href="%7%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLISÉr </a> <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> RET </a> <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> SLET </a> <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLISÉR </a> <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> RET </a> <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> SLET </a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
|
||||
<key alias="mailBodyHtml"><![CDATA[<p>Hej %0%</p> <p>Dette er en automatisk mail for at informere dig om at opgaven <strong>'%1%'</strong> er blevet udførtpå siden <a href="%7%"><strong>'%2%'</strong></a> af brugeren <strong>'%3%'</strong> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLISÉr </a> <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%"> RET </a> <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%"> SLET </a> <br /> </div> <p> <h3>Opdateringssammendrag:</h3> <table style="width: 100%;"> %6% </table> </p> <div style="margin: 8px 0; padding: 8px; display: block;"> <br /> <a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLISÉR </a> <a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%"> RET </a> <a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%"> SLET </a> <br /> </div> <p>Hav en fortsat god dag!<br /><br /> De bedste hilsner fra umbraco robotten </p>]]></key>
|
||||
<key alias="mailSubject">[%0%] Notificering om %1% udført på %2%</key>
|
||||
<key alias="notifications">Notificeringer</key>
|
||||
</area>
|
||||
|
||||
@@ -463,7 +463,7 @@ Hallo %0%,
|
||||
|
||||
die Aufgabe '%1%' (von Benutzer '%3%') an der Seite '%2%' wurde ausgeführt.
|
||||
|
||||
Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/umbraco/actions/editContent.aspx?id=%5%
|
||||
Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/actions/editContent.aspx?id=%5%
|
||||
|
||||
Einen schönen Tag wünscht
|
||||
Ihr freundlicher Umbraco-Robot
|
||||
@@ -474,9 +474,9 @@ Ihr freundlicher Umbraco-Robot
|
||||
<p>die Aufgabe <strong>'%1%'</strong> (von Benutzer '%3%') an der Seite <a href="%7%"><strong>'%2%'</strong></a> wurde ausgeführt.</p>
|
||||
<div style="margin: 8px 0; padding: 8px; display: block;">
|
||||
<br />
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> VERÖFFENTLICHEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> BEARBEITEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> LÖSCHEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%"> VERÖFFENTLICHEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%"> BEARBEITEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%"> LÖSCHEN </a>
|
||||
<br />
|
||||
</div>
|
||||
<p>
|
||||
@@ -487,9 +487,9 @@ Ihr freundlicher Umbraco-Robot
|
||||
</p>
|
||||
<div style="margin: 8px 0; padding: 8px; display: block;">
|
||||
<br />
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> VERÖFFENTLICHEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> BEARBEITEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> LÖSCHEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%"> VERÖFFENTLICHEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%"> BEARBEITEN </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%"> LÖSCHEN </a>
|
||||
<br />
|
||||
</div>
|
||||
<p>Einen schönen Tag wünscht<br />Ihr freundlicher Umbraco-Robot</p>
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
<key alias="domainHelp">
|
||||
<![CDATA[Valid domain names are: "example.com", "www.example.com", "example.com:8080" or
|
||||
"https://www.example.com/".<br /><br />One-level paths in domains are supported, eg. "example.com/en". However, they
|
||||
they should be avoided. Better use the culture setting above.]]>
|
||||
should be avoided. Better use the culture setting above.]]>
|
||||
</key>
|
||||
<key alias="domainUpdated">Domain '%0%' has been updated</key>
|
||||
<key alias="orEdit">Edit Current Domains</key>
|
||||
|
||||
@@ -534,7 +534,7 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri
|
||||
|
||||
Ceci est un email automatique pour vous informer que la tâche '%1%' a été activée sur la page '%2%' par l'utilisateur '%3%'
|
||||
|
||||
Allez à http://%4%/umbraco/actions/editContent.aspx?id=%5% pour éditer.
|
||||
Allez à http://%4%/actions/editContent.aspx?id=%5% pour éditer.
|
||||
|
||||
Bonne journée!
|
||||
|
||||
@@ -550,9 +550,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri
|
||||
</p>
|
||||
<div class="buttons">
|
||||
<br />
|
||||
<a class="buttonPublish" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLIER </a>
|
||||
<a class="buttonEdit" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> EDITER </a>
|
||||
<a class="buttonDelete" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> SUPPRIMER </a>
|
||||
<a class="buttonPublish" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLIER </a>
|
||||
<a class="buttonEdit" href="http://%4%/actions/editContent.aspx?id=%5%"> EDITER </a>
|
||||
<a class="buttonDelete" href="http://%4%/actions/delete.aspx?id=%5%"> SUPPRIMER </a>
|
||||
<br />
|
||||
</div>
|
||||
<p>
|
||||
@@ -564,9 +564,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri
|
||||
|
||||
<div class="buttons">
|
||||
<br />
|
||||
<a class="buttonPublish" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLIER </a>
|
||||
<a class="buttonEdit" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> EDITER </a>
|
||||
<a class="buttonDelete" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> SUPPRIMER </a>
|
||||
<a class="buttonPublish" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLIER </a>
|
||||
<a class="buttonEdit" href="http://%4%/actions/editContent.aspx?id=%5%"> EDITER </a>
|
||||
<a class="buttonDelete" href="http://%4%/actions/delete.aspx?id=%5%"> SUPPRIMER </a>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
|
||||
@@ -452,9 +452,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
|
||||
</p>
|
||||
<div class="buttons">
|
||||
<br />
|
||||
<a class="buttonPublish" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLISH </a>
|
||||
<a class="buttonEdit" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> EDIT </a>
|
||||
<a class="buttonDelete" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> DELETE </a>
|
||||
<a class="buttonPublish" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLISH </a>
|
||||
<a class="buttonEdit" href="http://%4%/actions/editContent.aspx?id=%5%"> EDIT </a>
|
||||
<a class="buttonDelete" href="http://%4%/actions/delete.aspx?id=%5%"> DELETE </a>
|
||||
<br />
|
||||
</div>
|
||||
<p>
|
||||
@@ -466,9 +466,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
|
||||
|
||||
<div class="buttons">
|
||||
<br />
|
||||
<a class="buttonPublish" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLISH </a>
|
||||
<a class="buttonEdit" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> EDIT </a>
|
||||
<a class="buttonDelete" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> DELETE </a>
|
||||
<a class="buttonPublish" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLISH </a>
|
||||
<a class="buttonEdit" href="http://%4%/actions/editContent.aspx?id=%5%"> EDIT </a>
|
||||
<a class="buttonDelete" href="http://%4%/actions/delete.aspx?id=%5%"> DELETE </a>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
|
||||
@@ -433,7 +433,7 @@ Dette er en automatisk mail for å informere om at handlingen '%1%'
|
||||
er utført på siden '%2%'
|
||||
av brukeren '%3%'
|
||||
|
||||
Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for å redigere.
|
||||
Gå til http://%4%/default.aspx?section=content&id=%5% for å redigere.
|
||||
|
||||
Ha en fin dag!
|
||||
|
||||
@@ -447,9 +447,9 @@ Vennlig hilsen umbraco roboten
|
||||
</p>
|
||||
<div style="margin: 8px 0; padding: 8px; display: block;">
|
||||
<br />
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLISER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> REDIGER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> SLETT </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLISER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%"> REDIGER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%"> SLETT </a>
|
||||
<br />
|
||||
</div>
|
||||
<p>
|
||||
@@ -461,9 +461,9 @@ Vennlig hilsen umbraco roboten
|
||||
|
||||
<div style="margin: 8px 0; padding: 8px; display: block;">
|
||||
<br />
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/umbraco/actions/publish.aspx?id=%5%"> PUBLISER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/umbraco/actions/editContent.aspx?id=%5%"> REDIGER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/umbraco/actions/delete.aspx?id=%5%"> SLETT </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;" href="http://%4%/actions/publish.aspx?id=%5%"> PUBLISER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;" href="http://%4%/actions/editContent.aspx?id=%5%"> REDIGER </a>
|
||||
<a style="color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;" href="http://%4%/actions/delete.aspx?id=%5%"> SLETT </a>
|
||||
<br />
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %>
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
|
||||
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
|
||||
|
||||
<asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%>
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%>
|
||||
<%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
|
||||
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
@* Get the property alias we want to filter on from the macro parameter *@
|
||||
var propertyAlias = Parameter.propertyAlias;
|
||||
var selection = Model.Children.Where("Visible").OrderBy(propertyAlias)
|
||||
var selection = Model.Children.Where("Visible").OrderBy(propertyAlias);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -10,25 +10,25 @@
|
||||
<table cellspacing="0" cellpadding="4" border="0">
|
||||
<tr>
|
||||
<th width="30%">
|
||||
<%=umbraco.ui.Text("name", UmbracoUser)%>:
|
||||
<%=umbraco.ui.Text("name", base.getUser())%>:
|
||||
</th>
|
||||
<td class="propertyContent">
|
||||
<asp:TextBox ID="NameTxt" Width="350px" runat="server" /><br />
|
||||
<small><%=umbraco.ui.Text("stylesheet", "nameHelp", UmbracoUser)%></small>
|
||||
<small><%=umbraco.ui.Text("stylesheet", "nameHelp", base.getUser())%></small>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th width="30%">
|
||||
<%=umbraco.ui.Text("alias", UmbracoUser)%>:
|
||||
<%=umbraco.ui.Text("alias", base.getUser())%>:
|
||||
</th>
|
||||
<td class="propertyContent">
|
||||
<asp:TextBox ID="AliasTxt" Width="350px" runat="server" /><br />
|
||||
<small><%=umbraco.ui.Text("stylesheet", "aliasHelp", UmbracoUser)%></small>
|
||||
<small><%=umbraco.ui.Text("stylesheet", "aliasHelp", base.getUser())%></small>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th width="30%">
|
||||
<%=umbraco.ui.Text("styles", UmbracoUser)%>:
|
||||
<%=umbraco.ui.Text("styles", base.getUser())%>:
|
||||
</th>
|
||||
<td class="propertyContent">
|
||||
<asp:TextBox ID="Content" Style="width: 350px" TextMode="MultiLine" runat="server" />
|
||||
@@ -38,7 +38,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th width="30%">
|
||||
<%=umbraco.ui.Text("preview", UmbracoUser)%>:
|
||||
<%=umbraco.ui.Text("preview", base.getUser())%>:
|
||||
</th>
|
||||
<td class="propertyContent">
|
||||
<div id="preview" style="padding: 10px; border: 1px solid #ccc; width: 330px;">
|
||||
|
||||
@@ -175,7 +175,7 @@
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
|
||||
<remove name="UmbracoModule" />
|
||||
<add name=" UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" />
|
||||
<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" />
|
||||
|
||||
<remove name="ScriptModule" />
|
||||
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
|
||||
Reference in New Issue
Block a user