Umbraco 7.15.3

WebCms/Umbraco/Views/common/dialogs/linkpicker.html

@@ -21,13 +21,13 @@
 		<datalist id="anchors">
 					<option value="{{a}}" ng-repeat="a in anchorValues"></option>
 				</datalist>
-	</umb-control-group>			
+	</umb-control-group>
 
 			<umb-control-group label="@defaultdialogs_nodeNameLinkPicker">
 				<input type="text"
-					localize="placeholder" 
-					placeholder="@placeholders_entername" 
-					class="umb-editor umb-textstring" 
+					localize="placeholder"
+					placeholder="@placeholders_entername"
+					class="umb-editor umb-textstring"
 					ng-model="target.name" />
 			</umb-control-group>
 
@@ -43,17 +43,18 @@
                              search-callback="onSearchResults"
                              search-from-id="{{searchInfo.searchFromId}}"
                              search-from-name="{{searchInfo.searchFromName}}"
+                             datatype-id="{{searchInfo.dataTypeId}}"
                              show-search="{{searchInfo.showSearch}}"
                              section="{{section}}">
         </umb-tree-search-box>
-        
+
         <br/>
 
         <umb-tree-search-results ng-if="searchInfo.showSearch"
                                  results="searchInfo.results"
                                  select-result-callback="selectResult">
         </umb-tree-search-results>
-        
+
 	    <div ng-hide="searchInfo.showSearch">
             <umb-tree section="content"
                       hideheader="true"
@@ -61,9 +62,9 @@
                       eventhandler="dialogTreeEventHandler"
                       isdialog="true"
                       enablecheckboxes="true">
-            </umb-tree>    
+            </umb-tree>
 	    </div>
-        
+
 	</div>
 
 	<div class="umb-panel-footer">

WebCms/Umbraco/Views/common/dialogs/login.html

@@ -88,21 +88,23 @@
                 <div class="flex justify-center items-center">
                     <umb-button type="button"
                                 button-style="success"
-                                label="Get started"
-                                action="getStarted()">
-                    </umb-button>
-                    <umb-button ng-if="!avatarFile.uploaded"
-                                type="button"
-                                button-style="link"
-                                label="Skip"
+                                label="Done"
                                 action="getStarted()">
                     </umb-button>
                 </div>
             </div>
-
+           
         </div>
+        <div ng-show="invitedUser == null && inviteStep === 3" ng-if="inviteStep === 3" class="umb-login-container">
+            <div class="form">
+                <h1 style="margin-bottom: 10px; text-align: left;">Hi there</h1>
+                <p style="line-height: 1.6; margin-bottom: 25px;">
+                    <localize key="user_userinviteExpiredMessage">Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.</localize>
+                </p>
 
-        <div ng-show="invitedUser == null" class="umb-login-container">
+            </div>
+        </div>
+        <div ng-show="invitedUser == null && !inviteStep" class="umb-login-container">
 
             <div class="form">
                 <h1>{{greeting}}</h1>

WebCms/Umbraco/Views/common/dialogs/macropicker.html

@@ -2,7 +2,7 @@
 	
 	<div class="umb-panel-body no-header with-footer umb-scrollable" ng-switch on="dialogMode">
 		<div class="umb-control-group">
-			<div ng-switch-when="list" ng-swicth-default class="tab-content form-horizontal umb-el-wrap">
+			<div ng-switch-when="list" ng-switch-default class="tab-content form-horizontal umb-el-wrap">
 					<ul class="nav nav-tabs nav-stacked">	
 						<li ng-repeat="macro in macros">
 							<a href="#" ng-click="configureMacro(macro)" prevent-default>
@@ -35,4 +35,4 @@
 	        </div>
 		</div>
 	</div>
-</div>
+</div>