Commit 80357b73 authored by Matija Obreza's avatar Matija Obreza
Browse files

Social media links

i18n {0.Nummer.##} problem
parent 7f0c79bc
......@@ -346,6 +346,9 @@ selection.page.title=Ausgewählte Akzessionen
selection.add={0} zur Liste hinzufügen
selection.remove={0} aus Liste entfernen
selection.clear=Listeneinträge löschen
# selection.reload-list=Reload the list
# selection.map=Show accession map
# selection.send-request=Send request for germplasm
selection.empty-list-warning=Sie haben der Liste keine Akzessionen hinzugefügt.
selection.add-many=Kontrollieren und hinzufügen
selection.add-many.accessionIds=Akzessions-IDs - durch Leerzeichen oder Zeilenumbrüchen getrennt - so auflisten, wie sie in Genesys verwendet werden.
......@@ -648,12 +651,12 @@ admin.kpi.execution.page=KPI-Ausführung
admin.kpi.executionrun.page=Einzelheiten zur Ausführung
accession.pdci=Vollständigkeitsindex der Passdaten
accession.pdci.jumbo=PDCI-Score\: {0.Nummer.0,00} von 10,0
accession.pdci.institute-avg=Der durchschnittliche PDCI-Score für dieses Institut ist {0.Nummer.0,00}
accession.pdci.jumbo=PDCI-Score\: {0,number,0.00} von 10,0
accession.pdci.institute-avg=Der durchschnittliche PDCI-Score für dieses Institut ist {0,number,0.00}
accession.pdci.about-link=Über Vollständigkeitsindex der Passdaten lesen
accession.pdci.independent-items=Unabhängig vom Populationstyp
accession.pdci.dependent-items=Abhängig vom Populationstyp
accession.pdci.stats-text=Der durchschnittliche PDCI-Score für {0} Akzessionen ist {1.Nummer.0,00}, mit einem Mindestscore von {2.Nummer.0,00} und einem Höchstscore von {3.Nummer.0,00}.
accession.pdci.stats-text=Der durchschnittliche PDCI-Score für {0} Akzessionen ist {1,number,0.00}, mit einem Mindestscore von {2,number,0.00} und einem Höchstscore von {3,number,0.00}.
accession.donorNumb=Code Spenderinstitut
accession.acqDate=Erwerbsdatum
......@@ -663,7 +666,7 @@ accession.svalbard-data.url-title=Ablageinformationen in SGSV-Datenbank
accession.svalbard-data.url-text=SGSV-Ablageinformationen ansehen zu {0}
filter.download-pdci=PDCI-Daten herunterladen
statistics.phenotypic.stats-text=Von den {0} Akzessionen hat/haben {1} Akzessionen ({2.Nummer.0,##%}) mindestens ein weiteres, in einem Datensatz verzeichnetes Merkmal, das auf Genesys erhältlich ist (durchschnittlich {3.Nummer.0,##} Merkmale in {4.Nummer.0,##} Datensätze).
statistics.phenotypic.stats-text=Von den {0} Akzessionen hat/haben {1} Akzessionen ({2,number,0.##%}) mindestens ein weiteres, in einem Datensatz verzeichnetes Merkmal, das auf Genesys erhältlich ist (durchschnittlich {3,number,0.##} Merkmale in {4,number,0.##} Datensätze).
twitter.tweet-this=Twittern\!
twitter.follow-X=Folgen auf @{0}
......
......@@ -346,6 +346,9 @@ selection.page.title=Accesiones seleccionadas
selection.add=Agregar {0} a la lista
selection.remove=Eliminar {0} de la lista
selection.clear=Borrar la lista
# selection.reload-list=Reload the list
# selection.map=Show accession map
# selection.send-request=Send request for germplasm
selection.empty-list-warning=No ha agregado accesiones a la lista.
selection.add-many=Revisar y agregar
selection.add-many.accessionIds=Lista de identificadores de accesiones en Genesys separados por espacios o en una nueva línea.
......@@ -648,12 +651,12 @@ admin.kpi.execution.page=Ejecución de KPI
admin.kpi.executionrun.page=Detalles de la ejecución
accession.pdci=Índice de la integridad de los datos de pasaporte
accession.pdci.jumbo=Puntuación PDCI\: {0,número,0.00} de 10.0
accession.pdci.institute-avg=El promedio de puntuación PDCI para este instituto es de {0,número,0.00}
accession.pdci.jumbo=Puntuación PDCI\: {0,number,0.00} de 10.0
accession.pdci.institute-avg=El promedio de puntuación PDCI para este instituto es de {0,number,0.00}
accession.pdci.about-link=Lea sobre el índice de la integridad de los datos de pasaporte
accession.pdci.independent-items=Independiente del tipo de población
accession.pdci.dependent-items=Dependiente del tipo de población
accession.pdci.stats-text=El promedio de puntuación PDCI para {0} accesiones es de {1,número,0.00}, con una puntuación mínima de {2,número,0.00} y una puntuación máxima de {3,número,0.00}.
accession.pdci.stats-text=El promedio de puntuación PDCI para {0} accesiones es de {1,number,0.00}, con una puntuación mínima de {2,number,0.00} y una puntuación máxima de {3,number,0.00}.
accession.donorNumb=Código de la institución donante
accession.acqDate=Fecha de la adquisición
......@@ -663,7 +666,7 @@ accession.svalbard-data.url-title=Colocar información en la base de datos SGSV
accession.svalbard-data.url-text=Ver la información del depósito SGSV para {0}
filter.download-pdci=Descargar datos PDCI
statistics.phenotypic.stats-text=De las {0} accesiones, {1} accesión(es) ({2,número,0.##%}) tiene(n) al menos una característica adicional registrada en un conjunto de datos disponible en Genesys (de media {3,número,0.##} características en {4,número,0.##} conjuntos de datos).
statistics.phenotypic.stats-text=De las {0} accesiones, {1} accesión(es) ({2,number,0.##%}) tiene(n) al menos una característica adicional registrada en un conjunto de datos disponible en Genesys (de media {3,number,0.##} características en {4,number,0.##} conjuntos de datos).
twitter.tweet-this=Tuitear
twitter.follow-X=Seguir a @{0}
......
......@@ -346,6 +346,9 @@ selection.page.title=Acessões selecionadas
selection.add=Adicionar {0} à lista
selection.remove=Remover {0} da lista
selection.clear=Limpar a lista
# selection.reload-list=Reload the list
# selection.map=Show accession map
# selection.send-request=Send request for germplasm
selection.empty-list-warning=Você não adicionou nenhuma acessão à lista.
selection.add-many=Verificar e adicionar
selection.add-many.accessionIds=Listar IDs de acessões conforme usados no Genesys, separados por espaço ou nova linha.
......@@ -649,11 +652,11 @@ admin.kpi.executionrun.page=Detalhes da execução
accession.pdci=Índice de completude dos dados do Passport
accession.pdci.jumbo=Pontuação PDCI\: {0,number,0.00} de 10.0
accession.pdci.institute-avg=A pontuação média PDCI deste instituto é {0,número,0.00}
accession.pdci.institute-avg=A pontuação média PDCI deste instituto é {0,number,0.00}
accession.pdci.about-link=Leia sobre o índice de completude dos dados Passport
accession.pdci.independent-items=Independentemente do tipo da população
accession.pdci.dependent-items=Dependendo do tipo da população
accession.pdci.stats-text=A pontuação PDCI para {0} acessões é {1,número,0.00}, com pontuação mínima de {2,número,0.00} e máxima de {3,número,0.00}.
accession.pdci.stats-text=A pontuação PDCI para {0} acessões é {1,number,0.00}, com pontuação mínima de {2,number,0.00} e máxima de {3,number,0.00}.
accession.donorNumb=Código do instituto doador
accession.acqDate=Data da aquisição
......@@ -663,7 +666,7 @@ accession.svalbard-data.url-title=Informações de depósito no bando de dados S
accession.svalbard-data.url-text=Exibir informações de depósito SGVS para {0}
filter.download-pdci=Fazer download de dados PDCI
statistics.phenotypic.stats-text=Das {0} acessões, {1} acessões ({2,número,0.##%}) tem pelo menos uma característica registrada em um conjunto de dados disponível no Genesys (em média {3,número,0.##} características em {4,número,0.##} conjunto de dados).
statistics.phenotypic.stats-text=Das {0} acessões, {1} acessões ({2,number,0.##%}) tem pelo menos uma característica registrada em um conjunto de dados disponível no Genesys (em média {3,number,0.##} características em {4,number,0.##} conjunto de dados).
twitter.tweet-this=Tuíte\!
twitter.follow-X=Siga @{0}
......
......@@ -346,6 +346,9 @@ selection.page.title=Выбранные образцы
selection.add=Добавить {0} к списку
selection.remove=Удалить {0} из списка
selection.clear=Очистить список
# selection.reload-list=Reload the list
# selection.map=Show accession map
# selection.send-request=Send request for germplasm
selection.empty-list-warning=Вы не добавили образцы в список
selection.add-many=Проверить и добавить
selection.add-many.accessionIds=Укажите ID образцов, принятые в Genesys, разделяя их пробелом.
......@@ -648,12 +651,12 @@ admin.kpi.execution.page=Осуществление КПЭ
admin.kpi.executionrun.page=Подробные данные о цикле исполнения
accession.pdci=Показатель полноты паспортных данных
accession.pdci.jumbo=\ Баллы PDCI\: {0,количество,0.00} из 10.0
accession.pdci.institute-avg=Средний балл PDCI для данного института составляет {0,количество,0.00}
accession.pdci.jumbo=\ Баллы PDCI\: {0,number,0.00} из 10.0
accession.pdci.institute-avg=Средний балл PDCI для данного института составляет {0,number,0.00}
accession.pdci.about-link=Читать о показателе полноты паспортных данных
accession.pdci.independent-items=Вне зависимости от типа популяции
accession.pdci.dependent-items=В зависимости от типа популяции
accession.pdci.stats-text=Средний балл PDCI для {0} образцов составляет {1,количество,0.00}, при этом минимальный балл равен {2,количество,0.00} и максимальный балл равен {3,количество,0.00}.
accession.pdci.stats-text=Средний балл PDCI для {0} образцов составляет {1,number,0.00}, при этом минимальный балл равен {2,number,0.00} и максимальный балл равен {3,number,0.00}.
accession.donorNumb=Код института-донора
accession.acqDate=Дата сбора образца
......@@ -663,7 +666,7 @@ accession.svalbard-data.url-title=Информация о депозите в б
accession.svalbard-data.url-text=Просмотреть информацию о депозите в SGSV для {0}
filter.download-pdci=Скачать данные PDCI
statistics.phenotypic.stats-text=Из {0} образцов {1} образцов ({2,количество,0.##%}) имеют по меньшей мере одну дополнительную характеристику, внесенную в базу данных Genesys (из среднего количества {3,количество,0.##} характеристик в {4,количествоr,0.##} базах данных).
statistics.phenotypic.stats-text=Из {0} образцов {1} образцов ({2,number,0.##%}) имеют по меньшей мере одну дополнительную характеристику, внесенную в базу данных Genesys (из среднего количества {3,number,0.##} характеристик в {4,number,0.##} базах данных).
twitter.tweet-this=Пишите в Twitter\!
twitter.follow-X=Следуйте за нами по адресу @
......
......@@ -649,12 +649,14 @@ $(function() {
*/
$('.twitter-share-button').click(function(e) {
e.preventDefault();
window.open($(this).attr('href'), 'shareWindow', 'width=600,height=300,scrollbars=yes,toolbars=no');
var w=window.open($(this).attr('href'), 'shareWindow', 'width=600,height=300,scrollbars=yes,toolbars=no');
w.focus();
});
$('.twitter-follow-button').click(function(e) {
e.preventDefault();
window.open($(this).attr('href'), 'shareWindow', 'width=600,height=300,scrollbars=yes,toolbars=no');
var w=window.open($(this).attr('href'), 'shareWindow', 'width=600,height=300,scrollbars=yes,toolbars=no');
w.focus();
});
/**
......@@ -662,9 +664,16 @@ $('.twitter-follow-button').click(function(e) {
*/
$('.linkedin-share-button').click(function(e) {
e.preventDefault();
window.open($(this).attr('href'), 'shareWindow', 'width=600,height=300,scrollbars=yes,toolbars=no');
var w=window.open($(this).attr('href'), 'shareWindow', 'width=600,height=300,scrollbars=yes,toolbars=no');
w.focus();
});
$('[x-href]').click(function(e) {
e.preventDefault();
var url=$(this).attr('x-href');
console.log('X-Url: ' + url);
window.location=url;
});
//
// function enableSessionWarning(secondsBeforeExpiry) {
......
@import url("font-awesome.min.css");
$header-height: 70;
$brand-primary: #88ba42 !default; // darken(#428bca, 6.5%) !default; // #337ab7
@font-face {
font-family: 'FontAwesome';
......@@ -379,13 +380,15 @@ html[dir="rtl"] .navbar#nav-main ul li a{
background-color: transparent;
color: #4D4C46;
padding: 0;
text-transform: none;
text-transform: uppercase;
color: #88BA42;
font-family: "forzabook";
font-weight: bold;
}
#content .free-text h2 {
font-size: 18px;
margin: 1em 0 0.5em;
font-weight: normal;
}
#left-col .nav {
......@@ -747,6 +750,21 @@ html[dir="rtl"] .tab-pane .all-posts .type-list .post-inner .post-content ol li
.tab-pane .all-posts .post-actions {
font-size: 12px;
margin: 10px 0 0 72px;
a {
display: inline-block;
float: right;
margin: 0 1em 0 0;
&:hover, &:active {
text-decoration: none;
}
html[dir="rtl"] & {
margin: 0 0 0 1em;
float: left;
}
}
}
html[dir="rtl"] .tab-pane .all-posts .post-actions {
......@@ -2336,4 +2354,19 @@ table.terms-table td {
&[data-size=large] {
font-size: large;
}
}
\ No newline at end of file
}
.article-timestamp {
color: #b6b6b4;
font-size: small;
margin: 2em 0;
text-align: right;
html[dir=rtl] & {
text-align: left;
}
}
div[x-href] {
cursor: pointer;
}
#content .three-see-also {
width: 70%;
margin: 0 auto;
.three-1, .three-2, .three-3 {
width: 233px;
height: 234px;
height: 230px;
display: inline-block;
cursor:pointer;
}
.three-1 {
background: url('../images/aim/three-see1.jpg') no-repeat 0 0;
}
.three-2 {
background: url('../images/aim/featured-institute.png') no-repeat 0 0;
margin: 0 5px;
}
.three-3 {
background: url('../images/aim/three-see3.jpg') no-repeat 0 0;
img {
max-width: 100%;
}
}
#content .see-also {
margin-top: 2em;
h3 {
margin-bottom: 1em;
h2 {
span {
background-color: #88ba42;
color: white;
padding: 0.5em 4em 0.5em 0.5em;
text-transform: uppercase;
font-family: "forzabook";
font-weight: bold;
font-size: 18px;
html[dir=rtl] & {
padding: 0.5em 0.5em 0.5em 4em;
}
}
}
.row {
div.see-also-block {
min-height: 200px;
height: 200px;
position: relative;
background-size: cover;
background-repeat: no-repeat;
h2 {
display: inline-block;
width: 100%;
margin-bottom: 0;
text-transform: none;
font-size: 28px;
font-size: 18px;
background: #88ba42;
padding: 15px 19px 34px;
margin-top: 116px;
font-family: 'Noto Sans';
}
}
/***************************MAIL-NOTIFICATIONS****************************************************/
.article.container {
.title{
margin: 20px;
font-size: 20px;
}
.text-wrap{
margin:0 20px;
}
.massege{
background:#88ba42;
color:#fff;
text-align:center;
padding: 30px 0;
font-size: 19px;
margin: 0 20px 30px;
}
.confirm{
text-align:center;
background:#e7e5df;
text-decoration:underline;
padding: 30px 0;
font-size: 19px;
margin: 0 20px 40px;
a{
color:#006db4;
&:hover{
color:#006db4;
}
}
}
.share-article-mail{
background:#4d4c46;
height: 55px;
text-align:center;
margin: 20px -10px 0;
p {
color:#fff;
display: inline-block;
padding-right: 20px;
font-size: 13px;
}
ul {
display: inline-block;
li {
display:inline-block;
margin-top: 5px;
vertical-align: middle;
a {
color:#fff;
}
}
.twitter {
border-right: 1px solid #dbdbda;
border-left: 1px solid #dbdbda;
padding: 10px 30px;
i {
font-size: 22px;
}
}
.envelope {
font-weight: bold;
padding: 11px 30px;
i {
font-size: 17px;
}
}
.facebook {
border-right: 1px solid #dbdbda;
padding: 10px 30px;
i {
font-size: 20px;
}
padding: 15px 19px 15px;
font-family: 'Noto Sans';
position: absolute;
bottom: 0;
z-index: 20;
}
}
}
}
/******************************************* ABOUT PAGE ****************************************/
.top-title {
background-color: #88ba42;
......@@ -140,26 +67,6 @@
width:100%;
}
}
html[dir="rtl"] #content{
.right-side .share-article ul{
.facebook {
border-left: 1px solid #dbdbda;
border-right:none;
}
.envelope {
border-right: 1px solid #dbdbda;
border-left:none;
}
}
.share-article p{
right:0;
left:auto;
}
.main-col .article.container .right-side .see-also h3 span{
padding: 13px 10px 13px 94px !important;
text-align:right;
}
}
#content .right-side {
background-color: #fff;
......@@ -205,14 +112,18 @@ html[dir="rtl"] #content{
color: #b6b6b4;
padding-top: 28px;
position: absolute;
left: 0;
}
ul {
display: block;
margin: 0 auto;
margin-top: 20px;
width: 100%;
text-align: center;
text-align: right;
html[dir="rtl"] & {
text-align: left;
}
li {
height: 45px;
box-sizing: border-box;
......@@ -223,23 +134,23 @@ html[dir="rtl"] #content{
}
.twitter {
border-right: 1px solid #dbdbda;
border-left: 1px solid #dbdbda;
/* border-right: 1px solid #dbdbda;
border-left: 1px solid #dbdbda; */
padding: 10px 30px;
i {
font-size: 22px;
}
}
.envelope {
border-left: 1px solid #dbdbda;
/* border-left: 1px solid #dbdbda; */
font-weight: bold;
padding: 11px 30px;
i {
font-size: 17px;
}
}
.facebook {
border-right: 1px solid #dbdbda;
.linkedin {
/* border-right: 1px solid #dbdbda; */
padding: 10px 30px;
i {
font-size: 20px;
......@@ -360,11 +271,9 @@ html[dir="rtl"] #content{
}
// **********************************************************************
//**********************************************************************
// *********** TABLET ***********
//**********************************************************************
//***********************************************************************
/**********************************************************************
*********** TABLET ***********
/*********************************************************************/
@media (max-width: 1200px){
html[dir="rtl"] .custom-about-list ul {
padding:0;
......
......@@ -12,7 +12,7 @@
<li><a href="<c:url value="/content/legal/disclaimer" />"><spring:message code="menu.disclaimer" /></a></li>
<li><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/issues/new"><spring:message code="menu.report-an-issue" /></a></li>
<li class="notimportant"><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server.git"><spring:message code="menu.scm" /></a></li>
<li class="notimportant"><a target="_blank" href="https://www.transifex.com/projects/p/genesys/"><spring:message code="menu.translate" /></a></li>
<li class="notimportant"><a target="_blank" href="https://www.transifex.com/crop-trust/genesys/"><spring:message code="menu.translate" /></a></li>
</ul>
<ul class="nav pull-right">
......
......@@ -25,7 +25,7 @@
<%@include file="/WEB-INF/jsp/not-translated.jsp"%>
</c:if>
<div class="article" dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}">
<div class="article">
<div class="right-side main-col col-md-9">
<security:authorize access="hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')">
<a href="<c:url value="/content/${article.slug}/edit" />" class="close">
......@@ -36,46 +36,65 @@
</a>
</security:authorize>
<div class="free-text">
<div class="free-text" dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}">
<c:out value="${article.body}" escapeXml="false" />
</div>
<div class="clearfix pull-right">
<fmt:formatDate value="${article.postDate.time}" />
<div class="article-timestamp">
<local:prettyTime date="${article.postDate.time}" locale="${pageContext.response.locale}" />
</div>
<div class="share-article">
<p>
<spring:message code="article.share" />
</p>
<ul class="list-inline">
<%--
<li class="envelope">
<a href="">
<i class="fa fa-envelope-o"></i>
</a>
</li>
--%>
<li class="twitter">
<local:tweet text="${article.title}" hashTags="GenesysPGR" />
</li>
<li class="linkedin">
<local:linkedin-share text="${article.title}" summary="${article.body}" />
</li>
</ul>
</div>
<%-- <div class="share-article">
<p><spring:message code="article.share" /></p>
<ul class="list-inline">
<li class="envelope"><a href=""><i class="fa fa-envelope-o"></i></a></li>
<li class="twitter"><a href="https://twitter.com/"><i class="fa fa-twitter"></i></a></li>
<li class="facebook"><a href="https://www.facebook.com"><i class="fa fa-facebook"></i></a></li>
</ul>
</div> --%>
<!-- <div class="see-also">
<h3><span>see also</span></h3>
<div class="three-see-also clearfix">
<div class="three-1">
<h2>History of Genesys</h2>
</div>
<div class="three-2">
<h2>How to use Genesys</h2>
</div>
<div class="three-3">
<h2>About Genesys Data</h2>
</div>
</div>
</div> -->
<%-- <div class="see-also">
<h3>
<span>
<spring:message code="heading.see-also" />
</span>
</h3>
<div class="row">
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/images/pic_news_1.png" />')">
<h2>History of Genesys</h2>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/images/pic_news_1.png" />')">
<h2>How to use Genesys</h2>
</div>
</div>
<div class="col-xs-12 col-sm-4">
<div class="see-also-block" style="background-image: url('<c:url value="/html/images/pic_news_1.png" />')">
<h2>About Genesys Data 123 </h2>
</div>
</div>
</div>
</div> --%>
</div>
<div class="col-md-3 sidebar-nav col-xs-12">
<cms:menu key="${menu.key}" items="${menu.items}" />
</div>
<div class="col-md-3 sidebar-nav col-xs-12">
<cms:menu key="${menu.key}" items="${menu.items}" />
</div>
</div>
</body>
......