Explorar o código

added accriche field to Chapters

Bachir Soussi Chiadmi %!s(int64=10) %!d(string=hai) anos
pai
achega
d170d93591

+ 0 - 1
sites/all/modules/features/admin/admin.features.user_permission.inc

@@ -81,7 +81,6 @@ function admin_user_default_permissions() {
   $permissions['access content overview'] = array(
     'name' => 'access content overview',
     'roles' => array(
-      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'node',

+ 7 - 9
sites/all/modules/features/admin/admin.features.wysiwyg.inc

@@ -32,6 +32,7 @@ function admin_wysiwyg_default_profiles() {
           'link' => 1,
           'unlink' => 1,
           'image' => 1,
+          'formatselect' => 1,
           'cut' => 1,
           'copy' => 1,
           'paste' => 1,
@@ -42,9 +43,6 @@ function admin_wysiwyg_default_profiles() {
         'advlink' => array(
           'advlink' => 1,
         ),
-        'font' => array(
-          'formatselect' => 1,
-        ),
         'fullscreen' => array(
           'fullscreen' => 1,
         ),
@@ -61,8 +59,8 @@ function admin_wysiwyg_default_profiles() {
         'wordcount' => array(
           'wordcount' => 1,
         ),
-        'video_filter' => array(
-          'video_filter' => 1,
+        'imce' => array(
+          'imce' => 1,
         ),
         'drupal' => array(
           'break' => 1,
@@ -78,11 +76,11 @@ function admin_wysiwyg_default_profiles() {
       'remove_linebreaks' => 1,
       'apply_source_formatting' => 0,
       'paste_auto_cleanup_on_paste' => 1,
-      'block_formats' => 'h2,h3,h4,h5,h6',
-      'css_setting' => 'theme',
-      'css_path' => '',
+      'block_formats' => 'p,h3,h4',
+      'css_setting' => 'self',
+      'css_path' => '/sites/all/themes/gui/jee/css/wysiwyg.css',
       'css_classes' => '',
-      'buttonorder' => 'fullscreen,separator,bold,italic,underline,separator,formatselect,separator,bullist,numlist,advlist,separator,link,advlink,unlink,separator,image,advimage,video_filter,separator,cut,copy,paste,pastetext,search,replace,wordcount,separator,undo,redo,separator,break',
+      'buttonorder' => 'fullscreen,separator,bold,italic,underline,separator,separator,bullist,numlist,advlist,separator,link,advlink,unlink,separator,image,advimage,separator,cut,copy,paste,pastetext,search,replace,wordcount,separator,undo,redo,separator,break,formatselect,imce',
     ),
   );
 

+ 3 - 0
sites/all/modules/features/admin/admin.info

@@ -7,6 +7,7 @@ dependencies[] = admin_theme
 dependencies[] = adminimal_admin_menu
 dependencies[] = auto_nodetitle
 dependencies[] = backup_migrate
+dependencies[] = block
 dependencies[] = content_type_extras
 dependencies[] = context_layouts
 dependencies[] = context_ui
@@ -183,4 +184,6 @@ features[views_view][] = admin_contents
 features[workflow][] = Affichage
 features[workflow_access][] = Affichage
 features[wysiwyg][] = filtred_html
+features_exclude[dependencies][menu_editor] = menu_editor
+features_exclude[dependencies][rules] = rules
 project path = sites/all/modules/features

+ 101 - 80
sites/all/modules/features/admin/admin.views_default.inc

@@ -137,47 +137,81 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
+    'action::workflow_vbo_given_state_action' => array(
+      'selected' => 1,
+      'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+    ),
+    'action::workflow_vbo_next_state_action' => array(
+      'selected' => 0,
+      'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+    ),
     'action::node_assign_owner_action' => array(
       'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
+    ),
+    'action::views_bulk_operations_delete_revision' => array(
+      'selected' => 0,
       'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
     ),
     'action::node_unpublish_action' => array(
-      'selected' => 1,
+      'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::node_unpublish_by_keyword_action' => array(
       'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::node_save_action' => array(
       'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::system_send_email_action' => array(
       'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::views_bulk_operations_script_action' => array(
       'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
+    ),
+    'action::views_bulk_operations_modify_action' => array(
+      'selected' => 0,
       'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
+      'settings' => array(
+        'show_all_tokens' => 1,
+        'display_values' => array(
+          '_all_' => '_all_',
+        ),
+      ),
     ),
     'action::views_bulk_operations_argument_selector_action' => array(
       'selected' => 0,
@@ -189,46 +223,53 @@ function admin_views_default_views() {
       ),
     ),
     'action::node_promote_action' => array(
-      'selected' => 0,
+      'selected' => 1,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::node_publish_action' => array(
-      'selected' => 1,
+      'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::node_unpromote_action' => array(
-      'selected' => 0,
+      'selected' => 1,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::node_make_unsticky_action' => array(
-      'selected' => 0,
+      'selected' => 1,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::views_bulk_operations_delete_item' => array(
       'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
-    'action::node_make_sticky_action' => array(
+    'action::pathauto_node_update_action' => array(
       'selected' => 0,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
+    ),
+    'action::node_make_sticky_action' => array(
+      'selected' => 1,
       'postpone_processing' => 0,
+      'skip_confirmation' => 0,
+      'override_label' => 0,
+      'label' => '',
     ),
   );
   /* Champ: Contenu : Type */
@@ -252,27 +293,16 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
   $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Publié */
-  $handler->display->display_options['fields']['status']['id'] = 'status';
-  $handler->display->display_options['fields']['status']['table'] = 'node';
-  $handler->display->display_options['fields']['status']['field'] = 'status';
-  $handler->display->display_options['fields']['status']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['status']['hide_alter_empty'] = FALSE;
-  $handler->display->display_options['fields']['status']['not'] = 0;
-  /* Champ: Contenu : Langue */
-  $handler->display->display_options['fields']['language']['id'] = 'language';
-  $handler->display->display_options['fields']['language']['table'] = 'node';
-  $handler->display->display_options['fields']['language']['field'] = 'language';
-  $handler->display->display_options['fields']['language']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['language']['hide_empty'] = TRUE;
-  /* Champ: Traduction du contenu : Lien de traduction */
-  $handler->display->display_options['fields']['translate_node']['id'] = 'translate_node';
-  $handler->display->display_options['fields']['translate_node']['table'] = 'node';
-  $handler->display->display_options['fields']['translate_node']['field'] = 'translate_node';
-  $handler->display->display_options['fields']['translate_node']['alter']['alter_text'] = TRUE;
-  $handler->display->display_options['fields']['translate_node']['alter']['text'] = '<span class="button">[translate_node]</span>';
-  $handler->display->display_options['fields']['translate_node']['hide_empty'] = TRUE;
-  $handler->display->display_options['fields']['translate_node']['text'] = 'traduire';
+  /* Champ: Processus : Current state */
+  $handler->display->display_options['fields']['sid']['id'] = 'sid';
+  $handler->display->display_options['fields']['sid']['table'] = 'workflow_node';
+  $handler->display->display_options['fields']['sid']['field'] = 'sid';
+  /* Champ: Contenu : Promu en page d'accueil */
+  $handler->display->display_options['fields']['promote']['id'] = 'promote';
+  $handler->display->display_options['fields']['promote']['table'] = 'node';
+  $handler->display->display_options['fields']['promote']['field'] = 'promote';
+  $handler->display->display_options['fields']['promote']['label'] = 'Page d\'accueil';
+  $handler->display->display_options['fields']['promote']['not'] = 0;
   /* Champ: Contenu : Date de mise à jour */
   $handler->display->display_options['fields']['changed']['id'] = 'changed';
   $handler->display->display_options['fields']['changed']['table'] = 'node';
@@ -296,15 +326,8 @@ function admin_views_default_views() {
   $handler->display->display_options['filters']['type']['table'] = 'node';
   $handler->display->display_options['filters']['type']['field'] = 'type';
   $handler->display->display_options['filters']['type']['value'] = array(
-    'all' => 'all',
-    'article' => 'article',
-    'collection' => 'collection',
-    'event' => 'event',
-    'location' => 'location',
+    'chapitre' => 'chapitre',
     'page' => 'page',
-    'people' => 'people',
-    'program' => 'program',
-    'work' => 'work',
   );
   $handler->display->display_options['filters']['type']['group'] = 1;
   $handler->display->display_options['filters']['type']['exposed'] = TRUE;
@@ -313,36 +336,13 @@ function admin_views_default_views() {
   $handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op';
   $handler->display->display_options['filters']['type']['expose']['identifier'] = 'type';
   $handler->display->display_options['filters']['type']['expose']['remember'] = TRUE;
-  $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Critère de filtrage: Contenu : Publié */
-  $handler->display->display_options['filters']['status']['id'] = 'status';
-  $handler->display->display_options['filters']['status']['table'] = 'node';
-  $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = 'All';
-  $handler->display->display_options['filters']['status']['group'] = 1;
-  $handler->display->display_options['filters']['status']['exposed'] = TRUE;
-  $handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
-  $handler->display->display_options['filters']['status']['expose']['label'] = 'Publié';
-  $handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
-  $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
-  $handler->display->display_options['filters']['status']['expose']['remember'] = TRUE;
-  /* Critère de filtrage: Contenu : Langue */
-  $handler->display->display_options['filters']['language']['id'] = 'language';
-  $handler->display->display_options['filters']['language']['table'] = 'node';
-  $handler->display->display_options['filters']['language']['field'] = 'language';
-  $handler->display->display_options['filters']['language']['value'] = array(
-    'und' => 'und',
-    'en' => 'en',
-    'fr' => 'fr',
+  $handler->display->display_options['filters']['type']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+    4 => 0,
   );
-  $handler->display->display_options['filters']['language']['group'] = 1;
-  $handler->display->display_options['filters']['language']['exposed'] = TRUE;
-  $handler->display->display_options['filters']['language']['expose']['operator_id'] = 'language_op';
-  $handler->display->display_options['filters']['language']['expose']['label'] = 'Langue';
-  $handler->display->display_options['filters']['language']['expose']['operator'] = 'language_op';
-  $handler->display->display_options['filters']['language']['expose']['identifier'] = 'language';
-  $handler->display->display_options['filters']['language']['expose']['remember'] = TRUE;
-  $handler->display->display_options['filters']['language']['expose']['reduce'] = TRUE;
+  $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
   /* Critère de filtrage: current user can update */
   $handler->display->display_options['filters']['php']['id'] = 'php';
   $handler->display->display_options['filters']['php']['table'] = 'views';
@@ -354,6 +354,27 @@ function admin_views_default_views() {
 //dsm($data);
 return !(node_access(\'update\', node_load($data->nid), $user));
 ';
+  /* Critère de filtrage: Processus : Current state */
+  $handler->display->display_options['filters']['sid']['id'] = 'sid';
+  $handler->display->display_options['filters']['sid']['table'] = 'workflow_node';
+  $handler->display->display_options['filters']['sid']['field'] = 'sid';
+  $handler->display->display_options['filters']['sid']['value'] = array(
+    2 => '2',
+    3 => '3',
+  );
+  $handler->display->display_options['filters']['sid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['sid']['expose']['operator_id'] = 'sid_op';
+  $handler->display->display_options['filters']['sid']['expose']['label'] = 'Current state';
+  $handler->display->display_options['filters']['sid']['expose']['operator'] = 'sid_op';
+  $handler->display->display_options['filters']['sid']['expose']['identifier'] = 'sid';
+  $handler->display->display_options['filters']['sid']['expose']['remember'] = TRUE;
+  $handler->display->display_options['filters']['sid']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+    4 => 0,
+  );
+  $handler->display->display_options['filters']['sid']['expose']['reduce'] = TRUE;
 
   /* Display: Page : all */
   $handler = $view->new_display('page', 'Page : all', 'page');
@@ -362,7 +383,6 @@ return !(node_access(\'update\', node_load($data->nid), $user));
   $handler->display->display_options['pager']['options']['items_per_page'] = '30';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['pager']['options']['id'] = '0';
-  $handler->display->display_options['pager']['options']['expose']['items_per_page'] = TRUE;
   $handler->display->display_options['pager']['options']['expose']['items_per_page_label'] = 'Éléments par page';
   $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = TRUE;
   $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all_label'] = '- Tout -';
@@ -372,10 +392,11 @@ return !(node_access(\'update\', node_load($data->nid), $user));
   $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›';
   $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »';
   $handler->display->display_options['path'] = 'admin/content/nodes';
-  $handler->display->display_options['menu']['type'] = 'tab';
+  $handler->display->display_options['menu']['type'] = 'normal';
   $handler->display->display_options['menu']['title'] = 'Content';
   $handler->display->display_options['menu']['weight'] = '-100';
   $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
   $handler->display->display_options['tab_options']['type'] = 'normal';
   $handler->display->display_options['tab_options']['title'] = 'dashboard';
   $handler->display->display_options['tab_options']['weight'] = '0';
@@ -450,11 +471,8 @@ return !(node_access(\'update\', node_load($data->nid), $user));
     t('Type'),
     t('Titre'),
     t('<span class="node-edit">[edit_node]</span>'),
-    t('Publié'),
-    t('Langue'),
-    t('Lien de traduction'),
-    t('<span class="button">[translate_node]</span>'),
-    t('traduire'),
+    t('Current state'),
+    t('Page d\'accueil'),
     t('Date de mise à jour'),
     t('Lien de suppression'),
     t('<span class="node-delete">[delete_node]</span>'),
@@ -463,6 +481,9 @@ return !(node_access(\'update\', node_load($data->nid), $user));
     t('Block'),
     t('Recent Content'),
     t('Modifier'),
+    t('Publié'),
+    t('Langue'),
+    t('Lien de traduction'),
     t('Traduire'),
   );
   $export['admin_contents'] = $view;

+ 130 - 3
sites/all/modules/features/chapitre/chapitre.features.field_base.inc

@@ -10,6 +10,36 @@
 function chapitre_field_default_field_bases() {
   $field_bases = array();
 
+  // Exported field_base: 'field_accroche'
+  $field_bases['field_accroche'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_accroche',
+    'field_permissions' => array(
+      'type' => 0,
+    ),
+    'foreign keys' => array(
+      'format' => array(
+        'columns' => array(
+          'format' => 'format',
+        ),
+        'table' => 'filter_format',
+      ),
+    ),
+    'indexes' => array(
+      'format' => array(
+        0 => 'format',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'text',
+    'settings' => array(),
+    'translatable' => 0,
+    'type' => 'text_long',
+  );
+
   // Exported field_base: 'field_agir'
   $field_bases['field_agir'] = array(
     'active' => 1,
@@ -132,13 +162,13 @@ function chapitre_field_default_field_bases() {
     'type' => 'text',
   );
 
-  // Exported field_base: 'field_nom'
-  $field_bases['field_nom'] = array(
+  // Exported field_base: 'field_partager'
+  $field_bases['field_partager'] = array(
     'active' => 1,
     'cardinality' => 1,
     'deleted' => 0,
     'entity_types' => array(),
-    'field_name' => 'field_nom',
+    'field_name' => 'field_partager',
     'field_permissions' => array(
       'type' => 0,
     ),
@@ -190,6 +220,70 @@ function chapitre_field_default_field_bases() {
     'type' => 'field_collection',
   );
 
+  // Exported field_base: 'field_sous_titre'
+  $field_bases['field_sous_titre'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_sous_titre',
+    'field_permissions' => array(
+      'type' => 0,
+    ),
+    'foreign keys' => array(
+      'format' => array(
+        'columns' => array(
+          'format' => 'format',
+        ),
+        'table' => 'filter_format',
+      ),
+    ),
+    'indexes' => array(
+      'format' => array(
+        0 => 'format',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'text',
+    'settings' => array(
+      'max_length' => 255,
+    ),
+    'translatable' => 0,
+    'type' => 'text',
+  );
+
+  // Exported field_base: 'field_titre'
+  $field_bases['field_titre'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_titre',
+    'field_permissions' => array(
+      'type' => 0,
+    ),
+    'foreign keys' => array(
+      'format' => array(
+        'columns' => array(
+          'format' => 'format',
+        ),
+        'table' => 'filter_format',
+      ),
+    ),
+    'indexes' => array(
+      'format' => array(
+        0 => 'format',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'text',
+    'settings' => array(
+      'max_length' => 255,
+    ),
+    'translatable' => 0,
+    'type' => 'text',
+  );
+
   // Exported field_base: 'field_video'
   $field_bases['field_video'] = array(
     'active' => 1,
@@ -209,5 +303,38 @@ function chapitre_field_default_field_bases() {
     'type' => 'video_embed_field',
   );
 
+  // Exported field_base: 'field_vignette'
+  $field_bases['field_vignette'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_vignette',
+    'field_permissions' => array(
+      'type' => 0,
+    ),
+    'foreign keys' => array(
+      'fid' => array(
+        'columns' => array(
+          'fid' => 'fid',
+        ),
+        'table' => 'file_managed',
+      ),
+    ),
+    'indexes' => array(
+      'fid' => array(
+        0 => 'fid',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'image',
+    'settings' => array(
+      'default_image' => 0,
+      'uri_scheme' => 'public',
+    ),
+    'translatable' => 0,
+    'type' => 'image',
+  );
+
   return $field_bases;
 }

+ 328 - 30
sites/all/modules/features/chapitre/chapitre.features.field_instance.inc

@@ -18,11 +18,24 @@ function chapitre_field_default_field_instances() {
     'description' => '',
     'display' => array(
       'default' => array(
-        'label' => 'above',
+        'label' => 'hidden',
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 1,
+        'weight' => 3,
+      ),
+      'full' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 3,
+      ),
+      'token' => array(
+        'label' => 'hidden',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 3,
       ),
     ),
     'entity_type' => 'field_collection_item',
@@ -45,28 +58,41 @@ function chapitre_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'text_textfield',
-      'weight' => 32,
+      'weight' => 3,
     ),
   );
 
-  // Exported field_instance: 'field_collection_item-field_partie-field_nom'
-  $field_instances['field_collection_item-field_partie-field_nom'] = array(
+  // Exported field_instance: 'field_collection_item-field_partie-field_sous_titre'
+  $field_instances['field_collection_item-field_partie-field_sous_titre'] = array(
     'bundle' => 'field_partie',
     'default_value' => NULL,
     'deleted' => 0,
     'description' => '',
     'display' => array(
       'default' => array(
-        'label' => 'above',
+        'label' => 'hidden',
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 0,
+        'weight' => 2,
+      ),
+      'full' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 2,
+      ),
+      'token' => array(
+        'label' => 'hidden',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 2,
       ),
     ),
     'entity_type' => 'field_collection_item',
-    'field_name' => 'field_nom',
-    'label' => 'Nom',
+    'field_name' => 'field_sous_titre',
+    'label' => 'Sous titre',
     'required' => 0,
     'settings' => array(
       'linkit' => array(
@@ -84,7 +110,59 @@ function chapitre_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'text_textfield',
-      'weight' => 31,
+      'weight' => 2,
+    ),
+  );
+
+  // Exported field_instance: 'field_collection_item-field_partie-field_titre'
+  $field_instances['field_collection_item-field_partie-field_titre'] = array(
+    'bundle' => 'field_partie',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 1,
+      ),
+      'full' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 1,
+      ),
+      'token' => array(
+        'label' => 'hidden',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 1,
+      ),
+    ),
+    'entity_type' => 'field_collection_item',
+    'field_name' => 'field_titre',
+    'label' => 'Titre',
+    'required' => 0,
+    'settings' => array(
+      'linkit' => array(
+        'button_text' => 'Recherche',
+        'enable' => 0,
+        'profile' => '',
+      ),
+      'text_processing' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'size' => 60,
+      ),
+      'type' => 'text_textfield',
+      'weight' => 1,
     ),
   );
 
@@ -96,7 +174,7 @@ function chapitre_field_default_field_instances() {
     'description' => '',
     'display' => array(
       'default' => array(
-        'label' => 'above',
+        'label' => 'hidden',
         'module' => 'video_embed_field',
         'settings' => array(
           'description' => 1,
@@ -104,7 +182,24 @@ function chapitre_field_default_field_instances() {
           'video_style' => 'normal',
         ),
         'type' => 'video_embed_field',
-        'weight' => 2,
+        'weight' => 4,
+      ),
+      'full' => array(
+        'label' => 'hidden',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 4,
+      ),
+      'token' => array(
+        'label' => 'hidden',
+        'module' => 'video_embed_field',
+        'settings' => array(
+          'description' => 1,
+          'description_position' => 'bottom',
+          'video_style' => 'normal',
+        ),
+        'type' => 'video_embed_field',
+        'weight' => 4,
       ),
     ),
     'entity_type' => 'field_collection_item',
@@ -121,7 +216,121 @@ function chapitre_field_default_field_instances() {
       'module' => 'video_embed_field',
       'settings' => array(),
       'type' => 'video_embed_field_video',
-      'weight' => 33,
+      'weight' => 2,
+    ),
+  );
+
+  // Exported field_instance: 'field_collection_item-field_partie-field_vignette'
+  $field_instances['field_collection_item-field_partie-field_vignette'] = array(
+    'bundle' => 'field_partie',
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'hidden',
+        'module' => 'image',
+        'settings' => array(
+          'image_link' => '',
+          'image_style' => '',
+        ),
+        'type' => 'image',
+        'weight' => 0,
+      ),
+      'full' => array(
+        'label' => 'hidden',
+        'module' => 'image',
+        'settings' => array(
+          'image_link' => '',
+          'image_style' => '',
+        ),
+        'type' => 'image',
+        'weight' => 0,
+      ),
+      'token' => array(
+        'label' => 'hidden',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'field_collection_item',
+    'field_name' => 'field_vignette',
+    'label' => 'Vignette',
+    'required' => 0,
+    'settings' => array(
+      'alt_field' => 0,
+      'default_image' => 0,
+      'file_directory' => '',
+      'file_extensions' => 'png gif jpg jpeg',
+      'max_filesize' => '',
+      'max_resolution' => '',
+      'min_resolution' => '',
+      'title_field' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'image',
+      'settings' => array(
+        'preview_image_style' => 'thumbnail',
+        'progress_indicator' => 'throbber',
+      ),
+      'type' => 'image_image',
+      'weight' => 0,
+    ),
+  );
+
+  // Exported field_instance: 'node-chapitre-field_accroche'
+  $field_instances['node-chapitre-field_accroche'] = array(
+    'bundle' => 'chapitre',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'chapter' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'default' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 5,
+      ),
+      'teaser' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(
+          'trim_length' => 150,
+        ),
+        'type' => 'text_trimmed',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_accroche',
+    'label' => 'Accroche',
+    'required' => 0,
+    'settings' => array(
+      'linkit' => array(
+        'button_text' => 'Recherche',
+        'enable' => 0,
+        'profile' => '',
+      ),
+      'text_processing' => 1,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'rows' => 5,
+      ),
+      'type' => 'text_textarea',
+      'weight' => 104,
     ),
   );
 
@@ -132,18 +341,25 @@ function chapitre_field_default_field_instances() {
     'deleted' => 0,
     'description' => '',
     'display' => array(
+      'chapter' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 1,
+      ),
       'default' => array(
         'label' => 'above',
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 3,
+        'weight' => 2,
       ),
       'teaser' => array(
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 0,
+        'weight' => 5,
       ),
     ),
     'entity_type' => 'node',
@@ -166,7 +382,7 @@ function chapitre_field_default_field_instances() {
         'rows' => 10,
       ),
       'type' => 'text_textarea',
-      'weight' => 102,
+      'weight' => 107,
     ),
   );
 
@@ -177,18 +393,25 @@ function chapitre_field_default_field_instances() {
     'deleted' => 0,
     'description' => '',
     'display' => array(
+      'chapter' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 0,
+      ),
       'default' => array(
         'label' => 'above',
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 4,
+        'weight' => 3,
       ),
       'teaser' => array(
-        'label' => 'above',
+        'label' => 'hidden',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 0,
+        'weight' => 1,
       ),
     ),
     'entity_type' => 'node',
@@ -211,7 +434,7 @@ function chapitre_field_default_field_instances() {
         'rows' => 10,
       ),
       'type' => 'text_textarea',
-      'weight' => 100,
+      'weight' => 105,
     ),
   );
 
@@ -222,18 +445,25 @@ function chapitre_field_default_field_instances() {
     'deleted' => 0,
     'description' => '',
     'display' => array(
-      'default' => array(
+      'chapter' => array(
         'label' => 'above',
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
         'weight' => 2,
       ),
+      'default' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 1,
+      ),
       'teaser' => array(
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 0,
+        'weight' => 6,
       ),
     ),
     'entity_type' => 'node',
@@ -256,7 +486,58 @@ function chapitre_field_default_field_instances() {
         'rows' => 10,
       ),
       'type' => 'text_textarea',
-      'weight' => 101,
+      'weight' => 106,
+    ),
+  );
+
+  // Exported field_instance: 'node-chapitre-field_partager'
+  $field_instances['node-chapitre-field_partager'] = array(
+    'bundle' => 'chapitre',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => 'provide twitter hashtag without #',
+    'display' => array(
+      'chapter' => array(
+        'label' => 'above',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 0,
+      ),
+      'default' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 4,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 3,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_partager',
+    'label' => 'Partager',
+    'required' => 0,
+    'settings' => array(
+      'linkit' => array(
+        'button_text' => 'Recherche',
+        'enable' => 0,
+        'profile' => '',
+      ),
+      'text_processing' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'size' => 60,
+      ),
+      'type' => 'text_textfield',
+      'weight' => 108,
     ),
   );
 
@@ -267,8 +548,17 @@ function chapitre_field_default_field_instances() {
     'deleted' => 0,
     'description' => '',
     'display' => array(
+      'chapter' => array(
+        'label' => 'hidden',
+        'module' => 'field_collection',
+        'settings' => array(
+          'view_mode' => 'token',
+        ),
+        'type' => 'field_collection_fields',
+        'weight' => 3,
+      ),
       'default' => array(
-        'label' => 'above',
+        'label' => 'hidden',
         'module' => 'field_collection',
         'settings' => array(
           'add' => 'Ajouter',
@@ -278,13 +568,16 @@ function chapitre_field_default_field_instances() {
           'view_mode' => 'full',
         ),
         'type' => 'field_collection_view',
-        'weight' => 1,
+        'weight' => 0,
       ),
       'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 0,
+        'label' => 'hidden',
+        'module' => 'field_collection',
+        'settings' => array(
+          'view_mode' => 'full',
+        ),
+        'type' => 'field_collection_fields',
+        'weight' => 2,
       ),
     ),
     'entity_type' => 'node',
@@ -305,13 +598,18 @@ function chapitre_field_default_field_instances() {
 
   // Translatables
   // Included for use with string extractors like potx.
+  t('Accroche');
   t('Agir');
   t('Comprendre');
   t('Description');
   t('Débatre');
-  t('Nom');
+  t('Partager');
   t('Partie');
+  t('Sous titre');
+  t('Titre');
   t('Video');
+  t('Vignette');
+  t('provide twitter hashtag without #');
 
   return $field_instances;
 }

+ 32 - 0
sites/all/modules/features/chapitre/chapitre.field_group.inc

@@ -26,6 +26,8 @@ function chapitre_field_group_info() {
       0 => 'field_dbatre',
       1 => 'field_agir',
       2 => 'field_comprendre',
+      3 => 'field_partager',
+      4 => 'field_accroche',
     ),
     'format_type' => 'htab',
     'format_settings' => array(
@@ -94,5 +96,35 @@ function chapitre_field_group_info() {
   );
   $export['group_parties|node|chapitre|form'] = $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_texts|field_collection_item|field_partie|form';
+  $field_group->group_name = 'group_texts';
+  $field_group->entity_type = 'field_collection_item';
+  $field_group->bundle = 'field_partie';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'texts',
+    'weight' => '1',
+    'children' => array(
+      0 => 'field_description',
+      1 => 'field_titre',
+      2 => 'field_sous_titre',
+    ),
+    'format_type' => 'html5',
+    'format_settings' => array(
+      'label' => 'texts',
+      'instance_settings' => array(
+        'id' => '',
+        'classes' => 'group-texts',
+        'wrapper' => 'section',
+      ),
+      'formatter' => '',
+    ),
+  );
+  $export['group_texts|field_collection_item|field_partie|form'] = $field_group;
+
   return $export;
 }

+ 12 - 2
sites/all/modules/features/chapitre/chapitre.info

@@ -5,6 +5,7 @@ dependencies[] = ctools
 dependencies[] = features
 dependencies[] = field_collection
 dependencies[] = field_group
+dependencies[] = image
 dependencies[] = node
 dependencies[] = strongarm
 dependencies[] = text
@@ -12,22 +13,31 @@ dependencies[] = video_embed_field
 features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
+features[field_base][] = field_accroche
 features[field_base][] = field_agir
 features[field_base][] = field_comprendre
 features[field_base][] = field_dbatre
 features[field_base][] = field_description
-features[field_base][] = field_nom
+features[field_base][] = field_partager
 features[field_base][] = field_partie
+features[field_base][] = field_sous_titre
+features[field_base][] = field_titre
 features[field_base][] = field_video
+features[field_base][] = field_vignette
 features[field_group][] = group_general|node|chapitre|form
 features[field_group][] = group_htabs|node|chapitre|form
 features[field_group][] = group_parties|node|chapitre|form
+features[field_group][] = group_texts|field_collection_item|field_partie|form
 features[field_instance][] = field_collection_item-field_partie-field_description
-features[field_instance][] = field_collection_item-field_partie-field_nom
+features[field_instance][] = field_collection_item-field_partie-field_sous_titre
+features[field_instance][] = field_collection_item-field_partie-field_titre
 features[field_instance][] = field_collection_item-field_partie-field_video
+features[field_instance][] = field_collection_item-field_partie-field_vignette
+features[field_instance][] = node-chapitre-field_accroche
 features[field_instance][] = node-chapitre-field_agir
 features[field_instance][] = node-chapitre-field_comprendre
 features[field_instance][] = node-chapitre-field_dbatre
+features[field_instance][] = node-chapitre-field_partager
 features[field_instance][] = node-chapitre-field_partie
 features[node][] = chapitre
 features[user_permission][] = create chapitre content

+ 47 - 2
sites/all/modules/features/chapitre/chapitre.strongarm.inc

@@ -113,7 +113,23 @@ function chapitre_strongarm() {
   $strongarm->api_version = 1;
   $strongarm->name = 'field_bundle_settings_node__chapitre';
   $strongarm->value = array(
-    'view_modes' => array(),
+    'view_modes' => array(
+      'teaser' => array(
+        'custom_settings' => TRUE,
+      ),
+      'full' => array(
+        'custom_settings' => FALSE,
+      ),
+      'rss' => array(
+        'custom_settings' => FALSE,
+      ),
+      'token' => array(
+        'custom_settings' => FALSE,
+      ),
+      'chapter' => array(
+        'custom_settings' => TRUE,
+      ),
+    ),
     'extra_fields' => array(
       'form' => array(
         'title' => array(
@@ -129,7 +145,36 @@ function chapitre_strongarm() {
           'weight' => '99',
         ),
       ),
-      'display' => array(),
+      'display' => array(
+        'workflow_current_state' => array(
+          'default' => array(
+            'weight' => '5',
+            'visible' => FALSE,
+          ),
+          'teaser' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+          'chapter' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+        ),
+        'workflow' => array(
+          'default' => array(
+            'weight' => '4',
+            'visible' => FALSE,
+          ),
+          'teaser' => array(
+            'weight' => '7',
+            'visible' => FALSE,
+          ),
+          'chapter' => array(
+            'weight' => '5',
+            'visible' => FALSE,
+          ),
+        ),
+      ),
     ),
   );
   $export['field_bundle_settings_node__chapitre'] = $strongarm;

+ 6 - 0
sites/all/modules/features/page/page.features.field_instance.inc

@@ -17,6 +17,12 @@ function page_field_default_field_instances() {
     'deleted' => 0,
     'description' => '',
     'display' => array(
+      'chapter' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'default' => array(
         'label' => 'hidden',
         'module' => 'text',

+ 1 - 0
sites/all/modules/features/page/page.features.user_permission.inc

@@ -52,6 +52,7 @@ function page_user_default_permissions() {
   $permissions['edit own page content'] = array(
     'name' => 'edit own page content',
     'roles' => array(
+      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'node',

+ 2 - 0
sites/all/modules/features/page/page.info

@@ -17,6 +17,8 @@ features[user_permission][] = delete any page content
 features[user_permission][] = delete own page content
 features[user_permission][] = edit any page content
 features[user_permission][] = edit own page content
+features[variable][] = field_bundle_settings_node__page
+features[variable][] = language_content_type_page
 features[variable][] = menu_options_page
 features[variable][] = menu_parent_page
 features[variable][] = node_options_page

+ 52 - 1
sites/all/modules/features/page/page.strongarm.inc

@@ -10,11 +10,62 @@
 function page_strongarm() {
   $export = array();
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_node__page';
+  $strongarm->value = array(
+    'view_modes' => array(
+      'teaser' => array(
+        'custom_settings' => TRUE,
+      ),
+      'chapter' => array(
+        'custom_settings' => TRUE,
+      ),
+      'full' => array(
+        'custom_settings' => FALSE,
+      ),
+      'rss' => array(
+        'custom_settings' => FALSE,
+      ),
+      'token' => array(
+        'custom_settings' => FALSE,
+      ),
+    ),
+    'extra_fields' => array(
+      'form' => array(),
+      'display' => array(
+        'workflow_current_state' => array(
+          'default' => array(
+            'weight' => '1',
+            'visible' => FALSE,
+          ),
+        ),
+        'workflow' => array(
+          'default' => array(
+            'weight' => '2',
+            'visible' => FALSE,
+          ),
+        ),
+      ),
+    ),
+  );
+  $export['field_bundle_settings_node__page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'language_content_type_page';
+  $strongarm->value = '0';
+  $export['language_content_type_page'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'menu_options_page';
-  $strongarm->value = array();
+  $strongarm->value = array(
+    0 => 'menu-footer-menu',
+  );
   $export['menu_options_page'] = $strongarm;
 
   $strongarm = new stdClass();

+ 86 - 86
sites/all/themes/gui/jee/css/jee.css

@@ -4426,19 +4426,19 @@ div.messages {
   text-indent: -1000px;
   overflow: hidden;
 }
-/* line 463, jee.scss */
-#main .node-chapitre.node-teaser .field-name-field-comprendre {
+/* line 464, jee.scss */
+#main .node-chapitre.node-teaser .field-name-field-accroche {
   min-width: 19em;
 }
-/* line 464, jee.scss */
-#main .node-chapitre.node-teaser .field-name-field-comprendre h1, #main .node-chapitre.node-teaser .field-name-field-comprendre h2, #main .node-chapitre.node-teaser .field-name-field-comprendre h3, #main .node-chapitre.node-teaser .field-name-field-comprendre h4, #main .node-chapitre.node-teaser .field-name-field-comprendre h5, #main .node-chapitre.node-teaser .field-name-field-comprendre h6 {
+/* line 465, jee.scss */
+#main .node-chapitre.node-teaser .field-name-field-accroche h1, #main .node-chapitre.node-teaser .field-name-field-accroche h2, #main .node-chapitre.node-teaser .field-name-field-accroche h3, #main .node-chapitre.node-teaser .field-name-field-accroche h4, #main .node-chapitre.node-teaser .field-name-field-accroche h5, #main .node-chapitre.node-teaser .field-name-field-accroche h6 {
   display: none !important;
 }
-/* line 466, jee.scss */
-#main .node-chapitre.node-teaser .field-name-field-comprendre p {
+/* line 467, jee.scss */
+#main .node-chapitre.node-teaser .field-name-field-accroche p {
   margin: 0;
 }
-/* line 470, jee.scss */
+/* line 471, jee.scss */
 #main .node-chapitre.node-teaser ul.links {
   display: block;
   margin: 0;
@@ -4447,11 +4447,11 @@ div.messages {
   position: relative;
   width: 100%;
 }
-/* line 472, jee.scss */
+/* line 473, jee.scss */
 #main .node-chapitre.node-teaser ul.links li.node-readmore {
   padding: 0;
 }
-/* line 474, jee.scss */
+/* line 475, jee.scss */
 #main .node-chapitre.node-teaser ul.links li.node-readmore a {
   display: inline-block;
   height: 25px;
@@ -4463,12 +4463,12 @@ div.messages {
   background: transparent url("../assets/img/readmore-btn.png") no-repeat right center;
   background: none, url("../assets/img/readmore-btn.svg") no-repeat right center;
 }
-/* line 487, jee.scss */
+/* line 488, jee.scss */
 #main .node-chapitre.node-teaser .field-name-field-partie {
   clear: both;
   padding-top: 1em;
 }
-/* line 491, jee.scss */
+/* line 492, jee.scss */
 #main .node-chapitre.node-teaser .field-name-field-vignette {
   position: relative;
   float: left;
@@ -4479,33 +4479,33 @@ div.messages {
   margin-left: 0;
   background-size: contain;
 }
-/* line 502, jee.scss */
+/* line 503, jee.scss */
 #main .node-chapitre.node-teaser .field-name-field-vignette img {
   width: 65px;
   height: 65px;
 }
-/* line 506, jee.scss */
+/* line 507, jee.scss */
 #main .node-chapitre.node-teaser .field-type-text {
   min-width: 16em;
 }
-/* line 507, jee.scss */
+/* line 508, jee.scss */
 #main .node-chapitre.node-teaser .field-name-field-titre {
   font-family: "epflul";
   font-size: 1.4em;
   line-height: 1.1;
 }
-/* line 512, jee.scss */
+/* line 513, jee.scss */
 #main .node-chapitre.node-teaser .field-name-field-sous-titre {
   font-family: "epflul";
   font-size: 1.2em;
   line-height: 1.2;
 }
-/* line 517, jee.scss */
+/* line 518, jee.scss */
 #main .node-chapitre.node-teaser .field-name-field-description {
   font-size: 0.88em;
   line-height: 1;
 }
-/* line 523, jee.scss */
+/* line 524, jee.scss */
 #main .node-chapitre.node-teaser .line {
   z-index: -1;
   position: absolute;
@@ -4517,7 +4517,7 @@ div.messages {
   width: 2px;
   opacity: 0.4;
 }
-/* line 541, jee.scss */
+/* line 542, jee.scss */
 #main #chapter-wrapper {
   position: absolute;
   top: 0;
@@ -4544,12 +4544,12 @@ div.messages {
                                          |__|
   */
 }
-/* line 550, jee.scss */
+/* line 551, jee.scss */
 #main #chapter-wrapper.visible {
   opacity: 1;
   z-index: 500;
 }
-/* line 555, jee.scss */
+/* line 556, jee.scss */
 #main #chapter-wrapper #home-btn {
   background: transparent url("../assets/img/home-btn.png") no-repeat center center;
   background: none, url("../assets/img/home-btn.svg") no-repeat center center;
@@ -4561,129 +4561,129 @@ div.messages {
   height: 20px;
   cursor: pointer;
 }
-/* line 570, jee.scss */
+/* line 571, jee.scss */
 #main #chapter-wrapper #node-2 {
   background: transparent url("../assets/img/bgd-sol.png") no-repeat center center;
   background: none, url("../assets/img/bgd-sol.svg") no-repeat center center;
 }
-/* line 572, jee.scss */
+/* line 573, jee.scss */
 #main #chapter-wrapper #node-2 .field-type-text-long .field-label,
 #main #chapter-wrapper #node-2 h2.node-title,
 #main #chapter-wrapper #node-2 .field-name-field-dbatre li:before {
   color: #ea5b0c;
 }
-/* line 577, jee.scss */
+/* line 578, jee.scss */
 #main #chapter-wrapper #node-2 h2.node-title {
   background: transparent url("../assets/img/title-SOL-blur.png") no-repeat center center;
   background: none, url("../assets/img/title-SOL-blur.svg") no-repeat center center;
 }
-/* line 580, jee.scss */
+/* line 581, jee.scss */
 #main #chapter-wrapper #node-3 {
   background: transparent url("../assets/img/bgd-dph.png") no-repeat center center;
   background: none, url("../assets/img/bgd-dph.svg") no-repeat center center;
 }
-/* line 582, jee.scss */
+/* line 583, jee.scss */
 #main #chapter-wrapper #node-3 .field-type-text-long .field-label,
 #main #chapter-wrapper #node-3 h2.node-title,
 #main #chapter-wrapper #node-3 .field-name-field-dbatre li:before {
   color: #cecd00;
 }
-/* line 587, jee.scss */
+/* line 588, jee.scss */
 #main #chapter-wrapper #node-3 h2.node-title {
   background: transparent url("../assets/img/title-DPH-blur.png") no-repeat center center;
   background: none, url("../assets/img/title-DPH-blur.svg") no-repeat center center;
 }
-/* line 590, jee.scss */
+/* line 591, jee.scss */
 #main #chapter-wrapper #node-4 {
   background: transparent url("../assets/img/bgd-sub.png") no-repeat center center;
   background: none, url("../assets/img/bgd-sub.svg") no-repeat center center;
 }
-/* line 592, jee.scss */
+/* line 593, jee.scss */
 #main #chapter-wrapper #node-4 .field-type-text-long .field-label,
 #main #chapter-wrapper #node-4 h2.node-title,
 #main #chapter-wrapper #node-4 .field-name-field-dbatre li:before {
   color: #de003a;
 }
-/* line 597, jee.scss */
+/* line 598, jee.scss */
 #main #chapter-wrapper #node-4 h2.node-title {
   background: transparent url("../assets/img/title-SUB-blur.png") no-repeat center center;
   background: none, url("../assets/img/title-SUB-blur.svg") no-repeat center center;
 }
-/* line 600, jee.scss */
+/* line 601, jee.scss */
 #main #chapter-wrapper #node-5 {
   background: transparent url("../assets/img/bgd-bc.png") no-repeat center center;
   background: none, url("../assets/img/bgd-bc.svg") no-repeat center center;
 }
-/* line 602, jee.scss */
+/* line 603, jee.scss */
 #main #chapter-wrapper #node-5 .field-type-text-long .field-label,
 #main #chapter-wrapper #node-5 h2.node-title,
 #main #chapter-wrapper #node-5 .field-name-field-dbatre li:before {
   color: #0066b1;
 }
-/* line 607, jee.scss */
+/* line 608, jee.scss */
 #main #chapter-wrapper #node-5 h2.node-title {
   background: transparent url("../assets/img/title-BC-blur.png") no-repeat center center;
   background: none, url("../assets/img/title-BC-blur.svg") no-repeat center center;
 }
-/* line 610, jee.scss */
+/* line 611, jee.scss */
 #main #chapter-wrapper #node-6 {
   background: transparent url("../assets/img/bgd-opp.png") no-repeat center center;
   background: none, url("../assets/img/bgd-opp.svg") no-repeat center center;
 }
-/* line 612, jee.scss */
+/* line 613, jee.scss */
 #main #chapter-wrapper #node-6 .field-type-text-long .field-label,
 #main #chapter-wrapper #node-6 h2.node-title,
 #main #chapter-wrapper #node-6 .field-name-field-dbatre li:before {
   color: #af1380;
 }
-/* line 617, jee.scss */
+/* line 618, jee.scss */
 #main #chapter-wrapper #node-6 h2.node-title {
   background: transparent url("../assets/img/title-OPP-blur.png") no-repeat center center;
   background: none, url("../assets/img/title-OPP-blur.svg") no-repeat center center;
 }
-/* line 620, jee.scss */
+/* line 621, jee.scss */
 #main #chapter-wrapper #node-7 {
   background: transparent url("../assets/img/bgd-bub.png") no-repeat center center;
   background: none, url("../assets/img/bgd-bub.svg") no-repeat center center;
 }
-/* line 622, jee.scss */
+/* line 623, jee.scss */
 #main #chapter-wrapper #node-7 .field-type-text-long .field-label,
 #main #chapter-wrapper #node-7 h2.node-title,
 #main #chapter-wrapper #node-7 .field-name-field-dbatre li:before {
   color: #62a530;
 }
-/* line 627, jee.scss */
+/* line 628, jee.scss */
 #main #chapter-wrapper #node-7 h2.node-title {
   background: transparent url("../assets/img/title-DUB-blur.png") no-repeat center center;
   background: none, url("../assets/img/title-DUB-blur.svg") no-repeat center center;
 }
-/* line 630, jee.scss */
+/* line 631, jee.scss */
 #main #chapter-wrapper #node-8 {
   background: transparent url("../assets/img/bgd-juso.png") no-repeat center center;
   background: none, url("../assets/img/bgd-juso.svg") no-repeat center center;
 }
-/* line 632, jee.scss */
+/* line 633, jee.scss */
 #main #chapter-wrapper #node-8 .field-type-text-long .field-label,
 #main #chapter-wrapper #node-8 h2.node-title,
 #main #chapter-wrapper #node-8 .field-name-field-dbatre li:before {
   color: #33b4b5;
 }
-/* line 637, jee.scss */
+/* line 638, jee.scss */
 #main #chapter-wrapper #node-8 h2.node-title {
   background: transparent url("../assets/img/title-JUSO-blur.png") no-repeat center center;
   background: none, url("../assets/img/title-JUSO-blur.svg") no-repeat center center;
 }
-/* line 648, jee.scss */
+/* line 649, jee.scss */
 #main #chapter-wrapper .node {
   position: relative;
   height: 100%;
   width: 100%;
 }
-/* line 651, jee.scss */
+/* line 652, jee.scss */
 #main #chapter-wrapper .node a {
   color: inherit;
 }
-/* line 654, jee.scss */
+/* line 655, jee.scss */
 #main #chapter-wrapper .node-title {
   font-family: "epflulb";
   font-weight: normal;
@@ -4702,11 +4702,11 @@ div.messages {
   z-index: -1;
   opacity: 0.4;
 }
-/* line 670, jee.scss */
+/* line 671, jee.scss */
 #main #chapter-wrapper .node > .field, #main #chapter-wrapper .node > .block {
   position: absolute;
 }
-/* line 674, jee.scss */
+/* line 675, jee.scss */
 #main #chapter-wrapper .field-type-text-long, #main #chapter-wrapper .field-type-text {
   background-color: rgba(255, 255, 255, 0.9);
   min-height: 5em;
@@ -4715,30 +4715,30 @@ div.messages {
   z-index: 10;
   cursor: move;
 }
-/* line 680, jee.scss */
+/* line 681, jee.scss */
 #main #chapter-wrapper .field-type-text-long .field-label, #main #chapter-wrapper .field-type-text .field-label {
   text-transform: uppercase;
   font-family: "epflulb";
   font-size: 1.2em;
 }
-/* line 686, jee.scss */
+/* line 687, jee.scss */
 #main #chapter-wrapper .field-type-text-long h2, #main #chapter-wrapper .field-type-text h2 {
   font-size: 0.80em;
 }
-/* line 689, jee.scss */
+/* line 690, jee.scss */
 #main #chapter-wrapper .field-type-text-long p, #main #chapter-wrapper .field-type-text p {
   font-size: 0.80em;
   margin-bottom: 0.5em;
 }
-/* line 694, jee.scss */
+/* line 695, jee.scss */
 #main #chapter-wrapper .field-name-field-dbatre {
   left: 60em;
 }
