Commit e301c312 authored by Taisiya Glushko's avatar Taisiya Glushko
Browse files

List and Form update UI, selected list blurp text fixes

parent ff585672
......@@ -2510,7 +2510,9 @@ table.accessions {
border-left: 2px solid #E7E5DF;
}
.form-group > label[for="blurp-body"] + div,
.form-group > label[for="faoInstitute-summary"] + div {
.form-group > label[for="faoInstitute-summary"] + div,
.form-group > label[for="article-body"] + div,
.form-group > label[for="article-summary"] + div {
border-left: none;
padding: 0 0 15px 0;
}
......@@ -2592,7 +2594,25 @@ table.accessions {
}
}
}
//article-page
.article-page {
.main-col-header {
padding: 15px 25px 5px 25px;
margin-bottom: 20px;
form {
input {
margin-bottom: 10px;
}
}
form {
.pagination {
input {
margin-bottom: 0;
}
}
}
}
}
@media (min-width: 990px) and (max-width: 1919px) {
.genesys-page {
......@@ -3947,6 +3967,20 @@ table.accessions {
}
}
}
//article page
.article-page {
.main-col-header {
.pull-right {
float: none !important;
margin-bottom: 0;
.dropdown {
width: 164px;
margin-right: auto;
margin-left: auto;
}
}
}
}
}
@media (max-width: 960px) {
......@@ -4454,7 +4488,10 @@ table.accessions {
padding-right: 0;
}
.alert-info {
margin: 15px 10px 0 10px;
margin: 10px 15px;
}
.free-text.blurp {
padding: 0 15px;
}
.form-actions-wrapper {
form {
......
......@@ -7,9 +7,8 @@
<title><c:out value="${title}" /></title>
</head>
<body>
<div class="main-col">
<h1>
<body class="article-page selected-list">
<h1 class="green-bg">
<spring:message code="article.edit-article" />
</h1>
......@@ -19,11 +18,11 @@
<c:set var="cancel" value="${article.id ne null ? (article.targetId ne null? '/content/'.concat(article.slug).concat('/').concat(article.classPk.shortName).concat('/').concat(article.targetId).concat('/').concat(article.lang) : '/content/'.concat(article.slug)) : '/content' }"/>
<c:if test="${article.lang eq 'en'}">
<div class="form-group">
<div class="row main-col-header clearfix">
<form method="post" action="<c:url value="/content/transifex"/>">
<input type="hidden" name="slug" value="${article.slug}" />
<input type="hidden" name="targetId" value="${article.targetId}" />
<input type="hidden" name="classPkShortName" value="${article.classPk.shortName}" />
<input type="hidden" name="slug" class="btn btn-default" value="${article.slug}" />
<input type="hidden" name="targetId" class="btn btn-default" value="${article.targetId}" />
<input type="hidden" name="classPkShortName" class="btn btn-default" value="${article.classPk.shortName}" />
<input type="submit" name="post" class="btn btn-default" value="<spring:message code="article.post-to-transifex" />" />
<input type="submit" name="remove" class="btn btn-default" value="<spring:message code="article.remove-from-transifex" />" />
......@@ -35,7 +34,7 @@
<div><c:out value="${resource}" /></div>
</c:if>
<form dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}" role="form" id="editForm" class="" action="<c:url value="${url}" />" method="post">
<form dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}" role="form" id="editForm" class="form-horizontal" action="<c:url value="${url}" />" method="post">
<c:choose>
<c:when test="${article.id ne null}">
<input type="hidden" name="id" value="${article.id}" />
......@@ -47,21 +46,21 @@
</c:choose>
<div class="form-group">
<label for="article-slug" class="control-label">
<label for="article-slug" class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label">
<spring:message code="article.slug" />
</label>
<div class="controls">
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12 controls">
<input type="text" id="article-slug" name="slug" value="<c:out value="${article.slug}" />" class="span9 form-control required" />
</div>
</div>
<div class="form-group">
<label for="article-title" class="control-label">
<label for="article-title" class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label">
<spring:message code="article.title" />
</label>
<div class="controls">
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12 controls">
<input type="text" id="article-title" name="title" value="<c:out value="${article.title}" />" class="span9 form-control required" />
</div>
</div>
......@@ -85,12 +84,13 @@
</div>
</div>
<input type="submit" value="<spring:message code="save"/>" class="btn btn-primary" />
<a href="<c:url value="${cancel}" />" class="btn btn-default">Cancel</a>
<!-- CSRF protection -->
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
<div class="form-group transparent">
<input type="submit" value="<spring:message code="save"/>" class="btn btn-primary" />
<a href="<c:url value="${cancel}" />" class="btn btn-default">Cancel</a>
</div>
<!-- CSRF protection -->
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
</form>
</div>
<content tag="javascript">
<script type="text/javascript">
......
......@@ -6,21 +6,21 @@
<head>
<title><spring:message code="content.page.list.title" /></title>
</head>
<body>
<h1>
<body class="article-page selected-list">
<h1 class="green-bg">
<spring:message code="content.page.list.title" />
</h1>
<div class="main-col-header clearfix">
<div class="row main-col-header clearfix">
<div class="nav-header">
<div class="results"><spring:message code="paged.totalElements" arguments="${pagedData.totalElements}" /></div>
<div class="pagination pull-left">
<%--<div class="results"><spring:message code="paged.totalElements" arguments="${pagedData.totalElements}" /></div>--%>
<%--<div class="pagination pull-left">
<spring:message code="paged.pageOfPages" arguments="${pagedData.number+1},${pagedData.totalPages}" />
<a class="${pagedData.number eq 0 ? 'disabled' :''}" href="?page=${pagedData.number eq 0 ? 1 : pagedData.number}&amp;language=${language}"><spring:message code="pagination.previous-page" /></a> <a href="?page=${pagedData.number + 2}&amp;language=${language}"><spring:message code="pagination.next-page" /></a>
</div>
</div>--%>
<div class="form-group pull-right">
<div class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><c:out value="Languge filtering" /> <b class="caret"></b></a>
<a href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><c:out value="Languge filtering" /> <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" id="transifiex_langs">
<li><a href="${pageContext.request.contextPath}/content">All</a></li>
<c:forEach items="${languages}" var="language">
......@@ -29,21 +29,26 @@
</ul>
</div>
</div>
<filters:pagination pagedData="${pagedData}" jsonFilter="${jsonFilter}"/>
</div>
</div>
<table class="">
<table class="accessions">
<thead>
<tr>
<td><spring:message code="article.slug" /></td>
<td><spring:message code="article.lang" /></td>
<td><spring:message code="article.classPk" /></td>
<td><spring:message code="article.title" /></td>
<td class="idx-col"><p></p></td>
<td><p></p></td>
<td><p><spring:message code="article.slug" /></p></td>
<td><p><spring:message code="article.lang" /></p></td>
<td><p><spring:message code="article.classPk" /></p></td>
<td><p><spring:message code="article.title" /></p></td>
</tr>
</thead>
<tbody>
<c:forEach items="${pagedData.content}" var="article" varStatus="status">
<tr class="${status.count % 2 == 0 ? 'even' : 'odd'}">
<td class="idx-col"><p><c:out value="${status.count + pagedData.size * pagedData.number}" /></p></td>
<td class="sel ${selection.containsId(accession.id) ? 'picked' : ''}" x-aid="${accession.id}"></td>
<td>
<c:choose>
<c:when test="${article.targetId ne null}">
......
Supports Markdown
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