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

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
perploug
2013-10-03 20:59:04 +02:00
parent 21d6209793 9e1364db42
commit a42bd4dbf0
193 changed files with 2182 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web.UI/App_Plugins/MyPackage/Package.manifest
View File

@@ -42,11 +42,25 @@
}
}
}
}
},
{
alias: "MyPackage.CustomJson",
name: "Custom editor",
editor: {
view: "~/App_Plugins/MyPackage/PropertyEditors/Views/CustomJson.html"
},
prevalues: {
fields: [
{
label: "Json preval",
key: "value",
view: "~/App_Plugins/MyPackage/PropertyEditors/Views/CustomJson.html"
}
]
}
}
],
javascript: [
'~/App_Plugins/MyPackage/PropertyEditors/Js/CsvEditor.js',
'~/App_Plugins/MyPackage/PropertyEditors/Js/PostcodeEditor.js',
'~/App_Plugins/MyPackage/PropertyEditors/Js/RegexEditor.js'
'~/App_Plugins/MyPackage/PropertyEditors/Js/propertyeditors.controller.js'
]
}

43
src/Umbraco.Web.UI/App_Plugins/MyPackage/PropertyEditors/Js/CsvEditor.js
View File

@@ -1,43 +0,0 @@
'use strict';
(function() {
function csvEditorController($scope, $http, $filter) {
var values = [];
//this will be comma delimited
if ($scope.model.value && (typeof $scope.model.value == "string")) {
var splitVals = $scope.model.value.split(",");
//set the values of our object
for (var i = 0; i < splitVals.length; i++) {
values.push({
index: i,
value: splitVals[i].trim()
});
}
}
//if there was no data then initialize with 5 values... we should configure that in pre-vals
if (values.length == 0) {
for (var x = 0; x < 5; x++) {
values.push({ index: x, value: "" });
}
}
//set the scope values to bind on our view to the new object.
$scope.values = values;
//set up listeners for the object to write back to our comma delimited property value
$scope.$watch('values', function (newValue, oldValue) {
var csv = [];
for (var v in newValue) {
csv.push(newValue[v].value);
}
//write the csv value back to the property
$scope.model.value = csv.join();
}, true);
};
angular.module("umbraco").controller('MyPackage.PropertyEditors.CsvEditorController', csvEditorController);
})();

12
src/Umbraco.Web.UI/App_Plugins/MyPackage/PropertyEditors/Js/PostcodeEditor.js
View File

@@ -1,12 +0,0 @@
'use strict';
(function() {
function postcodeEditor($scope, $http, $filter) {
//change the config json model into something usable
$scope.model.config = { country: $scope.model.config[0] };
};
angular.module("umbraco").controller('MyPackage.PropertyEditors.PostcodeEditor', postcodeEditor);
})();

11
src/Umbraco.Web.UI/App_Plugins/MyPackage/PropertyEditors/Js/RegexEditor.js
View File

@@ -1,11 +0,0 @@
'use strict';
(function() {
function regexEditor($scope, $http, $filter) {
var asdf = "";
};
angular.module("umbraco").controller('MyPackage.PropertyEditors.RegexEditor', regexEditor);
})();

31
src/Umbraco.Web.UI/App_Plugins/MyPackage/Trees/LegacyTestTree.cs
View File

@@ -10,35 +10,38 @@ using Constants = Umbraco.Core.Constants;
namespace Umbraco.Web.UI.App_Plugins.MyPackage.Trees
{
[Tree(Constants.Applications.Settings, "myTree", "My Tree")]
[Tree("settings", "myTree", "My Tree")]
[PluginController("MyPackage")]
public class MyCustomTreeController : TreeController
{
protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
{
//check if we're rendering the root node's children
if (id == Constants.System.Root.ToInvariantString())
{
var tree = new TreeNodeCollection
{
CreateTreeNode("1", queryStrings, "My Node 1"),
CreateTreeNode("2", queryStrings, "My Node 2"),
CreateTreeNode("3", queryStrings, "My Node 3")
};
{
CreateTreeNode("1", queryStrings, "My Node 1"),
CreateTreeNode("2", queryStrings, "My Node 2"),
CreateTreeNode("3", queryStrings, "My Node 3")
};
return tree;
}
//this tree doesn't suport rendering more than 1 level
throw new NotSupportedException();
}
protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
{
MenuItems.AddMenuItem(new MenuItem("create", "Create"));
return MenuItems;
{
var menu = new MenuItemCollection();
menu.Items.Add(new MenuItem("create", "Create"));
return menu;
}
}
public class LegacyTestTree : BaseTree
{
public LegacyTestTree(string application) : base(application)
public LegacyTestTree(string application)
: base(application)
{
}
@@ -50,10 +53,10 @@ namespace Umbraco.Web.UI.App_Plugins.MyPackage.Trees
public override int StartNodeID
{
get { return -1; }
}
}
public override void RenderJS(ref StringBuilder javascript)
{
{
}
public override void Render(ref XmlTree tree)
@@ -68,7 +71,7 @@ namespace Umbraco.Web.UI.App_Plugins.MyPackage.Trees
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
}
}
}

15
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -107,6 +107,14 @@
<Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
<Name>UmbracoExamine</Name>
</ProjectReference>
<Reference Include="AutoMapper, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll</HintPath>
</Reference>
<Reference Include="AutoMapper.Net4, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll</HintPath>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.7.0.4, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ClientDependency.1.7.0.4\lib\ClientDependency.Core.dll</HintPath>
@@ -586,11 +594,10 @@
<Compile Include="Umbraco\TreeInit.aspx.designer.cs">
<DependentUpon>treeInit.aspx</DependentUpon>
</Compile>
<Content Include="App_Plugins\MyPackage\PropertyEditors\Views\CustomJson.html" />
<Content Include="Umbraco\create.aspx" />
<Content Include="Umbraco_Client\IconPicker\iconpicker.js" />
<Content Include="App_Plugins\MyPackage\PropertyEditors\Js\CsvEditor.js" />
<Content Include="App_Plugins\MyPackage\PropertyEditors\Js\PostcodeEditor.js" />
<Content Include="App_Plugins\MyPackage\PropertyEditors\Js\RegexEditor.js" />
<Content Include="App_Plugins\MyPackage\PropertyEditors\Js\propertyeditors.controller.js" />
<Content Include="App_Plugins\MyPackage\PropertyEditors\Views\CsvEditor.html" />
<Content Include="App_Plugins\MyPackage\PropertyEditors\Views\PostcodeEditor.html" />
<Content Include="App_Plugins\MyPackage\PropertyEditors\Views\RegexEditor.html" />
@@ -2535,8 +2542,6 @@
<ItemGroup>
<Folder Include="App_Code\" />
<Folder Include="App_Data\" />
<Folder Include="App_Plugins\MyPackage\PropertyEditors\Css\" />
<Folder Include="App_Plugins\MyPackage\Views\" />
<Folder Include="Css\" />
<Folder Include="MasterPages\" />
<Folder Include="Media\" />

1
src/Umbraco.Web.UI/packages.config
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="3.0.0" targetFramework="net45" />
<package id="ClientDependency" version="1.7.0.4" targetFramework="net40" />
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net40" />
<package id="Examine" version="0.1.52.2941" targetFramework="net40" />

2
src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx
View File

