Commit 378cd077 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '146-buttons-has-different-width'

parents 5c85059c 1dfe2b06
...@@ -3330,6 +3330,21 @@ table.accessions { ...@@ -3330,6 +3330,21 @@ table.accessions {
form.form-horizontal .form-group input[name="instCode"] { form.form-horizontal .form-group input[name="instCode"] {
margin-top: 0; margin-top: 0;
} }
.control-btn-group a {
color: #fff;
margin-bottom: 1px;
}
.btn-primary {
font-size: 17px;
background-color: #88ba42;
font-family: "Roboto-Medium";
padding: 10px 41px;
border: 2px solid #ffffff;
border-radius: 1px;
color: #ffffff;
text-transform: uppercase;
width: auto;
}
} }
.nav-tabs > li { .nav-tabs > li {
html[dir="ltr"] & { html[dir="ltr"] & {
......
...@@ -204,15 +204,15 @@ ...@@ -204,15 +204,15 @@
<label for="accessionListDescr" class="control-label"><spring:message code="userlist.description" /></label> <label for="accessionListDescr" class="control-label"><spring:message code="userlist.description" /></label>
<textarea name="description" rows="3" id="accessionListDescr" class="form-control"><c:out value="${selection.userAccessionList.description}"/></textarea> <textarea name="description" rows="3" id="accessionListDescr" class="form-control"><c:out value="${selection.userAccessionList.description}"/></textarea>
</div> </div>
<div class="form-group transparent"> <div class="form-group transparent control-btn-group">
<c:if test="${selection.userAccessionList.uuid ne null}"> <c:if test="${selection.userAccessionList.uuid ne null}">
<input type="hidden" name="uuid" value="${selection.userAccessionList.uuid}"/> <input type="hidden" name="uuid" value="${selection.userAccessionList.uuid}"/>
<input type="submit" class="btn btn-primary" value="<spring:message code="userlist.update-list"/>" name="update" /> <input type="submit" class="btn btn-primary" value="<spring:message code="userlist.update-list"/>" name="update" />
<input type="submit" class="btn btn-default" value="<spring:message code="userlist.disconnect"/>" name="disconnect" /> <input type="submit" class="btn btn-primary" value="<spring:message code="userlist.disconnect"/>" name="disconnect" />
<input type="submit" class="btn btn-default" value="<spring:message code="delete"/>" name="delete" /> <input type="submit" class="btn btn-primary" value="<spring:message code="delete"/>" name="delete" />
<security:authorize access="hasRole('ADMINISTRATOR') or hasPermission(#selection.userAccessionList, 'ADMINISTRATION')"> <security:authorize access="hasRole('ADMINISTRATOR') or hasPermission(#selection.userAccessionList, 'ADMINISTRATION')">
<a class="btn btn-default" href="<c:url value="/acl/org.genesys2.server.model.impl.AccessionList/${selection.userAccessionList.id}/permissions"><c:param name="back"><c:url value="/sel" /></c:param></c:url>"> <a class="btn btn-primary" href="<c:url value="/acl/org.genesys2.server.model.impl.AccessionList/${selection.userAccessionList.id}/permissions"><c:param name="back"><c:url value="/sel" /></c:param></c:url>">
<spring:message code="edit-acl"/> <spring:message code="edit-acl"/>
</a> </a>
</security:authorize> </security:authorize>
......
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