From 0d4f1d084dfeb2c4e466055e54cace6017f05059 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Mon, 26 Oct 2020 08:29:45 +0100 Subject: [PATCH] uis --- .../static/resources/html/pages/edit/edit.html | 2 +- .../resources/static/resources/js/organizations.js | 11 +---------- .../src/main/resources/templates/home.html | 9 +++++---- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html index 2687390f..5a6239ca 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/edit/edit.html @@ -39,7 +39,7 @@
- +
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js index 40bee6f7..90003079 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js @@ -268,8 +268,7 @@ orgsModule.directive('orgConflicts', function($http, $location, $route, $q) { scope: { 'org' : '=', 'conflicts' : '=', - 'showSaveButton' : '@', - 'saveFunction' : '&' + 'showSaveButton' : '@' }, templateUrl: 'resources/html/parts/org_conflicts.html', link: function(scope, element, attrs, ctrl) { @@ -485,14 +484,6 @@ orgsModule.controller('showEditCtrl', function ($scope, $http, $routeParams, $ro }); } - $scope.saveConflicts = function() { - alert('todo'); - } - - - - - vocabulariesService.getVocs(function(vocs) { $scope.vocabularies = vocs; }); $scope.getInfo(); $scope.gotoTab(1); diff --git a/apps/dnet-orgs-database-application/src/main/resources/templates/home.html b/apps/dnet-orgs-database-application/src/main/resources/templates/home.html index 7d20e4fa..af174a31 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/templates/home.html +++ b/apps/dnet-orgs-database-application/src/main/resources/templates/home.html @@ -45,6 +45,11 @@ fieldset > legend { font-size : 1.2rem !important; } + +
+ +
+