@@ -6,7 +6,7 @@
<script type="text/javascript">
jQuery(document).ready(function () {
jQuery("#umbSearchField").UmbQuickSearch('<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco ) + "/Search/QuickSearchHandler.ashx" %>');
jQuery("#umbSearchField").UmbQuickSearch('<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco ) + "/Search/QuickSearchHandler.ashx" %>');
UmbClientMgr.historyManager().addEventHandler("navigating", function (e, app) {
jQuery("#umbSearchField").flushCache();

2
src/Umbraco.Web.UI/umbraco/controls/ProgressBar.ascx
View File

@@ -1,2 +1,2 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
<img src='<%#umbraco.IO.SystemDirectories.Umbraco_client%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
<img src='<%#Umbraco.Core.IO.SystemDirectories.UmbracoClient%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />

4
src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
View File

@@ -44,8 +44,8 @@ jQuery(document).ready(function() {
functionToCall : functionToCall,
nodeKey : nodeKey,
treeMode: "<%#Mode.ToString().ToLower()%>",
dataUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx",
serviceUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"});
dataUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx",
serviceUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"});
//add event handler for ajax errors, this will refresh the whole application
var mainTree = UmbClientMgr.mainTree();

2
src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
View File

@@ -45,7 +45,7 @@
: UmbEditor.GetCode();
}
UmbClientMgr.openModalWindow('<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
UmbClientMgr.openModalWindow('<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
}
</script>
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/jQuery/jquery-fieldselection.js"

2
src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
View File

@@ -6,7 +6,7 @@
<style type="text/css">
#propertyMapping thead tr th{border-bottom:1px solid #ccc; padding: 4px; padding-right: 25px;
background-image: url(<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco_client) %>/tableSorting/img/bg.gif);
background-image: url(<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.UmbracoClient) %>/tableSorting/img/bg.gif);
cursor: pointer;
font-weight: bold;
background-repeat: no-repeat;

2
src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
View File

@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Dashboard.ascx.cs" Inherits="Our.Umbraco.uGoLive.Web.Umbraco.Plugins.uGoLive.Dashboard" %>
<%@ Import Namespace="umbraco.IO" %>
<%@ Import Namespace="Our.Umbraco.uGoLive.Web" %>
<%@ Import Namespace="Umbraco.Core.IO" %>
<%@ Register Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" TagPrefix="cdf" %>
<cdf:CssInclude ID="CssInclude1" runat="server" FilePath="propertypane/style.css" PathNameAlias="UmbracoClient" />

4
src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
View File

@@ -63,10 +63,10 @@
var templateCode = UmbEditor.GetCode();
var selectedTemplate = templateDropDown.options[templateDropDown.selectedIndex].id;
var masterTemplate = "<%= umbraco.IO.SystemDirectories.Masterpages%>/" + selectedTemplate + ".master";
var masterTemplate = "<%= Umbraco.Core.IO.SystemDirectories.Masterpages%>/" + selectedTemplate + ".master";
if (selectedTemplate == "")
masterTemplate = "<%= umbraco.IO.SystemDirectories.Umbraco%>/masterpages/default.master";
masterTemplate = "<%= Umbraco.Core.IO.SystemDirectories.Umbraco%>/masterpages/default.master";
var regex = /MasterPageFile=[~a-z0-9/._"-]+/im;

2
src/Umbraco.Web.UI/web.Template.Debug.config
View File

@@ -31,6 +31,7 @@
<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
<section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false"/>
<section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false"/>
<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false"/>
</sectionGroup>
</configSections>
@@ -42,6 +43,7 @@
<settings configSource="config\umbracoSettings.config" />
<BaseRestExtensions configSource="config\BaseRestExtensions.config" />
<FileSystemProviders configSource="config\FileSystemProviders.config" />
<dashBoard configSource="config\Dashboard.config"/>
</umbracoConfiguration>
<appSettings>

2
src/Umbraco.Web.UI/web.Template.config
View File

@@ -11,6 +11,7 @@
<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
<section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" />
<section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false"/>
<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false"/>
</sectionGroup>
</configSections>
@@ -18,6 +19,7 @@
<settings configSource="config\umbracoSettings.config" />
<BaseRestExtensions configSource="config\BaseRestExtensions.config" />
<FileSystemProviders configSource="config\FileSystemProviders.config" />
<dashBoard configSource="config\Dashboard.config"/>
</umbracoConfiguration>
<urlrewritingnet configSource="config\UrlRewriting.config" />