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

ui regactoring

This commit is contained in:
Michele Artini 2020-10-15 12:43:40 +02:00
parent e46b860a43
commit 918f3d1f90
6 changed files with 10 additions and 8 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/duplicates.html
View File

@ -49,7 +49,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="text-muted" ng-if="currentDuplicates.length == 0">No duplicates</div> <div class="text-muted" ng-if="currentDuplicates.length == 0">No duplicates</div>
<org-details org="currentOrgDetails" org-title="Registered organization" show="default"></org-details> <org-details org="currentOrgDetails" org-title="Registered organization" show="default"></org-details>
<org-form-duplicates duplicates="currentDuplicates"></org-form-duplicates> <org-duplicates duplicates="currentDuplicates"></org-form-duplicates>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>

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

@ -4,5 +4,7 @@
<li class="nav-item"><a href="javascript:void(0)" class="nav-link active">Metadata</a></li> <li class="nav-item"><a href="javascript:void(0)" class="nav-link active">Metadata</a></li>
</ul> </ul>
</div> </div>
<org-form-metadata org="org" vocabularies="vocabularies" mode="insert"></org-form-metadata> <div class="card-body">
<org-form-metadata org="org" vocabularies="vocabularies" mode="insert"></org-form-metadata>
</div>
</div> </div>

4
apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html
View File

@ -30,11 +30,11 @@
<div class="card-body" ng-if="currentTab == 2 && (org.status == 'approved' || org.status == 'suggested')"> <div class="card-body" ng-if="currentTab == 2 && (org.status == 'approved' || org.status == 'suggested')">
<org-details org="org" org-title="Current organization" show="default"></org-details> <org-details org="org" org-title="Current organization" show="default"></org-details>
<org-form-duplicates duplicates="duplicates" save-function="saveDuplicates()" show-save-button="1"></org-form-duplicates> <org-duplicates duplicates="duplicates" save-function="saveDuplicates()" show-save-button="1"></org-form-duplicates>
</div> </div>
<div class="card-body" ng-if="currentTab == 3 && (org.status == 'approved' || org.status == 'suggested')"> <div class="card-body" ng-if="currentTab == 3 && (org.status == 'approved' || org.status == 'suggested')">
<org-form-conflicts org="org" conflicts="conflicts" save-function="saveConflicts()" show-save-button="1"></org-form-conflicts> <org-conflicts org="org" conflicts="conflicts" save-function="saveConflicts()" show-save-button="1"></org-form-conflicts>
</div> </div>
</div> </div>

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

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/html/forms/org_duplicates.html → apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_duplicates.html
View File

8
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js
View File

@ -204,7 +204,7 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route) {
} }
}); });
orgsModule.directive('orgFormDuplicates', function($http, $location, $route) { orgsModule.directive('orgDuplicates', function($http, $location, $route) {
return { return {
restrict: 'E', restrict: 'E',
scope: { scope: {
@ -212,12 +212,12 @@ orgsModule.directive('orgFormDuplicates', function($http, $location, $route) {
'showSaveButton' : '@', 'showSaveButton' : '@',
'saveFunction' : '&' 'saveFunction' : '&'
}, },
templateUrl: 'resources/html/forms/org_duplicates.html', templateUrl: 'resources/html/parts/org_duplicates.html',
link: function(scope, element, attrs, ctrl) {} link: function(scope, element, attrs, ctrl) {}
} }
}); });
orgsModule.directive('orgFormConflicts', function($http, $location, $route, $q) { orgsModule.directive('orgConflicts', function($http, $location, $route, $q) {
return { return {
restrict: 'E', restrict: 'E',
scope: { scope: {
@ -226,7 +226,7 @@ orgsModule.directive('orgFormConflicts', function($http, $location, $route, $q)
'showSaveButton' : '@', 'showSaveButton' : '@',
'saveFunction' : '&' 'saveFunction' : '&'
}, },
templateUrl: 'resources/html/forms/org_conflicts.html', templateUrl: 'resources/html/parts/org_conflicts.html',
link: function(scope, element, attrs, ctrl) { link: function(scope, element, attrs, ctrl) {
scope.candidateConflicts = []; scope.candidateConflicts = [];
scope.selectedConflicts = []; scope.selectedConflicts = [];