-/* line 696, jee.scss */
+/* line 697, jee.scss */
 #main #chapter-wrapper .field-name-field-dbatre ul {
   margin-left: 1em;
 }
-/* line 698, jee.scss */
+/* line 699, jee.scss */
 #main #chapter-wrapper .field-name-field-dbatre ul li {
   list-style: none;
   line-height: 1;
@@ -4746,7 +4746,7 @@ div.messages {
   position: relative;
   font-size: 0.80em;
 }
-/* line 704, jee.scss */
+/* line 705, jee.scss */
 #main #chapter-wrapper .field-name-field-dbatre ul li:before {
   content: "?";
   position: absolute;
@@ -4754,14 +4754,14 @@ div.messages {
   left: -1em;
   font-family: "epflul";
 }
-/* line 715, jee.scss */
+/* line 716, jee.scss */
 #main #chapter-wrapper .field-name-field-partie {
   height: 60%;
   width: 100%;
   top: 20%;
   left: 0;
 }
-/* line 718, jee.scss */
+/* line 719, jee.scss */
 #main #chapter-wrapper .field-name-field-partie .field-items {
   position: relative;
   top: 0;
@@ -4769,12 +4769,12 @@ div.messages {
   height: 100%;
   width: auto;
 }
-/* line 723, jee.scss */
+/* line 724, jee.scss */
 #main #chapter-wrapper .field-name-field-partie .field-items .field {
   position: relative;
   display: inline-block;
 }
