From 51c459d6546ef753a7a9d7bb5aef2b08267e7374 Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 5 Nov 2013 12:38:01 +0100 Subject: [PATCH 1/5] Fixes placeholder label overriding name label --- .../src/common/mocks/services/localization.mocks.js | 2 +- src/Umbraco.Web.UI.Client/src/views/content/edit.html | 2 +- src/Umbraco.Web.UI.Client/src/views/media/edit.html | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js index 261cb01fd9..286622e05e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js @@ -211,7 +211,7 @@ angular.module('umbraco.mocks'). "dictionaryItem_displayName": "Culture Name", "placeholders_username": "Enter your username", "placeholders_password": "Enter your password", - "placeholders_name": "Enter a name...", + "placeholders_entername": "Enter a name...", "placeholders_search": "Type to search...", "placeholders_filter": "Type to filter...", "editcontenttype_allowedchildnodetypes": "Allowed child nodetypes", diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html index 0d37f5a20c..68c7626ae1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html @@ -8,7 +8,7 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html index 81cf09dcd1..c9841b9e3c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html @@ -8,7 +8,7 @@
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index e4c29db6aa..19b1af5933 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -242,7 +242,7 @@ Enter your username Enter your password - Enter a name... + Enter a name... Type to search... Type to filter... From ef16e6c72f2fa78f17741f98b95ae130a322abaa Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 5 Nov 2013 12:38:20 +0100 Subject: [PATCH 2/5] history service skip dublicate entries --- .../src/common/services/history.service.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/history.service.js b/src/Umbraco.Web.UI.Client/src/common/services/history.service.js index c526933d79..21764c59bf 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/history.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/history.service.js @@ -33,8 +33,13 @@ angular.module('umbraco.services') var nArray = []; function add(item) { - nArray.splice(0,0,item); - return nArray[0]; + + var any = _.where(nArray, {link: item.link}); + + if(any.length === 0){ + nArray.splice(0,0,item); + return nArray[0]; + } } return { From f30416d20f329412b28f650fbac218eb6ac5f2e0 Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 5 Nov 2013 12:38:32 +0100 Subject: [PATCH 3/5] add border to bottom buttons --- src/Umbraco.Web.UI.Client/src/less/panel.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index 630e3b67a4..72e8b97d42 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -156,6 +156,8 @@ h1.headline{ -moz-box-shadow: 0px -18px 20px rgba(255, 255, 255, 1); box-shadow: 0px -18px 20px rgba(255, 255, 255, 1); + border-top: 1px solid @grayLighter; + padding: 10px 0 10px 0; position: fixed; From d2ae358a3d5722ca54e0795e463378c36157bae6 Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 5 Nov 2013 12:38:45 +0100 Subject: [PATCH 4/5] hide search list on selection --- .../src/views/common/navigation.controller.js | 6 ++++++ .../src/views/directives/umb-navigation.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js index a8fc1e892a..8541291eda 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/navigation.controller.js @@ -65,6 +65,12 @@ function NavigationController($scope,$rootScope, $location, $log, $routeParams, navigationService.showMenu(ev, args); }; + //todo, migrate to nav service + $scope.searchHide = function () { + navigationService.hideSearch(); + }; + + /** Opens a dialog but passes in this scope instance to be used for the dialog */ $scope.openDialog = function (currentNode, action, currentSection) { navigationService.showDialog({ diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html index 8cd86190bc..0884150934 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html @@ -40,7 +40,7 @@