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/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 { diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index 1f00797f1b..5139a42b73 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -677,7 +677,7 @@ input.search-query { display: inline-block; .ie7-inline-block(); margin-bottom: 0; - vertical-align: middle; + vertical-align: top; } // Re-hide hidden elements due to specifity .hide { 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; 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/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 @@