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

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",

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 {

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 {

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;

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({

src/Umbraco.Web.UI.Client/src/views/content/edit.html

@@ -8,7 +8,7 @@
 
             <div class="span4">
                 <umb-content-name 
-                    placeholder="@placeholders_name" 
+                    placeholder="@placeholders_entername" 
                     ng-model="content.name"></umb-content-name>
             </div>
 

src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html

@@ -40,7 +40,7 @@
                             <ul class="umb-search-group" ng-repeat="resultGroup in searchResults">
                                 <li ng-repeat="result in resultGroup.results">
                                     <div>
-                                        <a ng-class="{'first':$first}" ng-href="#/{{result.editorPath}}">
+                                        <a ng-class="{'first':$first}" ng-click="searchHide()" ng-href="#/{{result.editorPath}}">
 
                                             <i class="icon umb-tree-icon sprTree {{result.icon}}"></i>
                                             {{result.name}}

src/Umbraco.Web.UI.Client/src/views/media/edit.html

@@ -8,7 +8,7 @@
             
             <div class="span4">
                 <umb-content-name
-                    placeholder="@placeholders_name" 
+                    placeholder="@placeholders_entername" 
                     ng-model="content.name"></umb-content-name>
             </div>
 

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -242,7 +242,7 @@
     <key alias="username">Enter your username</key>
     <key alias="password">Enter your password</key>
 
-    <key alias="name">Enter a name...</key>
+    <key alias="entername">Enter a name...</key>
     <key alias="search">Type to search...</key>
     <key alias="filter">Type to filter...</key>
   </area>