From a94c7307c4b861651927df7b1185aa2b81b23913 Mon Sep 17 00:00:00 2001 From: Thomas Schnaak <schnaak@uni-potsdam.de> Date: Wed, 4 Jul 2018 09:48:52 +0200 Subject: [PATCH] fix: visual improvements --- gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css | 2 +- gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js | 2 +- gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css b/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css index 6cc7da85..c987b53b 100644 --- a/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css +++ b/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css @@ -4,8 +4,8 @@ grid-template-columns: 2fr 1fr 15%; grid-template-areas: "title edit group" - "text text group" "text text links" + "text text ..." ; } diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js index a9b92bc7..1969dcd0 100644 --- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js +++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js @@ -7,7 +7,7 @@ $(document).ready(function() { $('.journal-description-title').append('<h2>' + data.name + '</h2>'); $('.journal-description-text').append(data.descriptionHTML); for(var link in data.links){ - $('.journal-description-links').append('<a href=' + data.links[link] + '>' + link + '</a> <button onclick=\'linkLoeschen("'+link+'")\'> <i class="fa fa-trash" aria-hidden="true" ></i></button><br/>'); + $('.journal-description-links').append('<button class="btn btn-default btn-xs" onclick=\'linkLoeschen("'+link+'")\'> <i class="fa fa-trash" aria-hidden="true" ></i></button><a href=\' + data.links[link] + \'>' + link + '</a> <br/>'); } $('.journal-description-links').append('<button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#addLinkModal"><i class="fa fa-plus" aria-hidden="true"></i></button>'); diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp index 8109e8b0..08e45212 100644 --- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp @@ -147,7 +147,7 @@ </div> <div class="modal-footer"> <div class="btn-group"> - <button type="button" class="btn btn-primary mr-auto">Ja</button> + <button type="button" class="btn btn-primary mr-auto" data-dismiss="modal">Ja</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Nein</button> </div> -- GitLab