Merge branch 'prod'

This commit is contained in:
2018-04-26 22:05:18 +02:00
4 changed files with 15 additions and 8 deletions
@@ -93,12 +93,19 @@ function template_preprocess_edlp_home(&$vars){
// );
// render the next events of agenda as list
$agenda = array (
'#theme' => 'item_list',
'#items' => [],
$agenda = array(
'#type'=>"container",
'title'=>array(
'#markup'=>"<h3>".t("Agenda")."</h3>",
),
'list'=> array(
'#theme' => 'item_list',
'#items' => [],
),
);
foreach($vars['agenda_items'] as $node){
$agenda['#items'][] = $view_builder->view($node, 'teaser');
$agenda['list']['#items'][] = $view_builder->view($node, 'teaser');
}
$vars['agenda'] = render($agenda);
@@ -805,7 +805,7 @@
// hiding
this.hideTimer = false;
this.hideTimeMS = 10000;
this.hideTimeMS = 15000;
// history
this.currentHistoricIndex = null;
@@ -805,7 +805,7 @@
// hiding
this.hideTimer = false;
this.hideTimeMS = 10000;
this.hideTimeMS = 15000;
// history
this.currentHistoricIndex = null;
@@ -202,7 +202,7 @@ function edlptheme_preprocess_node__enregistrement__player_cartel(&$vars){
'data-drupal-link-system-path' => $url->getInternalPath()
)
));
$vars['link_transcript'] = Link::fromTextAndUrl(t("Lire le text."), $url);
$vars['link_transcript'] = Link::fromTextAndUrl(t("Read the text."), $url);
}
// if article not empty
@@ -217,7 +217,7 @@ function edlptheme_preprocess_node__enregistrement__player_cartel(&$vars){
'data-drupal-link-system-path' => $url->getInternalPath()
)
));
$vars['link_article'] = Link::fromTextAndUrl(t("Lire l'article."), $url);
$vars['link_article'] = Link::fromTextAndUrl(t("Read the article."), $url);
}
// relations (defined in edlp_corpus.module)