-/* line 726, jee.scss */
+/* line 727, jee.scss */
 #main #chapter-wrapper .field-name-field-partie .field-items .field .mask {
   position: absolute;
   width: 100%;
@@ -4791,7 +4791,7 @@ div.messages {
  ___/ // / / ___ |/ / _/ // /___     | |/ |/ / _, _/ ___ |/ ____/ ____/ /___/ _, _/
 /____//_/ /_/  |_/_/ /___/\____/     |__/|__/_/ |_/_/  |_/_/   /_/   /_____/_/ |_|
 */
-/* line 747, jee.scss */
+/* line 748, jee.scss */
 #static-wrapper {
   position: absolute;
   top: 15%;
@@ -4806,14 +4806,14 @@ div.messages {
   -webkit-transition-property: opacity;
           transition-property: opacity;
 }
-/* line 757, jee.scss */
+/* line 758, jee.scss */
 #static-wrapper.visible {
   opacity: 0.9;
   -webkit-transition: 1.5s ease-out;
           transition: 1.5s ease-out;
   z-index: 500;
 }
-/* line 763, jee.scss */
+/* line 764, jee.scss */
 #static-wrapper > .close {
   position: absolute;
   top: 20px;
@@ -4825,14 +4825,14 @@ div.messages {
   background: transparent url("../assets/img/close.png") no-repeat center center;
   background: none, url("../assets/img/close.svg") no-repeat center center;
 }
-/* line 772, jee.scss */
+/* line 773, jee.scss */
 #static-wrapper > .inner {
   padding: 5em 7em;
   width: 100%;
   height: 100%;
   overflow: hidden;
 }
-/* line 776, jee.scss */
+/* line 777, jee.scss */
 #static-wrapper > .inner > .node {
   width: 100%;
   height: 100%;
@@ -4840,26 +4840,26 @@ div.messages {
   overflow-x: hidden;
   padding-right: 1.5em;
 }
-/* line 783, jee.scss */
+/* line 784, jee.scss */
 #static-wrapper h2.node-title {
   font-family: "epflulb";
   text-transform: uppercase !important;
   font-size: 3em;
   color: #000;
 }
-/* line 791, jee.scss */
+/* line 792, jee.scss */
 #static-wrapper .content h3 {
   font-family: "epflulb";
   font-size: 2em;
   text-transform: uppercase !important;
   color: #8d198f;
 }
-/* line 798, jee.scss */
+/* line 799, jee.scss */
 #static-wrapper .content h4 {
   font-size: 1em;
   font-weight: 700;
 }
-/* line 805, jee.scss */
+/* line 806, jee.scss */
 #static-wrapper .content p {
   font-family: "open_sans", sans-serif;
   font-weight: 600;
@@ -4873,60 +4873,60 @@ div.messages {
  / __/ / /_/ / /_/ / / / / /___/ _, _/
 /_/    \____/\____/ /_/ /_____/_/ |_|
 */
-/* line 822, jee.scss */
+/* line 823, jee.scss */
 #footer {
   position: fixed;
   bottom: 0;
   right: 20px;
   z-index: 900;
 }
-/* line 827, jee.scss */
+/* line 828, jee.scss */
 body.chapter-displayed #footer {
   display: none;
 }
-/* line 831, jee.scss */
+/* line 832, jee.scss */
 #footer .block {
   display: inline-block;
   vertical-align: top;
   font-size: 0.5em;
 }
-/* line 835, jee.scss */
+/* line 836, jee.scss */
 #footer .block p {
   font-size: inherit;
 }
-/* line 836, jee.scss */
+/* line 837, jee.scss */
 #footer .block a {
   color: #000;
 }
-/* line 839, jee.scss */
+/* line 840, jee.scss */
 #footer .block-menu {
   display: block;
   font-size: inherit;
 }
-/* line 842, jee.scss */
+/* line 843, jee.scss */
 #footer .block-menu ul {
   margin: 0;
   padding: 0;
 }
-/* line 844, jee.scss */
+/* line 845, jee.scss */
 #footer .block-menu ul li {
   margin: 0 1em 0 0;
   padding: 0;
   display: inline-block;
   list-style: none;
 }
-/* line 848, jee.scss */
+/* line 849, jee.scss */
 #footer .block-menu ul li a {
   font-family: "epflulb";
   color: #000;
   text-transform: uppercase;
   font-size: 0.6em;
 }
-/* line 858, jee.scss */
+/* line 859, jee.scss */
 #footer p {
   margin: 0;
 }
-/* line 862, jee.scss */
+/* line 863, jee.scss */
 #footer #block-block-1 {
   display: none;
 }
@@ -4938,7 +4938,7 @@ body.chapter-displayed #footer {
  / /  / // / ___/ / /___
 /_/  /_/___//____/\____/
 */
-/* line 871, jee.scss */
+/* line 872, jee.scss */
 #loader {
   position: absolute;
   top: 50%;
@@ -4955,13 +4955,13 @@ body.chapter-displayed #footer {
   -webkit-transition-property: opacity;
           transition-property: opacity;
 }
-/* line 882, jee.scss */
+/* line 883, jee.scss */
 body.loading #loader {
   z-index: 1000;
   opacity: 1;
 }
 
-/* line 888, jee.scss */
+/* line 889, jee.scss */
 #fullscreen-btn {
   position: fixed;
   right: 20px;
@@ -4975,13 +4975,13 @@ body.loading #loader {
   background: transparent url("../assets/img/fullscreen-on.png") no-repeat center center;
   background: none, url("../assets/img/fullscreen-on.svg") no-repeat center center;
 }
