Merge branch 'develop' into main

AaronSadlerUK · Nov 22, 2022 · 20fbc6d · 20fbc6d
2 parents cf5c1d9 + 6605d70
commit 20fbc6d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/UmbNav.Web/UmbNav.Web.csproj b/src/UmbNav.Web/UmbNav.Web.csproj
@@ -18,10 +18,10 @@
  <Copyright>2022 UmbHost Limited</Copyright>
  <PackageLicenseExpression>MIT</PackageLicenseExpression>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
- <AssemblyVersion>2.0.3</AssemblyVersion>
+ <AssemblyVersion>2.0.4</AssemblyVersion>
  <Version>$(AssemblyVersion)</Version>
  <PackageReadmeFile>README.md</PackageReadmeFile>
- <PackageReleaseNotes>Added umbraco-marketplace tag</PackageReleaseNotes>
+ <PackageReleaseNotes>Fixed backoffice UI</PackageReleaseNotes>
  </PropertyGroup>
 
 

diff --git a/src/UmbNav.Web/wwwroot/views/editor.html b/src/UmbNav.Web/wwwroot/views/editor.html
@@ -28,6 +28,12 @@
 
  </div>
 
+ <!--<ul id="items">
+ <li>item 1</li>
+ <li>item 2</li>
+ <li>item 3</li>
+ </ul>-->
+
  <!-- add nav items -->
  <a href="" class="umb-node-preview-add" data-nodrag ng-click="add()" prevent-default>
  <localize key="umbnav_addItem"></localize>
@@ -86,7 +92,11 @@
  <li ng-repeat="item in item.children" ui-tree-node data-collapsed="{{item.collapsed}}" data-expand-on-hover="{{vm.expandOnHover}}" ng-include="'nav_item_template.html'"></li>
 
  </ol>
-
  </script>
 
-</div>
+</div>
+
+<!--<script>
+ var el = document.getElementById('items');
+ var sortable = Sortable.create(el);
+</script>-->