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

uis

This commit is contained in:
Michele Artini 2020-10-26 08:29:45 +01:00
parent 4c180e390c
commit bdae1ad93f
3 changed files with 7 additions and 15 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/edit/edit.html
View File

@ -39,7 +39,7 @@
</div> </div>
<div class="card-body" ng-if="adminMode && currentTab == 3 && (org.status == 'approved' || org.status == 'suggested')"> <div class="card-body" ng-if="adminMode && currentTab == 3 && (org.status == 'approved' || org.status == 'suggested')">
<org-conflicts org="org" conflicts="conflicts" save-function="saveConflicts()" show-save-button="1"></org-form-conflicts> <org-conflicts org="org" conflicts="conflicts" show-save-button="1"></org-form-conflicts>
</div> </div>
</div> </div>

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

@ -268,8 +268,7 @@ orgsModule.directive('orgConflicts', function($http, $location, $route, $q) {
scope: { scope: {
'org' : '=', 'org' : '=',
'conflicts' : '=', 'conflicts' : '=',
'showSaveButton' : '@', 'showSaveButton' : '@'
'saveFunction' : '&'
}, },
templateUrl: 'resources/html/parts/org_conflicts.html', templateUrl: 'resources/html/parts/org_conflicts.html',
link: function(scope, element, attrs, ctrl) { 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; }); vocabulariesService.getVocs(function(vocs) { $scope.vocabularies = vocs; });
$scope.getInfo(); $scope.getInfo();
$scope.gotoTab(1); $scope.gotoTab(1);

9
apps/dnet-orgs-database-application/src/main/resources/templates/home.html
View File

@ -45,6 +45,11 @@ fieldset > legend { font-size : 1.2rem !important; }
</head> </head>
<body ng-app="orgs" sec:authorize="isAuthenticated()"> <body ng-app="orgs" sec:authorize="isAuthenticated()">
<div id="spinnerdiv" class="overlaydiv">
<span class="grayRectangle"><!--The spinner is added on loading here--></span>
</div>
<nav class="navbar navbar-expand-lg navbar-dark bg-primary" ng-controller="menuCtrl"> <nav class="navbar navbar-expand-lg navbar-dark bg-primary" ng-controller="menuCtrl">
<a class="navbar-brand" href="#"> <img <a class="navbar-brand" href="#"> <img
src="resources/images/openaire_logo_small.png" width="30" height="30" alt="OpenOrgs Database"> src="resources/images/openaire_logo_small.png" width="30" height="30" alt="OpenOrgs Database">
@ -111,10 +116,6 @@ fieldset > legend { font-size : 1.2rem !important; }
<div class="container-fluid small mt-4" ng-view></div> <div class="container-fluid small mt-4" ng-view></div>
<div id="spinnerdiv" class="overlaydiv">
<span class="grayRectangle"><!--The spinner is added on loading here--></span>
</div>
<script sec:authorize="hasRole('ROLE_ADMIN')"> <script sec:authorize="hasRole('ROLE_ADMIN')">
function superAdminMode() { return true; } function superAdminMode() { return true; }
</script> </script>