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

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

Browse Source
This commit is contained in:
Shannon
2014-06-08 19:05:54 +02:00
parent 34dcde645c 4dd3f2f8ac
commit d8e35ffc08
9 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js
View File

@@ -3,7 +3,7 @@
* @name umbraco.directives.directive:umbSections
* @restrict E
**/
function sectionsDirective($timeout, $window, navigationService, treeService, sectionResource, appState, eventsService) {
function sectionsDirective($timeout, $window, navigationService, treeService, sectionResource, appState, eventsService, $location) {
return {
restrict: "E", // restrict to an element
replace: true, // replace the html element with the template
@@ -84,7 +84,8 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
scope.sectionClick = function (section) {
navigationService.hideSearch();
navigationService.showTree(section.alias);
navigationService.showTree(section.alias);
$location.path("/" + section.alias);
};
scope.sectionDblClick = function(section){

2
src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
View File

@@ -36,7 +36,7 @@ angular.module("umbraco.directives")
'<ins ng-hide="node.hasChildren" style="width:18px;"></ins>' +
'<ins ng-show="node.hasChildren" ng-class="{\'icon-navigation-right\': !node.expanded, \'icon-navigation-down\': node.expanded}" ng-click="load(node)"></ins>' +
'<i title="#{{node.routePath}}" class="{{node.cssClass}}"></i>' +
'<a href ng-click="select(this, node, $event)" on-right-click="altSelect(this, node, $event)">{{node.name}}</a>' +
'<a href ng-click="select(this, node, $event)" on-right-click="altSelect(this, node, $event)" ng-bind-html="node.name"></a>' +
'<a href class="umb-options" ng-hide="!node.menuUrl" ng-click="options(this, node, $event)"><i></i><i></i><i></i></a>' +
'<div ng-show="node.loading" class="l"><div></div></div>' +
'</div>' +

9
src/Umbraco.Web.UI.Client/src/installer/steps/user.html
View File

@@ -11,15 +11,14 @@
<div class="control-group">
<label class="control-label" for="name">Name</label>
<div class="controls">
<input type="text" name="name" placeholder="Full name" required
ng-model="installer.current.model.name" />
<input type="text" id="name" name="name" placeholder="Full name" required ng-model="installer.current.model.name" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" />
<input type="email" id="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" />
<small class="inline-help">Your email will be used as your login</small>
</div>
</div>
@@ -34,7 +33,7 @@
autocorrect="off"
autocapitalize="off"
required
ng-model="installer.current.model.password" />
ng-model="installer.current.model.password" id="password" />
<small class="inline-help">At least {{installer.current.model.minCharLength}} characters long</small>
<small ng-if="installer.current.model.minNonAlphaNumericLength > 0" class="inline-help">
@@ -47,7 +46,7 @@
<div class="control-group">
<div class="controls">
<label class="checkbox" for="subscribeToNewsLetter">
<input type="checkbox" name="subscribeToNewsLetter"
<input type="checkbox" id="subscribeToNewsLetter" name="subscribeToNewsLetter"
ng-model="installer.current.model.subscribeToNewsLetter" /> Keep me updated on Umbraco Versions, Security Bulletins and Community News</label>
</div>
</div>

3
src/Umbraco.Web.UI.Client/src/less/tree.less
View File

@@ -48,6 +48,9 @@
padding-left: 20px;
}
.umb-tree li .file-ext {
color: @grayLight;
}
.umb-tree li.root > div h5 {
margin-top: 10px;

2
src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html
View File

@@ -1,6 +1,6 @@
<div>
<div class='umb-modalcolumn-header'>
<h1>{{menuDialogTitle}}</h1>
<h1 ng-bind-html="menuDialogTitle"></h1>
</div>
<div class='umb-modalcolumn-body'>

4
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -686,8 +686,8 @@ To manage your website, simply open the umbraco back office and start adding con
<key alias="nodePublish">%0% has been published</key>
<key alias="nodePublishAll">%0% and subpages have been published</key>
<key alias="publishAll">Publish %0% and all its subpages</key>
<key alias="publishHelp"><![CDATA[Click <em>ok</em> to publish <strong>%0%</strong> and thereby making it's content publicly available.<br/><br />
You can publish this page and all it's sub-pages by checking <em>publish all children</em> below.
<key alias="publishHelp"><![CDATA[Click <em>ok</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
You can publish this page and all its sub-pages by checking <em>publish all children</em> below.
]]></key>
</area>
<area alias="colorpicker">

4
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -697,8 +697,8 @@ To manage your website, simply open the umbraco back office and start adding con
<key alias="nodePublish">%0% has been published</key>
<key alias="nodePublishAll">%0% and subpages have been published</key>
<key alias="publishAll">Publish %0% and all its subpages</key>
<key alias="publishHelp"><![CDATA[Click <em>ok</em> to publish <strong>%0%</strong> and thereby making it's content publicly available.<br/><br />
You can publish this page and all it's sub-pages by checking <em>publish all children</em> below.
<key alias="publishHelp"><![CDATA[Click <em>ok</em> to publish <strong>%0%</strong> and thereby making its content publicly available.<br/><br />
You can publish this page and all its sub-pages by checking <em>publish all children</em> below.
]]></key>
</area>
<area alias="colorpicker">

3
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
View File

@@ -103,7 +103,8 @@ namespace umbraco.cms.presentation.Trees
XmlTreeNode xFileNode = XmlTreeNode.Create(this);
xFileNode.NodeID = orgPath + file.Name;
xFileNode.Text = file.Name;
xFileNode.Text =
string.Format("{0}", file.Name.Substring(0, file.Name.IndexOf(file.Extension, StringComparison.Ordinal)));
if (!((orgPath == "")))
xFileNode.Action = "javascript:openFile('" + orgPath + file.Name + "');";
else

32
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
View File

@@ -34,16 +34,16 @@ namespace umbraco
{
[Tree(Constants.Applications.Settings, "scripts", "Scripts", "icon-folder", "icon-folder", sortOrder: 2)]
public class loadScripts : FileSystemTree
{
{
public loadScripts(string application) : base(application) { }
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
rootNode.NodeType = "init" + TreeAlias;
rootNode.NodeID = "init";
{
rootNode.NodeType = "init" + TreeAlias;
rootNode.NodeID = "init";
rootNode.Text = ui.Text("treeHeaders", "scripts");
}
public override void RenderJS(ref StringBuilder Javascript)
public override void RenderJS(ref StringBuilder Javascript)
{
Javascript.Append(
@"
@@ -63,13 +63,13 @@ namespace umbraco
protected override string FileSearchPattern
{
get { return UmbracoSettings.ScriptFileTypes; }
}
protected override void OnRenderFolderNode(ref XmlTreeNode xNode)
{
xNode.Menu = new List<IAction>(new IAction[] { ActionDelete.Instance, ContextMenuSeperator.Instance, ActionNew.Instance, ContextMenuSeperator.Instance, ActionRefresh.Instance });
xNode.NodeType = "scriptsFolder";
}
@@ -77,11 +77,21 @@ namespace umbraco
protected override void OnRenderFileNode(ref XmlTreeNode xNode)
{
xNode.Action = xNode.Action.Replace("openFile", "openScriptEditor");
xNode.Icon = "icon-code";
xNode.OpenIcon = "icon-code";
// add special icons for javascript files
if (xNode.Action.Contains(".js"))
{
xNode.Icon = "icon-script";
xNode.OpenIcon = "icon-script";
}
else
{
xNode.Icon = "icon-code";
xNode.OpenIcon = "icon-code";
}
}
}
}