Merge branch 'release/1.7.3'

# Conflicts: # Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs # Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs # Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs # Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs # appveyor.yml
dawoe · Sep 19, 2019 · 84a9df5 · 84a9df5
2 parents 19aa03a + e9b8a35
commit 84a9df5
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 38 deletions.
diff --git a/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.3.0")]
+[assembly: AssemblyFileVersion("1.7.3.0")]
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/views/content-delete.html b/Source/Our.Umbraco.Nexu.Core/Client/views/content-delete.html
@@ -2,29 +2,37 @@
     <umb-load-indicator ng-if="isLoading">
     </umb-load-indicator>
 
-    <div class="umb-dialog-body" auto-scale="90" ng-hide="isLoading">
-
-        <nexu-links links="links" link-clicked="cancel" title="nexu_linksTitleContent"></nexu-links>
-
-        <nexu-descendants-warning ng-if="descendantsHaveLinks"></nexu-descendants-warning>
-
-        <p class="umb-abstract" ng-if="allowDelete">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
-
-        <div ng-if="allowDelete">
-            <umb-confirm on-confirm="performDelete" on-cancel="cancel">
-            </umb-confirm>
-        </div>
-
-        <div ng-if="allowDelete === false">                
+        <div class="umb-dialog-body" auto-scale="90" ng-hide="isLoading">
 
-            <div class="umb-pane btn-toolbar umb-btn-toolbar">
-                <div class="control-group umb-control-group">	
-                    <a href class="btn btn-link" ng-click="cancel()"><localize key="general_cancel">Cancel</localize></a>                        
-                </div>	
+            <nexu-links links="links" link-clicked="cancel" title="nexu_linksTitleContent"></nexu-links>
+
+            <nexu-descendants-warning ng-if="descendantsHaveLinks"></nexu-descendants-warning>
+
+            <p class="umb-abstract" ng-if="allowDelete" ng-hide="success">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <div ng-show="success">
+                <div class="alert alert-success">
+                    <strong>{{ currentNode.name }}</strong>
+                    <localize key="actions_wasDeleted">was deleted</localize>
+                </div>
+                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
-        </div>
 
-    </div>
+            <div ng-if="allowDelete" ng-hide="success">
+                <umb-confirm on-confirm="performDelete" on-cancel="cancel">
+                </umb-confirm>
+            </div>
+
+            <div ng-if="allowDelete === false">
+
+                <div class="umb-pane btn-toolbar umb-btn-toolbar">
+                    <div class="control-group umb-control-group">
+                        <a href class="btn btn-link" ng-click="cancel()"><localize key="general_cancel">Cancel</localize></a>
+                    </div>
+                </div>
+            </div>
+
+        </div>
 </div>
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/views/media-delete.html b/Source/Our.Umbraco.Nexu.Core/Client/views/media-delete.html
@@ -8,21 +8,29 @@
 
             <nexu-descendants-warning ng-if="descendantsHaveLinks"></nexu-descendants-warning>
 
-            <p class="umb-abstract" ng-if="allowDelete">
+            <p class="umb-abstract" ng-if="allowDelete" ng-hide="success">
                 <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
             </p>
 
-            <div ng-if="allowDelete">
+            <div ng-show="success">
+                <div class="alert alert-success">
+                    <strong>{{ currentNode.name }}</strong>
+                    <localize key="actions_wasDeleted">was deleted</localize>
+                </div>
+                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+            </div>
+
+            <div ng-if="allowDelete" ng-hide="success">
                 <umb-confirm on-confirm="performDelete" on-cancel="cancel">
                 </umb-confirm>
             </div>
 
-            <div ng-if="allowDelete === false">                
-    
+            <div ng-if="allowDelete === false">
+
                 <div class="umb-pane btn-toolbar umb-btn-toolbar">
-                    <div class="control-group umb-control-group">	
-                        <a href class="btn btn-link" ng-click="cancel()"><localize key="general_cancel">Cancel</localize></a>                        
-                    </div>	
+                    <div class="control-group umb-control-group">
+                        <a href class="btn btn-link" ng-click="cancel()"><localize key="general_cancel">Cancel</localize></a>
+                    </div>
                 </div>
             </div>
 

diff --git a/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs
@@ -34,7 +34,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.3.0")]
+[assembly: AssemblyFileVersion("1.7.3.0")]
 
 
diff --git a/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.3.0")]
+[assembly: AssemblyFileVersion("1.7.3.0")]
diff --git a/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.0")]
-[assembly: AssemblyFileVersion("1.7.1.0")]
+[assembly: AssemblyVersion("1.7.3.0")]
+[assembly: AssemblyFileVersion("1.7.3.0")]
diff --git a/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@ environment:
 os: Visual Studio 2015
 
 # Version format
-version: 1.7.2.{build}
+version: 1.7.3.{build}
 
 cache:
   - Source\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified