diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js index b6b59991b5..0b91cff44e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbsections.directive.js @@ -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){ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js index 9bfe943287..876b972ad1 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js @@ -36,7 +36,7 @@ angular.module("umbraco.directives") '' + '' + '' + - '{{node.name}}' + + '' + '' + '
' + '' + diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html index a4f6c32c13..c4cc44fc0e 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html @@ -11,15 +11,14 @@
- +
- + Your email will be used as your login
@@ -34,7 +33,7 @@ autocorrect="off" autocapitalize="off" required - ng-model="installer.current.model.password" /> + ng-model="installer.current.model.password" id="password" /> At least {{installer.current.model.minCharLength}} characters long @@ -47,7 +46,7 @@
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less index e843499d2e..9376f54e8a 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tree.less +++ b/src/Umbraco.Web.UI.Client/src/less/tree.less @@ -48,6 +48,9 @@ padding-left: 20px; } +.umb-tree li .file-ext { + color: @grayLight; +} .umb-tree li.root > div h5 { margin-top: 10px; diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html index 0aa58c8fae..faeb90033f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-contextmenu.html @@ -1,6 +1,6 @@
-

{{menuDialogTitle}}

+

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index fc0959bb75..9d7fa1f4aa 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -686,8 +686,8 @@ To manage your website, simply open the umbraco back office and start adding con %0% has been published %0% and subpages have been published Publish %0% and all its subpages - ok to publish %0% and thereby making it's content publicly available.

- You can publish this page and all it's sub-pages by checking publish all children below. + ok to publish %0% and thereby making its content publicly available.

+ You can publish this page and all its sub-pages by checking publish all children below. ]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index bd5c31da06..72991852eb 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -697,8 +697,8 @@ To manage your website, simply open the umbraco back office and start adding con %0% has been published %0% and subpages have been published Publish %0% and all its subpages - ok to publish %0% and thereby making it's content publicly available.

- You can publish this page and all it's sub-pages by checking publish all children below. + ok to publish %0% and thereby making its content publicly available.

+ You can publish this page and all its sub-pages by checking publish all children below. ]]> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs index 2349d8943f..db81d1b68e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs @@ -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 diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs index c7d6106404..91f5d57caa 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs @@ -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(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"; + } } - + } - + }