Commit 3ae30c9f authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '92-83-87-89-fixes' into 'master'

UI updates

Closes #92, #83, #87, and #89

See merge request !33
parents dfcfab7d b3e81d55
......@@ -623,7 +623,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.0</version>
<version>1.4</version>
<executions>
<execution>
<id>install node and npm</id>
......
......@@ -224,7 +224,7 @@ public class UserProfileController extends BaseController {
@RequestMapping(value = "/{uuid:.+}/update", method = { RequestMethod.POST })
@PreAuthorize("hasRole('ADMINISTRATOR') || principal.uuid == #uuid")
public String update(ModelMap model, @PathVariable("uuid") String uuid, @RequestParam("name") String name,
public String update(ModelMap model, @PathVariable("uuid") String uuid, @RequestParam("fullName") String fullName,
@RequestParam("email") String email, @RequestParam(value = "currentPwd", required = false) String currentPwd,
@RequestParam(value = "pwd1", required = false) String pwd1, @RequestParam(value = "pwd2", required = false) String pwd2,
RedirectAttributes redirectAttributes) {
......@@ -234,7 +234,7 @@ public class UserProfileController extends BaseController {
}
try {
userService.updateUser(user, email, name);
userService.updateUser(user, email, fullName);
} catch (NotUniqueUserException e) {
redirectAttributes.addFlashAttribute("emailError", "User with e-mail address " + e.getEmail() + " already exists");
return "redirect:/profile/" + user.getUuid() + "/edit";
......
......@@ -187,7 +187,7 @@ $light-font-family: 'Roboto-Light';
&.nav-menu, &.nav-menu-admin {
> li {
> a {
padding: 32px 16px 23px;
padding: 32px 12px 23px;
color: $content-footer-bg;
&.dropdown-toggle {
......@@ -277,7 +277,7 @@ $light-font-family: 'Roboto-Light';
> li {
> a {
padding: 32px 23px 23px 5px;
font-size: 18px;
font-size: 17px;
font-family: $emphasis-font-family;
color: $content-footer-bg;
}
......@@ -304,7 +304,7 @@ $light-font-family: 'Roboto-Light';
font-size: 29px;
height: 100%;
width: 182px;
margin-right: 68px;
margin-right: 20px;
img{
display: inline-block;
vertical-align: middle;
......@@ -1676,6 +1676,15 @@ h2.short {
}
}
.entry-page {
min-height: calc(100vh - 80px - 175px);
#map.institute-map {
max-height: calc(100vh - 353px);
height: 100vh;
}
}
//crop page
.crop-page {
.collect-info {
......@@ -4410,6 +4419,34 @@ table.accessions {
}
}
@media (min-width: 1920px) {
#navbar {
> div:first-child {
display: flex;
#navigation-menu {
display: flex;
justify-content: center;
width: 100%;
}
}
}
}
@media (min-width: 989px) {
#navigation-menu {
li {
&.dropdown {
a {
padding-right: 2px;
}
}
}
}
}
@media (max-width: 989px) {
.genesys-page .nav-menu .active {
background-color: #33322D;
......
......@@ -188,7 +188,7 @@
</a>
</li>
<li>
<a id="logout1" href="#" onclick="document.getElementById('logoutForm').submit();"> <spring:message code="user.pulldown.logout" />
<a id="logout1" onclick="document.getElementById('logoutForm').submit();"> <spring:message code="user.pulldown.logout" />
</a>
</li>
......@@ -242,4 +242,4 @@
<form id="logoutForm" action="/logout" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
</form>
\ No newline at end of file
</form>
......@@ -18,9 +18,9 @@
<form role="form" class="form-horizontal validate" action="<c:url value="/profile/${user.uuid}/update" />" method="post">
<div class="form-group">
<label for="name" class="col-lg-2 control-label"><spring:message code="registration.full-name" /></label>
<label for="fullName" class="col-lg-2 control-label"><spring:message code="registration.full-name" /></label>
<div class="col-lg-3">
<form:input id="name" name="name" class="span3 form-control" path="user.fullName" />
<form:input id="fullName" name="fullName" class="span3 form-control" path="user.fullName" />
</div>
</div>
<div class="form-group">
......
......@@ -18,7 +18,7 @@
<c:if test="${jsonInstitutes ne null}">
<div class="row" style="">
<div class="col-sm-12">
<div id="map" class="gis-map gis-map-square"></div>
<div id="map" class="institute-map gis-map gis-map-square"></div>
</div>
</div>
......@@ -54,4 +54,4 @@
</content>
</c:if>
</body>
</html>
\ No newline at end of file
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment