diff --git a/sites/all/modules/features/clameurs/clameurs.features.field_instance.inc b/sites/all/modules/features/clameurs/clameurs.features.field_instance.inc index 87851bf5..40643d9f 100644 --- a/sites/all/modules/features/clameurs/clameurs.features.field_instance.inc +++ b/sites/all/modules/features/clameurs/clameurs.features.field_instance.inc @@ -236,6 +236,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 2, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'hidden', 'module' => 'text', @@ -287,6 +293,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 6, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'text', @@ -342,6 +354,12 @@ function clameurs_field_default_field_instances() { 'type' => 'entityreference_label', 'weight' => 0, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'entityreference', @@ -402,6 +420,12 @@ function clameurs_field_default_field_instances() { 'type' => 'video_embed_field_thumbnail', 'weight' => 5, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'video_embed_field', @@ -463,6 +487,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 5, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'entityreference', @@ -514,6 +544,12 @@ function clameurs_field_default_field_instances() { 'type' => 'text_default', 'weight' => 1, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'settings' => array(), @@ -563,6 +599,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 6, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'hidden', 'module' => 'text', @@ -620,6 +662,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 7, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'text', @@ -678,6 +726,12 @@ function clameurs_field_default_field_instances() { 'type' => 'video_embed_field_thumbnail', 'weight' => 9, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'video_embed_field', @@ -739,6 +793,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 0, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'entityreference', @@ -799,6 +859,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 8, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'entityreference', @@ -850,6 +916,12 @@ function clameurs_field_default_field_instances() { 'type' => 'text_default', 'weight' => 3, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'settings' => array(), @@ -900,6 +972,15 @@ function clameurs_field_default_field_instances() { 'type' => 'text_default', 'weight' => 3, ), + 'attente' => array( + 'label' => 'hidden', + 'module' => 'text', + 'settings' => array( + 'trim_length' => 600, + ), + 'type' => 'text_summary_or_trimmed', + 'weight' => 1, + ), 'default' => array( 'label' => 'hidden', 'module' => 'text', @@ -950,6 +1031,12 @@ function clameurs_field_default_field_instances() { 'type' => 'text_default', 'weight' => 11, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 4, + ), 'default' => array( 'label' => 'above', 'module' => 'text', @@ -1008,6 +1095,12 @@ function clameurs_field_default_field_instances() { 'type' => 'entityreference_entity_view', 'weight' => 6, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 7, + ), 'default' => array( 'label' => 'above', 'module' => 'entityreference', @@ -1059,6 +1152,12 @@ function clameurs_field_default_field_instances() { 'type' => 'taxonomy_term_reference_plain', 'weight' => 10, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 6, + ), 'default' => array( 'label' => 'above', 'module' => 'taxonomy', @@ -1113,6 +1212,12 @@ function clameurs_field_default_field_instances() { 'type' => 'video_embed_field_thumbnail', 'weight' => 8, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 8, + ), 'default' => array( 'label' => 'above', 'module' => 'video_embed_field', @@ -1179,6 +1284,12 @@ function clameurs_field_default_field_instances() { 'type' => 'entityreference_entity_view', 'weight' => 5, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 5, + ), 'default' => array( 'label' => 'above', 'module' => 'entityreference', @@ -1233,6 +1344,12 @@ function clameurs_field_default_field_instances() { 'type' => 'hidden', 'weight' => 7, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 9, + ), 'default' => array( 'label' => 'above', 'module' => 'number', diff --git a/sites/all/modules/features/clameurs/clameurs.field_group.inc b/sites/all/modules/features/clameurs/clameurs.field_group.inc index 570c91a7..25b9d5b1 100644 --- a/sites/all/modules/features/clameurs/clameurs.field_group.inc +++ b/sites/all/modules/features/clameurs/clameurs.field_group.inc @@ -261,6 +261,33 @@ function clameurs_field_group_info() { ); $field_groups['group_main|node|thematique|accueil'] = $field_group; + $field_group = new stdClass(); + $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ + $field_group->api_version = 1; + $field_group->identifier = 'group_main|node|thematique|attente'; + $field_group->group_name = 'group_main'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'thematique'; + $field_group->mode = 'attente'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'main', + 'weight' => '0', + 'children' => array( + 0 => 'body', + ), + 'format_type' => 'html5', + 'format_settings' => array( + 'label' => 'main', + 'instance_settings' => array( + 'id' => '', + 'classes' => 'main', + 'wrapper' => 'article', + ), + ), + ); + $field_groups['group_main|node|thematique|attente'] = $field_group; + $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; diff --git a/sites/all/modules/features/clameurs/clameurs.info b/sites/all/modules/features/clameurs/clameurs.info index 2f1a2420..44c8ea73 100644 --- a/sites/all/modules/features/clameurs/clameurs.info +++ b/sites/all/modules/features/clameurs/clameurs.info @@ -80,6 +80,7 @@ features[field_group][] = group_htabs|node|documentair|form features[field_group][] = group_htabs|node|episode|form features[field_group][] = group_htabs|node|thematique|form features[field_group][] = group_main|node|thematique|accueil +features[field_group][] = group_main|node|thematique|attente features[field_group][] = group_right|node|thematique|accueil features[field_group][] = group_texte|node|documentair|form features[field_group][] = group_texte|node|episode|form diff --git a/sites/all/modules/features/clameurs/clameurs.strongarm.inc b/sites/all/modules/features/clameurs/clameurs.strongarm.inc index 74e55a65..121b4f3c 100644 --- a/sites/all/modules/features/clameurs/clameurs.strongarm.inc +++ b/sites/all/modules/features/clameurs/clameurs.strongarm.inc @@ -135,6 +135,10 @@ function clameurs_strongarm() { 'weight' => '3', 'visible' => FALSE, ), + 'attente' => array( + 'weight' => '2', + 'visible' => FALSE, + ), ), 'workflow' => array( 'teaser' => array( @@ -145,6 +149,10 @@ function clameurs_strongarm() { 'weight' => '4', 'visible' => FALSE, ), + 'attente' => array( + 'weight' => '3', + 'visible' => FALSE, + ), ), ), ), diff --git a/sites/all/modules/features/page/page.features.field_instance.inc b/sites/all/modules/features/page/page.features.field_instance.inc index 53d26bcc..e9333998 100644 --- a/sites/all/modules/features/page/page.features.field_instance.inc +++ b/sites/all/modules/features/page/page.features.field_instance.inc @@ -23,6 +23,12 @@ function page_field_default_field_instances() { 'type' => 'hidden', 'weight' => 0, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'hidden', 'module' => 'text', @@ -73,6 +79,12 @@ function page_field_default_field_instances() { 'type' => 'hidden', 'weight' => 0, ), + 'attente' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), 'default' => array( 'label' => 'above', 'module' => 'image', diff --git a/sites/all/modules/figureslibres/clameursmod/clameursmod.module b/sites/all/modules/figureslibres/clameursmod/clameursmod.module index acb6f41e..5c3bd2fc 100644 --- a/sites/all/modules/figureslibres/clameursmod/clameursmod.module +++ b/sites/all/modules/figureslibres/clameursmod/clameursmod.module @@ -47,6 +47,10 @@ function clameursmod_entity_info_alter(&$entity_info) { 'label' => t('Accueil'), 'custom settings' => TRUE, ); + $entity_info['node']['view modes']['attente'] = array( + 'label' => t('attente'), + 'custom settings' => TRUE, + ); } @@ -130,9 +134,21 @@ function _clameursmod_thematiques(){ function theme_thematiques($vars){ $nodes = $vars['items']; - $view_mode = "accueil"; - $entity_view = entity_view('node', $nodes, $view_mode); - return render($entity_view); + $rendered = ""; + foreach ($nodes as $key => $node) { + // dsm($node, 'node'); + switch ($node->workflow) { + case 7: + $view_mode = "accueil"; + break; + default: + $view_mode = "attente"; + break; + } + $entity_view = entity_view('node', array($node), $view_mode); + $rendered .= render($entity_view); + } + return $rendered; } // ___ __ diff --git a/sites/all/themes/figureslibres/clameurs/css/dist/styles.css b/sites/all/themes/figureslibres/clameurs/css/dist/styles.css index 34914e56..e8c588ea 100755 --- a/sites/all/themes/figureslibres/clameurs/css/dist/styles.css +++ b/sites/all/themes/figureslibres/clameurs/css/dist/styles.css @@ -87,15 +87,14 @@ input { #header h2 { font-size: 2em; } } -@media only screen and (min-width: 62.5625em) { - #main { - padding-top: 400px; } } - -#main > .region { +#main { width: 95%; margin: 0 auto; } @media only screen and (min-width: 62.5625em) { - #main > .region { + #main { + padding-top: 400px; } } + @media only screen and (min-width: 62.5625em) { + #main { max-width: 1000px; } } #node-63 { @@ -191,8 +190,7 @@ input { cursor: default; } .node-thematique { - min-height: 766px; - margin-bottom: 10em; + margin-bottom: 7em; position: relative; } .node-thematique::before { position: absolute; @@ -212,128 +210,71 @@ input { height: 110%; top: -5%; left: -5%; } } + .node-thematique.en_attente::before { + background-size: contain; + background-position: left; } .node-thematique.node-32::before { background-image: url(../../images/fond-theme-0-flat.png); } - .node-thematique.node-32.en_attente::before { - background-image: url(../../images/fond-theme-0-flat-nb.jpg); } - .node-thematique.node-32.en_attente > h2, - .node-thematique.node-32.en_attente .group-video .field-name-field-description h3, - .node-thematique.node-32.en_attente .group-description .field-name-field-ecouter, - .node-thematique.node-32.en_attente .node-documentair .field-name-field-doc, - .node-thematique.node-32.en_attente .node-documentair .field-name-title-field, - .node-thematique.node-32.en_attente .field-name-field-episodes .field-label, - .node-thematique.node-32.en_attente .node-episode .field-name-title-field { - color: #aaa; } - .node-thematique.node-32:not(.en_attente) > h2, - .node-thematique.node-32:not(.en_attente) .group-video .field-name-field-description h3, - .node-thematique.node-32:not(.en_attente) .group-description .field-name-field-ecouter, - .node-thematique.node-32:not(.en_attente) .node-documentair .field-name-field-doc, - .node-thematique.node-32:not(.en_attente) .node-documentair .field-name-title-field, - .node-thematique.node-32:not(.en_attente) .field-name-field-episodes .field-label, - .node-thematique.node-32:not(.en_attente) .node-episode .field-name-title-field { + .node-thematique.node-32 > h2, + .node-thematique.node-32 .group-video .field-name-field-description h3, + .node-thematique.node-32 .group-description .field-name-field-ecouter, + .node-thematique.node-32 .node-documentair .field-name-field-doc, + .node-thematique.node-32 .node-documentair .field-name-title-field, + .node-thematique.node-32 .field-name-field-episodes .field-label, + .node-thematique.node-32 .node-episode .field-name-title-field { color: #2f82ff; } .node-thematique.node-14::before { background-image: url(../../images/fond-theme-1-flat.png); } - .node-thematique.node-14.en_attente::before { - background-image: url(../../images/fond-theme-1-flat-nb.jpg); } - .node-thematique.node-14.en_attente > h2, - .node-thematique.node-14.en_attente .group-video .field-name-field-description h3, - .node-thematique.node-14.en_attente .group-description .field-name-field-ecouter, - .node-thematique.node-14.en_attente .node-documentair .field-name-field-doc, - .node-thematique.node-14.en_attente .node-documentair .field-name-title-field, - .node-thematique.node-14.en_attente .field-name-field-episodes .field-label, - .node-thematique.node-14.en_attente .node-episode .field-name-title-field { - color: #aaa; } - .node-thematique.node-14:not(.en_attente) > h2, - .node-thematique.node-14:not(.en_attente) .group-video .field-name-field-description h3, - .node-thematique.node-14:not(.en_attente) .group-description .field-name-field-ecouter, - .node-thematique.node-14:not(.en_attente) .node-documentair .field-name-field-doc, - .node-thematique.node-14:not(.en_attente) .node-documentair .field-name-title-field, - .node-thematique.node-14:not(.en_attente) .field-name-field-episodes .field-label, - .node-thematique.node-14:not(.en_attente) .node-episode .field-name-title-field { + .node-thematique.node-14 > h2, + .node-thematique.node-14 .group-video .field-name-field-description h3, + .node-thematique.node-14 .group-description .field-name-field-ecouter, + .node-thematique.node-14 .node-documentair .field-name-field-doc, + .node-thematique.node-14 .node-documentair .field-name-title-field, + .node-thematique.node-14 .field-name-field-episodes .field-label, + .node-thematique.node-14 .node-episode .field-name-title-field { color: #ff0000; } .node-thematique.node-38::before { background-image: url(../../images/fond-theme-2-flat.png); } - .node-thematique.node-38.en_attente::before { - background-image: url(../../images/fond-theme-2-flat-nb.jpg); } - .node-thematique.node-38.en_attente > h2, - .node-thematique.node-38.en_attente .group-video .field-name-field-description h3, - .node-thematique.node-38.en_attente .group-description .field-name-field-ecouter, - .node-thematique.node-38.en_attente .node-documentair .field-name-field-doc, - .node-thematique.node-38.en_attente .node-documentair .field-name-title-field, - .node-thematique.node-38.en_attente .field-name-field-episodes .field-label, - .node-thematique.node-38.en_attente .node-episode .field-name-title-field { - color: #aaa; } - .node-thematique.node-38:not(.en_attente) > h2, - .node-thematique.node-38:not(.en_attente) .group-video .field-name-field-description h3, - .node-thematique.node-38:not(.en_attente) .group-description .field-name-field-ecouter, - .node-thematique.node-38:not(.en_attente) .node-documentair .field-name-field-doc, - .node-thematique.node-38:not(.en_attente) .node-documentair .field-name-title-field, - .node-thematique.node-38:not(.en_attente) .field-name-field-episodes .field-label, - .node-thematique.node-38:not(.en_attente) .node-episode .field-name-title-field { + .node-thematique.node-38 > h2, + .node-thematique.node-38 .group-video .field-name-field-description h3, + .node-thematique.node-38 .group-description .field-name-field-ecouter, + .node-thematique.node-38 .node-documentair .field-name-field-doc, + .node-thematique.node-38 .node-documentair .field-name-title-field, + .node-thematique.node-38 .field-name-field-episodes .field-label, + .node-thematique.node-38 .node-episode .field-name-title-field { color: #88aa00; } .node-thematique.node-3::before { background-image: url(../../images/fond-theme-3-flat.png); } - .node-thematique.node-3.en_attente::before { - background-image: url(../../images/fond-theme-3-flat-nb.jpg); } - .node-thematique.node-3.en_attente > h2, - .node-thematique.node-3.en_attente .group-video .field-name-field-description h3, - .node-thematique.node-3.en_attente .group-description .field-name-field-ecouter, - .node-thematique.node-3.en_attente .node-documentair .field-name-field-doc, - .node-thematique.node-3.en_attente .node-documentair .field-name-title-field, - .node-thematique.node-3.en_attente .field-name-field-episodes .field-label, - .node-thematique.node-3.en_attente .node-episode .field-name-title-field { - color: #aaa; } - .node-thematique.node-3:not(.en_attente) > h2, - .node-thematique.node-3:not(.en_attente) .group-video .field-name-field-description h3, - .node-thematique.node-3:not(.en_attente) .group-description .field-name-field-ecouter, - .node-thematique.node-3:not(.en_attente) .node-documentair .field-name-field-doc, - .node-thematique.node-3:not(.en_attente) .node-documentair .field-name-title-field, - .node-thematique.node-3:not(.en_attente) .field-name-field-episodes .field-label, - .node-thematique.node-3:not(.en_attente) .node-episode .field-name-title-field { + .node-thematique.node-3 > h2, + .node-thematique.node-3 .group-video .field-name-field-description h3, + .node-thematique.node-3 .group-description .field-name-field-ecouter, + .node-thematique.node-3 .node-documentair .field-name-field-doc, + .node-thematique.node-3 .node-documentair .field-name-title-field, + .node-thematique.node-3 .field-name-field-episodes .field-label, + .node-thematique.node-3 .node-episode .field-name-title-field { color: #ff6600; } .node-thematique.node-20::before { background-image: url(../../images/fond-theme-4-flat.png); } - .node-thematique.node-20.en_attente::before { - background-image: url(../../images/fond-theme-4-flat-nb.jpg); } - .node-thematique.node-20.en_attente > h2, - .node-thematique.node-20.en_attente .group-video .field-name-field-description h3, - .node-thematique.node-20.en_attente .group-description .field-name-field-ecouter, - .node-thematique.node-20.en_attente .node-documentair .field-name-field-doc, - .node-thematique.node-20.en_attente .node-documentair .field-name-title-field, - .node-thematique.node-20.en_attente .field-name-field-episodes .field-label, - .node-thematique.node-20.en_attente .node-episode .field-name-title-field { - color: #aaa; } - .node-thematique.node-20:not(.en_attente) > h2, - .node-thematique.node-20:not(.en_attente) .group-video .field-name-field-description h3, - .node-thematique.node-20:not(.en_attente) .group-description .field-name-field-ecouter, - .node-thematique.node-20:not(.en_attente) .node-documentair .field-name-field-doc, - .node-thematique.node-20:not(.en_attente) .node-documentair .field-name-title-field, - .node-thematique.node-20:not(.en_attente) .field-name-field-episodes .field-label, - .node-thematique.node-20:not(.en_attente) .node-episode .field-name-title-field { + .node-thematique.node-20 > h2, + .node-thematique.node-20 .group-video .field-name-field-description h3, + .node-thematique.node-20 .group-description .field-name-field-ecouter, + .node-thematique.node-20 .node-documentair .field-name-field-doc, + .node-thematique.node-20 .node-documentair .field-name-title-field, + .node-thematique.node-20 .field-name-field-episodes .field-label, + .node-thematique.node-20 .node-episode .field-name-title-field { color: #ff2ad4; } .node-thematique.node-26::before { background-image: url(../../images/fond-theme-5-flat.png); } - .node-thematique.node-26.en_attente::before { - background-image: url(../../images/fond-theme-5-flat-nb.jpg); } - .node-thematique.node-26.en_attente > h2, - .node-thematique.node-26.en_attente .group-video .field-name-field-description h3, - .node-thematique.node-26.en_attente .group-description .field-name-field-ecouter, - .node-thematique.node-26.en_attente .node-documentair .field-name-field-doc, - .node-thematique.node-26.en_attente .node-documentair .field-name-title-field, - .node-thematique.node-26.en_attente .field-name-field-episodes .field-label, - .node-thematique.node-26.en_attente .node-episode .field-name-title-field { - color: #aaa; } - .node-thematique.node-26:not(.en_attente) > h2, - .node-thematique.node-26:not(.en_attente) .group-video .field-name-field-description h3, - .node-thematique.node-26:not(.en_attente) .group-description .field-name-field-ecouter, - .node-thematique.node-26:not(.en_attente) .node-documentair .field-name-field-doc, - .node-thematique.node-26:not(.en_attente) .node-documentair .field-name-title-field, - .node-thematique.node-26:not(.en_attente) .field-name-field-episodes .field-label, - .node-thematique.node-26:not(.en_attente) .node-episode .field-name-title-field { + .node-thematique.node-26 > h2, + .node-thematique.node-26 .group-video .field-name-field-description h3, + .node-thematique.node-26 .group-description .field-name-field-ecouter, + .node-thematique.node-26 .node-documentair .field-name-field-doc, + .node-thematique.node-26 .node-documentair .field-name-title-field, + .node-thematique.node-26 .field-name-field-episodes .field-label, + .node-thematique.node-26 .node-episode .field-name-title-field { color: #8800aa; } .node-thematique > h2 { - font-size: 3em; + font-size: 4em; font-weight: 400; position: relative; margin: 2em 0 0; @@ -341,9 +282,12 @@ input { @media only screen and (min-width: 62.5625em) { .node-thematique > h2 { padding: 0; } } - .node-thematique > h2 span { + .node-thematique > h2 span.target { position: absolute; top: -170px; } + .node-thematique > h2 span.date { + font-size: 0.3em; + font-weight: 600; } .node-thematique .content { letter-spacing: -0.25em; } .node-thematique .content > * { @@ -362,7 +306,6 @@ input { padding: 0 1em 0 0; } .node-thematique .content article.main .field-name-body .summary { position: relative; - background-color: rgba(255, 255, 255, 0.7); transition: background-color 0.5 ease-in-out; } @media only screen and (min-width: 62.5625em) { .node-thematique .content article.main .field-name-body .summary { @@ -391,8 +334,6 @@ input { margin: 0; background-color: #fff; } @media only screen and (min-width: 62.5625em) { - .node-thematique .content article.main .field-name-body:hover .summary { - background-color: #fff; } .node-thematique .content article.main .field-name-body:hover .value { height: 700px; } } .node-thematique .content article.main .group-video { @@ -579,18 +520,6 @@ input { z-index: 10; background-color: #fff; opacity: 0.8; } - .node-thematique.en_attente .content > .main { - position: relative; } - .node-thematique.en_attente .content > .main::before { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - content: " "; - z-index: 10; - background-color: #fff; - opacity: 0.8; } #DOMWindow .embedded-video, #DOMWindow .player, #DOMWindow iframe { width: 100%; diff --git a/sites/all/themes/figureslibres/clameurs/css/styles.scss b/sites/all/themes/figureslibres/clameurs/css/styles.scss index bf946220..5541856b 100755 --- a/sites/all/themes/figureslibres/clameurs/css/styles.scss +++ b/sites/all/themes/figureslibres/clameurs/css/styles.scss @@ -159,8 +159,8 @@ $header_height_large:400px; padding-top: $header_height_large; } + @include main_centred(); >.region{ - @include main_centred(); } } @@ -293,8 +293,8 @@ $header_height_large:400px; // thematique .node-thematique{ - min-height:766px; - margin-bottom: 10em; + // min-height:766px; + margin-bottom: 7em; position: relative; &::before{ @@ -303,8 +303,8 @@ $header_height_large:400px; z-index: -1; background-position: center; background-repeat: no-repeat; - background-size: cover; + width:100%; height:100%; top:0; left:0; @media #{$large-up} { @@ -314,29 +314,39 @@ $header_height_large:400px; } } + &.en_attente::before{ + background-size: contain; + background-position: left; + } + @mixin node_thema($bg, $sb_bg, $coul){ &::before{background-image: $bg;} - &.en_attente::before{background-image: $sb_bg;} - &.en_attente{ - >h2, - .group-video .field-name-field-description h3, - .group-description .field-name-field-ecouter, - .node-documentair .field-name-field-doc, - .node-documentair .field-name-title-field, - .field-name-field-episodes .field-label, - .node-episode .field-name-title-field{ - color: #aaa;//lighten(desaturate($coul, 40%), 20%); - } - } - &:not(.en_attente){ - >h2, - .group-video .field-name-field-description h3, - .group-description .field-name-field-ecouter, - .node-documentair .field-name-field-doc, - .node-documentair .field-name-title-field, - .field-name-field-episodes .field-label, - .node-episode .field-name-title-field{color: $coul;} - } + >h2, + .group-video .field-name-field-description h3, + .group-description .field-name-field-ecouter, + .node-documentair .field-name-field-doc, + .node-documentair .field-name-title-field, + .field-name-field-episodes .field-label, + .node-episode .field-name-title-field{color: $coul;} + + // article.main{ + // .field-name-body{ + // .summary{background-color: $coul;} + // } + // } + + // &.en_attente::before{background-image: $sb_bg;} + // &.en_attente{ + // >h2, + // .group-video .field-name-field-description h3, + // .group-description .field-name-field-ecouter, + // .node-documentair .field-name-field-doc, + // .node-documentair .field-name-title-field, + // .field-name-field-episodes .field-label, + // .node-episode .field-name-title-field{ + // color: #aaa;//lighten(desaturate($coul, 40%), 20%); + // } + // } } &.node-32{ @@ -377,7 +387,7 @@ $header_height_large:400px; } >h2{ - font-size: 3em; + font-size: 4em; font-weight: 400; // padding-left: 0.18em; position:relative; @@ -386,10 +396,16 @@ $header_height_large:400px; @media #{$large-up} { padding:0; } - span{ + span.target{ position: absolute; top:-170px; } + span.date{ + font-size: 0.3em; + font-weight: 600; + // display: block; + // color: #000; + } } .content{ @@ -420,7 +436,7 @@ $header_height_large:400px; >*{padding:0 1em 0 0;} .summary{ position: relative; - background-color: transparentize(#fff, 0.3); + // background-color: transparentize(#fff, 0.2); transition: background-color 0.5 ease-in-out; @media #{$large-up} { height:7em; overflow: hidden; @@ -449,7 +465,7 @@ $header_height_large:400px; } @media #{$large-up} { &:hover{ - .summary{background-color: #fff;} + // .summary{background-color: #fff;} .value{ height:700px; } @@ -657,20 +673,20 @@ $header_height_large:400px; } } - &.en_attente{ - .content>.main{ - position: relative; - &::before{ - position: absolute; - top:0; left:0; - width:100%; height:100%; - content:" "; - z-index: 10; - background-color: #fff; - opacity: 0.8; - } - } - } + // &.en_attente{ + // .content>.main{ + // position: relative; + // &::before{ + // position: absolute; + // top:0; left:0; + // width:100%; height:100%; + // content:" "; + // z-index: 10; + // background-color: #fff; + // opacity: 0.8; + // } + // } + // } } // ____ __ diff --git a/sites/all/themes/figureslibres/clameurs/preprocess/field.pre.php b/sites/all/themes/figureslibres/clameurs/preprocess/field.pre.php index 818926cb..79fa4147 100755 --- a/sites/all/themes/figureslibres/clameurs/preprocess/field.pre.php +++ b/sites/all/themes/figureslibres/clameurs/preprocess/field.pre.php @@ -13,21 +13,27 @@ $vars['theme_hook_suggestions'][] = 'field__' . $ft . '__' . $vm; $vars['theme_hook_suggestions'][] = 'field__' . $fn . '__' . $vm; $vars['theme_hook_suggestions'][] = 'field__' . $fn . '__' . $vm; $vars['theme_hook_suggestions'][] = 'field__' . $b . '__' . $fn . '__' . $vm; +$vars['theme_hook_suggestions'][] = 'field__' . $b . '__' . $fn; -if($fn == 'body' && $vm == 'accueil' && $b == 'thematique'){ + +if($fn == 'body' && $b == 'thematique'){ + $vars['items'][0] = array( 'summary' =>array( "#type"=>"markup", "#markup"=>$element['#items'][0]['safe_summary'], "#prefix"=>"
", "#suffix"=>"
", - ), - 'value' =>array( + ) + ); + if($vm == 'accueil' ){ + $vars['items'][0]['value'] = array( "#type"=>"markup", "#markup"=>$element['#items'][0]['safe_value'], "#prefix"=>"
", "#suffix"=>"
", - ) - ); + ); + } + } diff --git a/sites/all/themes/figureslibres/clameurs/preprocess/node.pre.php b/sites/all/themes/figureslibres/clameurs/preprocess/node.pre.php index 6dccf92f..36df3e51 100755 --- a/sites/all/themes/figureslibres/clameurs/preprocess/node.pre.php +++ b/sites/all/themes/figureslibres/clameurs/preprocess/node.pre.php @@ -31,4 +31,12 @@ if($node->workflow == 3){ $vars["classes_array"][] = 'en_attente'; } +$scheduled_transitions = WorkflowScheduledTransition::load('node', $node->nid, NULL, 1); +$transition = false; +if(count($scheduled_transitions)){ + // dsm($scheduled_transitions, "scheduled_transitions"); + $transition = $scheduled_transitions[0]; +} +$vars['wf_stamp'] = $transition ? $transition->scheduled : false; + $vars["classes_array"][] = "node-".$node->nid; diff --git a/sites/all/themes/figureslibres/clameurs/templates/field--thematique--body--accueil.tpl.php b/sites/all/themes/figureslibres/clameurs/templates/field--thematique--body.tpl.php similarity index 100% rename from sites/all/themes/figureslibres/clameurs/templates/field--thematique--body--accueil.tpl.php rename to sites/all/themes/figureslibres/clameurs/templates/field--thematique--body.tpl.php diff --git a/sites/all/themes/figureslibres/clameurs/templates/node.tpl.php b/sites/all/themes/figureslibres/clameurs/templates/node.tpl.php index edf9219c..b9a681f5 100644 --- a/sites/all/themes/figureslibres/clameurs/templates/node.tpl.php +++ b/sites/all/themes/figureslibres/clameurs/templates/node.tpl.php @@ -87,9 +87,14 @@ > - + + + + + +