-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
V8: Add "Move" option for deleted items in the content tree (#3931)
- Loading branch information
1 parent
9968cd2
commit 74986d2
Showing
4 changed files
with
185 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 89 additions & 30 deletions
119
src/Umbraco.Web.UI.Client/src/views/content/restore.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,93 @@ | ||
<div ng-controller="Umbraco.Editors.Content.RestoreController"> | ||
<div class="umb-dialog-body"> | ||
<umb-pane> | ||
|
||
<umb-load-indicator | ||
ng-show="loading"> | ||
</umb-load-indicator> | ||
|
||
<p class="abstract" ng-hide="loading || error != null || success"> | ||
<localize key="actions_restore">Restore</localize> <strong>{{source.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>? | ||
</p> | ||
|
||
<div ng-show="error"> | ||
<div class="alert alert-error"> | ||
<div><strong>{{error.errorMsg}}</strong></div> | ||
<div>{{error.data.Message}}</div> | ||
</div> | ||
</div> | ||
|
||
<div ng-show="success"> | ||
<div class="alert alert-success"> | ||
<strong>{{source.name}}</strong> <localize key="editdatatype_wasMoved">was moved underneath</localize> <strong>{{target.name}}</strong> | ||
</div> | ||
<button class="btn btn-primary" ng-click="close()"><localize key="general_ok">Ok</localize></button> | ||
</div> | ||
|
||
</umb-pane> | ||
</div> | ||
<div class="umb-dialog-body" ng-cloak> | ||
<umb-pane> | ||
<umb-load-indicator | ||
ng-show="loading"> | ||
</umb-load-indicator> | ||
|
||
<div ng-show="error"> | ||
<div class="alert alert-error"> | ||
<div><strong>{{error.errorMsg}}</strong></div> | ||
<div>{{error.data.Message}}</div> | ||
</div> | ||
</div> | ||
|
||
<div ng-show="success"> | ||
<div class="alert alert-success"> | ||
<strong>{{source.name}}</strong> | ||
<span ng-hide="moving"><localize key="recycleBin_wasRestored">was restored under</localize></span> | ||
<span ng-show="moving"><localize key="editdatatype_wasMoved">was moved underneath</localize></span> | ||
<strong>{{target.name}}</strong> | ||
</div> | ||
<button class="btn btn-primary" ng-click="close()">Ok</button> | ||
</div> | ||
|
||
<div ng-hide="moving || loading || success"> | ||
|
||
<p class="abstract" ng-hide="error || success"> | ||
<localize key="actions_restore">Restore</localize> <strong>{{source.name}}</strong> <localize key="general_under">under</localize> <strong>{{target.name}}</strong>? | ||
</p> | ||
|
||
</div> | ||
|
||
<div ng-hide="!moving || loading || success"> | ||
<div> | ||
<div class="alert alert-info"> | ||
<div><strong><localize key="recycleBin_itemCannotBeRestored">Cannot automatically restore this item</localize></strong></div> | ||
<div><localize key="recycleBin_itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</localize></div> | ||
</div> | ||
</div> | ||
|
||
<div ng-hide="miniListView"> | ||
<umb-tree-search-box | ||
hide-search-callback="hideSearch" | ||
search-callback="onSearchResults" | ||
show-search="{{searchInfo.showSearch}}" | ||
section="content"> | ||
</umb-tree-search-box> | ||
|
||
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || success"> | ||
<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a> | ||
<button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button> | ||
<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="{{treeModel.hideHeader}}" | ||
hideoptions="true" | ||
isdialog="true" | ||
api="dialogTreeApi" | ||
on-init="onTreeInit()" | ||
enablelistviewexpand="true" | ||
enablecheckboxes="true"> | ||
</umb-tree> | ||
</div> | ||
</div> | ||
|
||
<umb-mini-list-view | ||
ng-if="miniListView" | ||
node="miniListView" | ||
entity-type="Document" | ||
on-select="selectListViewNode(node)" | ||
on-close="closeMiniListView()"> | ||
</umb-mini-list-view> | ||
|
||
</div> | ||
|
||
</umb-pane> | ||
</div> | ||
|
||
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || moving || success"> | ||
<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a> | ||
<button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button> | ||
</div> | ||
|
||
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="loading || !moving || success"> | ||
<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a> | ||
<button class="btn btn-primary" ng-click="restore()" ng-show="error == null" ng-disabled="!target"><localize key="actions_move">Move</localize></button> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters