bachir/edlp_d8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod'

Browse Source
This commit is contained in:
bachir
2018-04-26 22:05:18 +02:00
parent 77b16de28b b7abbe605b
commit 3c20c69e2d
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/modules/figli/edlp_home/includes/edlp_home.inc
+11 -4
View File
@@ -93,12 +93,19 @@ function template_preprocess_edlp_home(&$vars){
// ); // );
// render the next events of agenda as list // render the next events of agenda as list
$agenda = array ( $agenda = array(
'#theme' => 'item_list', '#type'=>"container",
'#items' => [], 'title'=>array(
'#markup'=>"<h3>".t("Agenda")."</h3>",
),
'list'=> array(
'#theme' => 'item_list',
'#items' => [],
),
); );
foreach($vars['agenda_items'] as $node){ 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); $vars['agenda'] = render($agenda);
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+1 -1
View File
@@ -805,7 +805,7 @@
// hiding // hiding
this.hideTimer = false; this.hideTimer = false;
this.hideTimeMS = 10000; this.hideTimeMS = 15000;
// history // history
this.currentHistoricIndex = null; this.currentHistoricIndex = null;
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+1 -1
View File
@@ -805,7 +805,7 @@
// hiding // hiding
this.hideTimer = false; this.hideTimer = false;
this.hideTimeMS = 10000; this.hideTimeMS = 15000;
// history // history
this.currentHistoricIndex = null; this.currentHistoricIndex = null;
sites/all/themes/custom/edlptheme/edlptheme.theme
+2 -2
View File
@@ -202,7 +202,7 @@ function edlptheme_preprocess_node__enregistrement__player_cartel(&$vars){
'data-drupal-link-system-path' => $url->getInternalPath() '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 // if article not empty
@@ -217,7 +217,7 @@ function edlptheme_preprocess_node__enregistrement__player_cartel(&$vars){
'data-drupal-link-system-path' => $url->getInternalPath() '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) // relations (defined in edlp_corpus.module)