diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java index 48dc7b8f07f9158666be2dc328c7052b0f0c3f62..baa33e556fef588b3b97879ca89af6ff0af199b7 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java @@ -65,14 +65,25 @@ public class ProjectDescriptionView { //add Link @POST - @Consumes(MediaType.APPLICATION_JSON) - @Path("/addLink/{link}/{name}") - public Response saveProjectLinks(@PathParam("link")String link, @PathParam("name")String name){ - log.debug(">>> saveLinks: " + name + ":" + link); + @Consumes(MediaType.APPLICATION_FORM_URLENCODED) + @Path("/addLink") + public Response addLink(@FormParam("link") String link, @FormParam("name") String name){ + log.debug(">>> addLink: " + name + ":" + link); descriptionService.addLink(link, name ); - log.debug(">>> saveLinks"); + + try { + URI location = new URI("../pages/eportfolio.jsp?token=test"); + log.debug("<<< addLink: redirect to " +location.toString()); + return Response.temporaryRedirect(location).build(); + + } catch (URISyntaxException e) { + e.printStackTrace(); + log.debug("addLink: redirect failed" ); + } + + log.debug(">>> addLink"); return Response.ok().build(); } diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js index 6563135453e0267141509a6c35a32195acdbc3ee..dc0319608d686f2ecc4fff9a60999390c6e5d0bd 100644 --- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js +++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js @@ -9,7 +9,7 @@ $(document).ready(function() { for(var link in data.links){ $('.journal-description-links').append('<a href=' + data.links[link] + '>' + link + '</a> <i class="fa fa-trash" aria-hidden="true" ></i><br/>'); } - $('.journal-description-links').append('<i class="fa fa-plus" aria-hidden="true"></i>'); + $('.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>'); for(var g in data.group){ $('.journal-description-group').append(data.group[g]+ '<br/>'); diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp index 3b2afa424dd01d72745c7b9c6d20b3cc44115a87..ca04a2c7b44c7bae3a5d488bc9a464b4f5f4f9dc 100644 --- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp @@ -77,6 +77,30 @@ </div> </div> +<div class="modal fade" id="addLinkModal" role="dialog"> + <div class="modal-dialog modal-sm"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Link hinzufügen</h4> + </div> + <div class="modal-body"> + <form id="linkform" method="POST" action="../rest/projectdescription/addLink" > + Name:<br> + <input type="text" name="name" form="linkform"> + <br> + URL:<br> + <input type="text" name="link" form="linkform"> + <br><br> + <input class="btn btn-default" type="submit" > + <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button> + </form> + </div> + </div> + </div> +</div> + + <script src="../assets/js/jquery.min.js"></script> <script src="../assets/bootstrap/js/bootstrap.min.js"></script> <script src="../assets/js/Sidebar-Menu.js"></script>