D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

labels

This commit is contained in:
Michele Artini 2021-03-31 11:50:06 +02:00
parent fe88333c2a
commit 4b2b759857
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/conflicts.html
View File

@ -37,7 +37,7 @@
<div class="btn-group">
<button class="btn btn-sm btn-primary" ng-click="prepareConflictsModal(w)" data-toggle="modal" data-target="#resolveConflictsModal">resolve manually</button>
<button class="btn btn-sm btn-warning" ng-click="resolveConflictGroup(w, true)">merge all</button>
<button class="btn btn-sm btn-danger" ng-click="resolveConflictGroup(w, false)">all differents</button>
<button class="btn btn-sm btn-danger" ng-click="resolveConflictGroup(w, false)">all different</button>
</div>
</div>
</div>

2
apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_conflicts.html
View File

@ -25,7 +25,7 @@
<div class="btn-group" ng-if="showButtons && conflicts.length > 0">
<button class="btn btn-sm btn-primary" ng-click="prepareConflictsModal()" data-toggle="modal" data-target="#resolveConflictsModal">resolve conflicts</button>
<button class="btn btn-sm btn-warning" ng-click="resolveConflicts(true)">merge all</button>
<button class="btn btn-sm btn-danger" ng-click="resolveConflicts(false)">all differents</button>
<button class="btn btn-sm btn-danger" ng-click="resolveConflicts(false)">all different</button>
</div>
</div>
</div>

2
apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/resolve_conflicts.modal.html
View File

@ -38,7 +38,7 @@
<div class="card-footer" ng-show="selectedOrgs.length > 0">
<button type="button" class="btn btn-sm btn-secondary" ng-click="reset()" ng-show="selectedOrgs.length > 0">reset</button>
<div class="btn-group float-right" ng-show="selectedOrgs.length > 1">
<button type="button" class="btn btn-sm btn-danger" ng-click="invalidateGroup()" ng-show="selectedOrgs.length == orgs.length">all differents</button>
<button type="button" class="btn btn-sm btn-danger" ng-click="invalidateGroup()" ng-show="selectedOrgs.length == orgs.length">all different</button>
<button type="button" class="btn btn-sm btn-primary" ng-click="mergeGroup()">merge</button>
</div>
</div>