-/* line 897, jee.scss */
+/* line 898, jee.scss */
 .fullscreen #fullscreen-btn {
   background: transparent url("../assets/img/fullscreen-off.png") no-repeat center center;
   background: none, url("../assets/img/fullscreen-off.svg") no-repeat center center;
 }
 
-/* line 910, jee.scss */
+/* line 911, jee.scss */
 .bubble-1 {
   position: absolute;
   z-index: 0;
@@ -4994,7 +4994,7 @@ body.loading #loader {
   left: -200px;
 }
 
-/* line 914, jee.scss */
+/* line 915, jee.scss */
 .bubble-2 {
   position: absolute;
   z-index: 0;
@@ -5007,7 +5007,7 @@ body.loading #loader {
   right: -400px;
 }
 
-/* line 919, jee.scss */
+/* line 920, jee.scss */
 .star {
   position: absolute;
   z-index: 0;
@@ -5025,7 +5025,7 @@ body.loading #loader {
  / /_/ / /___/ /_/ / /_/ / /_/ /
 /_____/_____/_____/\____/\____/
 */
-/* line 933, jee.scss */
+/* line 934, jee.scss */
 #fps {
   position: fixed;
   bottom: 40px;
@@ -5033,7 +5033,7 @@ body.loading #loader {
   z-index: 1000;
 }
 
-/* line 939, jee.scss */
+/* line 940, jee.scss */
 #nav-cursor {
   position: absolute;
   width: 6px;

+ 2 - 1
sites/all/themes/gui/jee/css/jee.scss

@@ -460,7 +460,8 @@ div.messages{
       // position:relative;
     }
 
-    .field-name-field-comprendre{
+    // .field-name-field-comprendre
+    .field-name-field-accroche{
       h1,h2,h3,h4,h5,h6{display:none!important;}
       // max-width:15em;
       p{margin:0;}

+ 4 - 2
sites/all/themes/gui/jee/templates/node--chapitre--teaser.tpl.php

@@ -8,11 +8,13 @@
     // dsm($content, "content");
     hide($content['comments']);
     hide($content['links']);
-    hide($content['field_comprendre']);
+    // hide($content['field_comprendre']);
+    hide($content['field_accroche']);
     ?>
     <div class="texts">
     <?php
-      print render($content['field_comprendre']);
+      // print render($content['field_comprendre']);
+      print render($content['field_accroche']);
       print render($content['links']);
     ?>
     </div>