ソースを参照

switch from video filter to video embed field

Bachir Soussi Chiadmi 8 年 前
コミット
21c45a967e

+ 42 - 12
sites/all/modules/features/admin/admin.features.inc

@@ -29,7 +29,7 @@ function admin_workflow_default_workflows() {
   // Exported workflow: Publication
   $workflows['Publication'] = array(
     'name' => 'Publication',
-    'tab_roles' => 4,
+    'tab_roles' => 'author,3,4',
     'options' => 'a:4:{s:16:"comment_log_node";s:1:"0";s:15:"comment_log_tab";s:1:"0";s:13:"name_as_title";s:1:"0";s:12:"watchdog_log";s:1:"0";}',
     'states' => array(
       0 => array(
@@ -40,14 +40,21 @@ function admin_workflow_default_workflows() {
         'name' => 'Publication',
       ),
       1 => array(
-        'state' => 'Masqué',
+        'state' => 'Brouillon',
         'weight' => -20,
         'sysid' => 0,
         'status' => 1,
         'name' => 'Publication',
       ),
       2 => array(
-        'state' => 'Affiché',
+        'state' => 'En attente',
+        'weight' => -20,
+        'sysid' => 0,
+        'status' => 1,
+        'name' => 'Publication',
+      ),
+      3 => array(
+        'state' => 'Publié',
         'weight' => -20,
         'sysid' => 0,
         'status' => 1,
@@ -58,26 +65,49 @@ function admin_workflow_default_workflows() {
       0 => array(
         'roles' => 'workflow_features_author_name,administrator,root',
         'state' => '(creation)',
-        'target_state' => 'Masqué',
+        'target_state' => 'Brouillon',
       ),
       1 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
+        'roles' => 'administrator,root',
         'state' => '(creation)',
-        'target_state' => 'Affiché',
+        'target_state' => 'En attente',
       ),
       2 => array(
-        'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Masqué',
-        'target_state' => 'Affiché',
+        'roles' => 'administrator,root',
+        'state' => '(creation)',
+        'target_state' => 'Publié',
       ),
       3 => array(
         'roles' => 'workflow_features_author_name,administrator,root',
-        'state' => 'Affiché',
-        'target_state' => 'Masqué',
+        'state' => 'Brouillon',
+        'target_state' => 'En attente',
+      ),
+      4 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'En attente',
+        'target_state' => 'Brouillon',
+      ),
+      5 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'En attente',
+        'target_state' => 'Publié',
+      ),
+      6 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Publié',
+        'target_state' => 'Brouillon',
+      ),
+      7 => array(
+        'roles' => 'workflow_features_author_name,administrator,root',
+        'state' => 'Publié',
+        'target_state' => 'En attente',
       ),
     ),
     'node_types' => array(
-      0 => 'page',
+      0 => 'documentair',
+      1 => 'episode',
+      2 => 'page',
+      3 => 'thematique',
     ),
   );
 

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

@@ -685,8 +685,6 @@ function admin_user_default_permissions() {
     'name' => 'participate in workflow',
     'roles' => array(
       'administrator' => 'administrator',
-      'anonymous user' => 'anonymous user',
-      'authenticated user' => 'authenticated user',
       'root' => 'root',
     ),
     'module' => 'workflow_admin_ui',
@@ -713,6 +711,7 @@ function admin_user_default_permissions() {
   $permissions['schedule workflow transitions'] = array(
     'name' => 'schedule workflow transitions',
     'roles' => array(
+      'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'workflow',

+ 38 - 12
sites/all/modules/features/admin/admin.features.workflow_access.inc

@@ -11,58 +11,84 @@ function admin_workflow_access_features_default_settings() {
   $workflows = array();
 
   $workflows['Publication'] = array();
-  $workflows['Publication']['Masqué'] = array();
-  $workflows['Publication']['Masqué']['administrator'] = array(
+  $workflows['Publication']['Brouillon'] = array();
+  $workflows['Publication']['Brouillon']['administrator'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
     'grant_delete' => 1,
   );
-  $workflows['Publication']['Masqué']['root'] = array(
+  $workflows['Publication']['Brouillon']['root'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
     'grant_delete' => 1,
   );
-  $workflows['Publication']['Masqué']['workflow_features_author_name'] = array(
+  $workflows['Publication']['Brouillon']['workflow_features_author_name'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
     'grant_delete' => 1,
   );
-  $workflows['Publication']['Masqué']['anonymous user'] = array(
+  $workflows['Publication']['Brouillon']['anonymous user'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Masqué']['authenticated user'] = array(
+  $workflows['Publication']['Brouillon']['authenticated user'] = array(
     'grant_view' => 0,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Affiché'] = array();
-  $workflows['Publication']['Affiché']['anonymous user'] = array(
+  $workflows['Publication']['En attente'] = array();
+  $workflows['Publication']['En attente']['anonymous user'] = array(
     'grant_view' => 1,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Affiché']['authenticated user'] = array(
+  $workflows['Publication']['En attente']['authenticated user'] = array(
     'grant_view' => 1,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Affiché']['administrator'] = array(
+  $workflows['Publication']['En attente']['administrator'] = array(
     'grant_view' => 0,
     'grant_update' => 1,
     'grant_delete' => 1,
   );
-  $workflows['Publication']['Affiché']['root'] = array(
+  $workflows['Publication']['En attente']['root'] = array(
     'grant_view' => 0,
     'grant_update' => 1,
     'grant_delete' => 1,
   );
-  $workflows['Publication']['Affiché']['workflow_features_author_name'] = array(
+  $workflows['Publication']['En attente']['workflow_features_author_name'] = array(
     'grant_view' => 0,
     'grant_update' => 1,
     'grant_delete' => 1,
   );
+  $workflows['Publication']['Publié'] = array();
+  $workflows['Publication']['Publié']['anonymous user'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['authenticated user'] = array(
+    'grant_view' => 1,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['administrator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['Publié']['root'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 1,
+  );
+  $workflows['Publication']['Publié']['workflow_features_author_name'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
 
   return $workflows;
 }

+ 1 - 1
sites/all/modules/features/admin/admin.strongarm.inc

@@ -1028,7 +1028,7 @@ function admin_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'site_frontpage';
-  $strongarm->value = 'node';
+  $strongarm->value = 'home';
   $export['site_frontpage'] = $strongarm;
 
   $strongarm = new stdClass();

+ 178 - 109
sites/all/modules/features/admin/admin.views_default.inc

@@ -22,7 +22,7 @@ function admin_views_default_views() {
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
-  $handler->display->display_options['title'] = 'Contenu';
+  $handler->display->display_options['title'] = 'Content';
   $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['use_more_text'] = 'plus';
   $handler->display->display_options['access']['type'] = 'role';
@@ -37,9 +37,8 @@ function admin_views_default_views() {
   $handler->display->display_options['exposed_form']['type'] = 'basic';
   $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Filtrer';
   $handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE;
-  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'réinitialiser';
+  $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'reset';
   $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Trier par';
-  $handler->display->display_options['exposed_form']['options']['autosubmit'] = TRUE;
   $handler->display->display_options['pager']['type'] = 'mini';
   $handler->display->display_options['pager']['options']['items_per_page'] = '20';
   $handler->display->display_options['pager']['options']['offset'] = '0';
@@ -47,19 +46,19 @@ function admin_views_default_views() {
   $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_label'] = '- Tout -';
   $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Décalage';
-  $handler->display->display_options['pager']['options']['tags']['first'] = '« premier';
-  $handler->display->display_options['pager']['options']['tags']['previous'] = '‹ précédent';
-  $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›';
-  $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »';
   $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
     'views_bulk_operations' => 'views_bulk_operations',
+    'field_video' => 'field_video',
     'type' => 'title',
     'title' => 'title',
     'edit_node' => 'title',
-    'status' => 'status',
-    'language' => 'language',
-    'translate_node' => 'language',
+    'sid' => 'sid',
+    'sid_1' => 'sid',
+    'scheduled' => 'sid',
+    'field_thematique' => 'field_thematique',
+    'field_episodes' => 'field_episodes',
+    'translate_node' => 'translate_node',
     'changed' => 'changed',
     'delete_node' => 'delete_node',
   );
@@ -70,6 +69,13 @@ function admin_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
+    'field_video' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
     'type' => array(
       'sortable' => 0,
       'default_sort_order' => 'asc',
@@ -89,18 +95,37 @@ function admin_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'status' => array(
+    'sid' => array(
       'sortable' => 0,
       'default_sort_order' => 'asc',
       'align' => '',
       'separator' => '<br />',
       'empty_column' => 0,
     ),
-    'language' => array(
+    'sid_1' => array(
       'sortable' => 0,
       'default_sort_order' => 'asc',
       'align' => '',
-      'separator' => '<br />',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'scheduled' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_thematique' => array(
+      'sortable' => 0,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
+    ),
+    'field_episodes' => array(
+      'align' => '',
+      'separator' => '',
       'empty_column' => 0,
     ),
     'translate_node' => array(
@@ -122,11 +147,11 @@ function admin_views_default_views() {
     ),
   );
   $handler->display->display_options['style_options']['override'] = FALSE;
-  /* En-tête: Global : Result summary */
+  /* Header: Global: Result summary */
   $handler->display->display_options['header']['result']['id'] = 'result';
   $handler->display->display_options['header']['result']['table'] = 'views';
   $handler->display->display_options['header']['result']['field'] = 'result';
-  /* Champ: Opérations en masse : Contenu */
+  /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
@@ -134,37 +159,55 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['row_clickable'] = 1;
   $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' => 1,
+      'override_label' => 0,
+      'label' => '',
+    ),
     'action::node_unpublish_action' => array(
       'selected' => 1,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
     'action::node_publish_action' => array(
       'selected' => 1,
+      'postpone_processing' => 0,
       'skip_confirmation' => 0,
       'override_label' => 0,
       'label' => '',
-      'postpone_processing' => 0,
     ),
   );
-  /* Champ: Contenu : Type */
+  /* Field: Content: Video */
+  $handler->display->display_options['fields']['field_emvideo']['id'] = 'field_emvideo';
+  $handler->display->display_options['fields']['field_emvideo']['table'] = 'field_data_field_emvideo';
+  $handler->display->display_options['fields']['field_emvideo']['field'] = 'field_emvideo';
+  $handler->display->display_options['fields']['field_emvideo']['click_sort_column'] = 'video_url';
+  $handler->display->display_options['fields']['field_emvideo']['type'] = 'video_embed_field_thumbnail';
+  $handler->display->display_options['fields']['field_emvideo']['settings'] = array(
+    'image_style' => 'thumbnail',
+    'image_link' => '',
+  );
+  /* Field: Content: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
   $handler->display->display_options['fields']['type']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
@@ -173,33 +216,67 @@ 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 */
+  /* Field: Workflow: 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';
+  /* Field: Workflow: Scheduled state */
+  $handler->display->display_options['fields']['sid_1']['id'] = 'sid_1';
+  $handler->display->display_options['fields']['sid_1']['table'] = 'workflow_scheduled_transition';
+  $handler->display->display_options['fields']['sid_1']['field'] = 'sid';
+  $handler->display->display_options['fields']['sid_1']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['sid_1']['alter']['text'] = '[sid_1] : [scheduled]';
+  $handler->display->display_options['fields']['sid_1']['hide_empty'] = TRUE;
+  /* Field: Workflow: Scheduled time */
+  $handler->display->display_options['fields']['scheduled']['id'] = 'scheduled';
+  $handler->display->display_options['fields']['scheduled']['table'] = 'workflow_scheduled_transition';
+  $handler->display->display_options['fields']['scheduled']['field'] = 'scheduled';
+  $handler->display->display_options['fields']['scheduled']['alter']['alter_text'] = TRUE;
+  $handler->display->display_options['fields']['scheduled']['alter']['text'] = '[sid_1] : [scheduled]';
+  $handler->display->display_options['fields']['scheduled']['hide_empty'] = TRUE;
+  $handler->display->display_options['fields']['scheduled']['empty_zero'] = TRUE;
+  $handler->display->display_options['fields']['scheduled']['date_format'] = 'custom';
+  $handler->display->display_options['fields']['scheduled']['custom_date_format'] = 'd/m/Y h:m';
+  $handler->display->display_options['fields']['scheduled']['second_date_format'] = 'long';
+  /* Field: Content: Épisodes */
+  $handler->display->display_options['fields']['field_episodes']['id'] = 'field_episodes';
+  $handler->display->display_options['fields']['field_episodes']['table'] = 'field_data_field_episodes';
+  $handler->display->display_options['fields']['field_episodes']['field'] = 'field_episodes';
+  $handler->display->display_options['fields']['field_episodes']['settings'] = array(
+    'link' => 1,
+  );
+  $handler->display->display_options['fields']['field_episodes']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_episodes']['multi_type'] = 'ol';
+  /* Field: Content: éclairages */
+  $handler->display->display_options['fields']['field_eclairages']['id'] = 'field_eclairages';
+  $handler->display->display_options['fields']['field_eclairages']['table'] = 'field_data_field_eclairages';
+  $handler->display->display_options['fields']['field_eclairages']['field'] = 'field_eclairages';
+  $handler->display->display_options['fields']['field_eclairages']['settings'] = array(
+    'link' => 1,
+  );
+  $handler->display->display_options['fields']['field_eclairages']['delta_offset'] = '0';
+  $handler->display->display_options['fields']['field_eclairages']['multi_type'] = 'ol';
+  /* Field: Content: Thématique */
+  $handler->display->display_options['fields']['field_thematique']['id'] = 'field_thematique';
+  $handler->display->display_options['fields']['field_thematique']['table'] = 'field_data_field_thematique';
+  $handler->display->display_options['fields']['field_thematique']['field'] = 'field_thematique';
+  $handler->display->display_options['fields']['field_thematique']['settings'] = array(
+    'link' => 1,
+  );
+  /* Field: Content translation: Translate link */
   $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: Contenu : Date de mise à jour */
+  $handler->display->display_options['fields']['translate_node']['text'] = 'translate';
+  /* Field: Content: Updated date */
   $handler->display->display_options['fields']['changed']['id'] = 'changed';
   $handler->display->display_options['fields']['changed']['table'] = 'node';
   $handler->display->display_options['fields']['changed']['field'] = 'changed';
   $handler->display->display_options['fields']['changed']['date_format'] = 'short';
-  /* Champ: Contenu : Lien de suppression */
+  /* Field: Content: Delete link */
   $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
   $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
@@ -207,25 +284,20 @@ function admin_views_default_views() {
   $handler->display->display_options['fields']['delete_node']['alter']['text'] = '<span class="node-delete">[delete_node]</span>';
   $handler->display->display_options['fields']['delete_node']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['delete_node']['hide_empty'] = TRUE;
-  $handler->display->display_options['fields']['delete_node']['text'] = 'supprimer';
+  $handler->display->display_options['fields']['delete_node']['text'] = 'delete';
   $handler->display->display_options['filter_groups']['groups'] = array(
     1 => 'AND',
     2 => 'AND',
   );
-  /* Critère de filtrage: Contenu : Type */
+  /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type']['id'] = 'type';
   $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',
+    'documentair' => 'documentair',
     'page' => 'page',
-    'people' => 'people',
-    'program' => 'program',
-    'work' => 'work',
+    'thematique' => 'thematique',
+    'episode' => 'episode',
   );
   $handler->display->display_options['filters']['type']['group'] = 1;
   $handler->display->display_options['filters']['type']['exposed'] = TRUE;
@@ -234,37 +306,14 @@ 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;
-  /* Critère de filtrage: current user can update */
+  $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
+  /* Filter criterion: current user can update */
   $handler->display->display_options['filters']['php']['id'] = 'php';
   $handler->display->display_options['filters']['php']['table'] = 'views';
   $handler->display->display_options['filters']['php']['field'] = 'php';
@@ -275,6 +324,21 @@ function admin_views_default_views() {
 //dsm($data);
 return !(node_access(\'update\', node_load($data->nid), $user));
 ';
+  /* Filter criterion: Workflow: 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']['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_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+    4 => 0,
+  );
 
   /* Display: Page : all */
   $handler = $view->new_display('page', 'Page : all', 'page');
@@ -284,14 +348,7 @@ return !(node_access(\'update\', node_load($data->nid), $user));
   $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 -';
-  $handler->display->display_options['pager']['options']['expose']['offset_label'] = 'Décalage';
-  $handler->display->display_options['pager']['options']['tags']['first'] = '« premier';
-  $handler->display->display_options['pager']['options']['tags']['previous'] = '‹ précédent';
-  $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']['title'] = 'Content';
@@ -310,81 +367,93 @@ return !(node_access(\'update\', node_load($data->nid), $user));
   $handler->display->display_options['pager']['options']['items_per_page'] = '10';
   $handler->display->display_options['pager']['options']['offset'] = '0';
   $handler->display->display_options['defaults']['fields'] = FALSE;
-  /* Champ: Contenu : Type */
+  /* Field: Content: Type */
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
   $handler->display->display_options['fields']['type']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Titre */
+  /* Field: Content: Title */
   $handler->display->display_options['fields']['title']['id'] = 'title';
   $handler->display->display_options['fields']['title']['table'] = 'node';
   $handler->display->display_options['fields']['title']['field'] = 'title';
   $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Lien de modification */
+  /* Field: Content: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['label'] = 'Modifier';
+  $handler->display->display_options['fields']['edit_node']['label'] = 'Edit';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
   $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = FALSE;
-  /* Champ: Contenu : Publié */
+  /* Field: Content: Published */
   $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 */
+  /* Field: Content: Language */
   $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_alter_empty'] = FALSE;
-  /* Champ: Traduction du contenu : Lien de traduction */
+  /* Field: Content translation: Translate link */
   $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']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['translate_node']['hide_alter_empty'] = FALSE;
-  $handler->display->display_options['fields']['translate_node']['text'] = 'Traduire';
+  $handler->display->display_options['fields']['translate_node']['text'] = 'Translate';
   $translatables['admin_contents'] = array(
     t('Master'),
-    t('Contenu'),
+    t('Content'),
     t('plus'),
     t('Filtrer'),
-    t('réinitialiser'),
+    t('reset'),
     t('Trier par'),
     t('Asc'),
     t('Desc'),
     t('Éléments par page'),
     t('- Tout -'),
     t('Décalage'),
-    t('« premier'),
-    t('‹ précédent'),
-    t('suivant ›'),
-    t('dernier »'),
+    t('« first'),
+    t('‹ previous'),
+    t('next ›'),
+    t('last »'),
     t('Displaying @start - @end of @total'),
-    t('- Choisir une opération -'),
+    t('- Choose an operation -'),
+    t('Video'),
     t('Type'),
-    t('Titre'),
+    t('Title'),
     t('<span class="node-edit">[edit_node]</span>'),
-    t('Publié'),
-    t('Langue'),
-    t('Lien de traduction'),
+    t('Current state'),
+    t('Scheduled state'),
+    t('[sid_1] : [scheduled]'),
+    t('Scheduled time'),
+    t('Épisodes'),
+    t('éclairages'),
+    t('Thématique'),
+    t('Translate link'),
     t('<span class="button">[translate_node]</span>'),
-    t('traduire'),
-    t('Date de mise à jour'),
-    t('Lien de suppression'),
+    t('translate'),
+    t('Updated date'),
+    t('Delete link'),
     t('<span class="node-delete">[delete_node]</span>'),
-    t('supprimer'),
+    t('delete'),
     t('Page : all'),
+    t('more'),
+    t('Items per page'),
+    t('- All -'),
+    t('Offset'),
     t('Block'),
     t('Recent Content'),
-    t('Modifier'),
-    t('Traduire'),
+    t('Edit'),
+    t('Published'),
+    t('Language'),
+    t('Translate'),
   );
   $export['admin_contents'] = $view;
 

+ 20 - 27
sites/all/modules/features/clameurs/clameurs.features.field_base.inc

@@ -251,6 +251,26 @@ function clameurs_field_default_field_bases() {
     'type' => 'taxonomy_term_reference',
   );
 
+  // Exported field_base: 'field_emvideo'.
+  $field_bases['field_emvideo'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_emvideo',
+    'field_permissions' => array(
+      'type' => 0,
+    ),
+    'indexes' => array(),
+    'locked' => 0,
+    'module' => 'video_embed_field',
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+    ),
+    'translatable' => 0,
+    'type' => 'video_embed_field',
+  );
+
   // Exported field_base: 'field_episodes'.
   $field_bases['field_episodes'] = array(
     'active' => 1,
@@ -390,32 +410,5 @@ function clameurs_field_default_field_bases() {
     'type' => 'entityreference',
   );
 
-  // Exported field_base: 'field_video'.
-  $field_bases['field_video'] = array(
-    'active' => 1,
-    'cardinality' => 1,
-    'deleted' => 0,
-    'entity_types' => array(),
-    'field_name' => 'field_video',
-    'field_permissions' => array(
-      'type' => 0,
-    ),
-    'indexes' => array(
-      'height' => array(
-        0 => 'height',
-      ),
-      'width' => array(
-        0 => 'width',
-      ),
-    ),
-    'locked' => 0,
-    'module' => 'video_filter_field',
-    'settings' => array(
-      'entity_translation_sync' => FALSE,
-    ),
-    'translatable' => 0,
-    'type' => 'video_filter',
-  );
-
   return $field_bases;
 }

+ 152 - 121
sites/all/modules/features/clameurs/clameurs.features.field_instance.inc

@@ -244,7 +244,7 @@ function clameurs_field_default_field_instances() {
           'trim_length' => 600,
         ),
         'type' => 'text_summary_or_trimmed',
-        'weight' => 2,
+        'weight' => 1,
       ),
     ),
     'entity_type' => 'node',
@@ -310,7 +310,7 @@ function clameurs_field_default_field_instances() {
         'rows' => 5,
       ),
       'type' => 'text_textarea',
-      'weight' => 7,
+      'weight' => 103,
     ),
   );
 
@@ -362,8 +362,8 @@ function clameurs_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-documentair-field_thematique'.
-  $field_instances['node-documentair-field_thematique'] = array(
+  // Exported field_instance: 'node-documentair-field_emvideo'.
+  $field_instances['node-documentair-field_emvideo'] = array(
     'bundle' => 'documentair',
     'default_value' => NULL,
     'deleted' => 0,
@@ -371,43 +371,53 @@ function clameurs_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'entityreference',
+        'module' => 'video_embed_field',
         'settings' => array(
-          'link' => FALSE,
+          'description' => 1,
+          'description_position' => 'bottom',
+          'video_style' => 'normal',
         ),
-        'type' => 'entityreference_label',
-        'weight' => 3,
+        'type' => 'video_embed_field',
+        'weight' => 5,
       ),
       'teaser' => array(
-        'label' => 'above',
-        'settings' => array(),
-        'type' => 'hidden',
-        'weight' => 5,
+        'label' => 'hidden',
+        'module' => 'video_embed_field',
+        'settings' => array(
+          'description' => 1,
+          'description_position' => 'bottom',
+          'image_link' => 'source',
+          'image_style' => 'large',
+        ),
+        'type' => 'video_embed_field_thumbnail',
+        'weight' => 2,
       ),
     ),
     'entity_type' => 'node',
-    'field_name' => 'field_thematique',
-    'label' => 'Thématique',
+    'field_name' => 'field_emvideo',
+    'label' => 'Video',
     'required' => 0,
     'settings' => array(
+      'allowed_providers' => array(
+        'vimeo' => 'vimeo',
+        'youtube' => 'youtube',
+      ),
+      'description_field' => 0,
+      'description_length' => 128,
       'entity_translation_sync' => FALSE,
       'user_register_form' => FALSE,
     ),
     'widget' => array(
-      'active' => 1,
-      'module' => 'entityreference',
-      'settings' => array(
-        'match_operator' => 'CONTAINS',
-        'path' => '',
-        'size' => 60,
-      ),
-      'type' => 'entityreference_autocomplete',
-      'weight' => 2,
+      'active' => 0,
+      'module' => 'video_embed_field',
+      'settings' => array(),
+      'type' => 'video_embed_field_video',
+      'weight' => 101,
     ),
   );
 
-  // Exported field_instance: 'node-documentair-field_video'.
-  $field_instances['node-documentair-field_video'] = array(
+  // Exported field_instance: 'node-documentair-field_thematique'.
+  $field_instances['node-documentair-field_thematique'] = array(
     'bundle' => 'documentair',
     'default_value' => NULL,
     'deleted' => 0,
@@ -415,36 +425,38 @@ function clameurs_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'video_filter_field',
-        'settings' => array(),
-        'type' => 'video_filter_field_default',
-        'weight' => 2,
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => FALSE,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 3,
       ),
       'teaser' => array(
-        'label' => 'hidden',
-        'module' => 'video_filter_field',
+        'label' => 'above',
         'settings' => array(),
-        'type' => 'video_filter_field_default',
-        'weight' => 1,
+        'type' => 'hidden',
+        'weight' => 5,
       ),
     ),
     'entity_type' => 'node',
-    'field_name' => 'field_video',
-    'label' => 'Video',
+    'field_name' => 'field_thematique',
+    'label' => 'Thématique',
     'required' => 0,
     'settings' => array(
-      'autoplay' => 0,
       'entity_translation_sync' => FALSE,
-      'max_height' => 400,
-      'max_width' => 400,
       'user_register_form' => FALSE,
     ),
     'widget' => array(
-      'active' => 0,
-      'module' => 'video_filter_field',
-      'settings' => array(),
-      'type' => 'video_filter',
-      'weight' => 6,
+      'active' => 1,
+      'module' => 'entityreference',
+      'settings' => array(
+        'match_operator' => 'CONTAINS',
+        'path' => '',
+        'size' => 60,
+      ),
+      'type' => 'entityreference_autocomplete',
+      'weight' => 2,
     ),
   );
 
@@ -469,7 +481,7 @@ function clameurs_field_default_field_instances() {
           'trim_length' => 600,
         ),
         'type' => 'text_summary_or_trimmed',
-        'weight' => 2,
+        'weight' => 1,
       ),
     ),
     'entity_type' => 'node',
@@ -535,7 +547,61 @@ function clameurs_field_default_field_instances() {
         'rows' => 5,
       ),
       'type' => 'text_textarea',
-      'weight' => 4,
+      'weight' => 103,
+    ),
+  );
+
+  // Exported field_instance: 'node-episode-field_emvideo'.
+  $field_instances['node-episode-field_emvideo'] = array(
+    'bundle' => 'episode',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'video_embed_field',
+        'settings' => array(
+          'description' => 1,
+          'description_position' => 'bottom',
+          'video_style' => 'normal',
+        ),
+        'type' => 'video_embed_field',
+        'weight' => 5,
+      ),
+      'teaser' => array(
+        'label' => 'hidden',
+        'module' => 'video_embed_field',
+        'settings' => array(
+          'description' => 1,
+          'description_position' => 'bottom',
+          'image_link' => 'source',
+          'image_style' => 'medium',
+        ),
+        'type' => 'video_embed_field_thumbnail',
+        'weight' => 2,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_emvideo',
+    'label' => 'Video',
+    'required' => 0,
+    'settings' => array(
+      'allowed_providers' => array(
+        'vimeo' => 'vimeo',
+        'youtube' => 'youtube',
+      ),
+      'description_field' => 0,
+      'description_length' => 128,
+      'entity_translation_sync' => FALSE,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 0,
+      'module' => 'video_embed_field',
+      'settings' => array(),
+      'type' => 'video_embed_field_video',
+      'weight' => 101,
     ),
   );
 
@@ -637,48 +703,6 @@ function clameurs_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-episode-field_video'.
-  $field_instances['node-episode-field_video'] = array(
-    'bundle' => 'episode',
-    'default_value' => NULL,
-    'deleted' => 0,
-    'description' => '',
-    'display' => array(
-      'default' => array(
-        'label' => 'above',
-        'module' => 'video_filter_field',
-        'settings' => array(),
-        'type' => 'video_filter_field_default',
-        'weight' => 1,
-      ),
-      'teaser' => array(
-        'label' => 'hidden',
-        'module' => 'video_filter_field',
-        'settings' => array(),
-        'type' => 'video_filter_field_default',
-        'weight' => 1,
-      ),
-    ),
-    'entity_type' => 'node',
-    'field_name' => 'field_video',
-    'label' => 'Video',
-    'required' => 0,
-    'settings' => array(
-      'autoplay' => 0,
-      'entity_translation_sync' => FALSE,
-      'max_height' => 400,
-      'max_width' => 400,
-      'user_register_form' => FALSE,
-    ),
-    'widget' => array(
-      'active' => 0,
-      'module' => 'video_filter_field',
-      'settings' => array(),
-      'type' => 'video_filter',
-      'weight' => 3,
-    ),
-  );
-
   // Exported field_instance: 'node-thematique-body'.
   $field_instances['node-thematique-body'] = array(
     'bundle' => 'thematique',
@@ -766,7 +790,7 @@ function clameurs_field_default_field_instances() {
         'rows' => 5,
       ),
       'type' => 'text_textarea',
-      'weight' => 6,
+      'weight' => 103,
     ),
   );
 
@@ -856,8 +880,8 @@ function clameurs_field_default_field_instances() {
     ),
   );
 
-  // Exported field_instance: 'node-thematique-field_episodes'.
-  $field_instances['node-thematique-field_episodes'] = array(
+  // Exported field_instance: 'node-thematique-field_emvideo'.
+  $field_instances['node-thematique-field_emvideo'] = array(
     'bundle' => 'thematique',
     'default_value' => NULL,
     'deleted' => 0,
@@ -865,12 +889,14 @@ function clameurs_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'entityreference',
+        'module' => 'video_embed_field',
         'settings' => array(
-          'link' => FALSE,
+          'description' => 1,
+          'description_position' => 'bottom',
+          'video_style' => 'normal',
         ),
-        'type' => 'entityreference_label',
-        'weight' => 3,
+        'type' => 'video_embed_field',
+        'weight' => 7,
       ),
       'teaser' => array(
         'label' => 'above',
@@ -880,28 +906,30 @@ function clameurs_field_default_field_instances() {
       ),
     ),
     'entity_type' => 'node',
-    'field_name' => 'field_episodes',
-    'label' => 'Épisodes',
+    'field_name' => 'field_emvideo',
+    'label' => 'Video',
     'required' => 0,
     'settings' => array(
+      'allowed_providers' => array(
+        'vimeo' => 'vimeo',
+        'youtube' => 'youtube',
+      ),
+      'description_field' => 1,
+      'description_length' => 128,
       'entity_translation_sync' => FALSE,
       'user_register_form' => FALSE,
     ),
     'widget' => array(
-      'active' => 1,
-      'module' => 'entityreference',
-      'settings' => array(
-        'match_operator' => 'CONTAINS',
-        'path' => '',
-        'size' => 60,
-      ),
-      'type' => 'entityreference_autocomplete',
-      'weight' => 7,
+      'active' => 0,
+      'module' => 'video_embed_field',
+      'settings' => array(),
+      'type' => 'video_embed_field_video',
+      'weight' => 101,
     ),
   );
 
-  // Exported field_instance: 'node-thematique-field_video'.
-  $field_instances['node-thematique-field_video'] = array(
+  // Exported field_instance: 'node-thematique-field_episodes'.
+  $field_instances['node-thematique-field_episodes'] = array(
     'bundle' => 'thematique',
     'default_value' => NULL,
     'deleted' => 0,
@@ -909,10 +937,12 @@ function clameurs_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'above',
-        'module' => 'video_filter_field',
-        'settings' => array(),
-        'type' => 'video_filter_field_default',
-        'weight' => 1,
+        'module' => 'entityreference',
+        'settings' => array(
+          'link' => FALSE,
+        ),
+        'type' => 'entityreference_label',
+        'weight' => 3,
       ),
       'teaser' => array(
         'label' => 'above',
@@ -922,22 +952,23 @@ function clameurs_field_default_field_instances() {
       ),
     ),
     'entity_type' => 'node',
-    'field_name' => 'field_video',
-    'label' => 'Video',
+    'field_name' => 'field_episodes',
+    'label' => 'Épisodes',
     'required' => 0,
     'settings' => array(
-      'autoplay' => 0,
       'entity_translation_sync' => FALSE,
-      'max_height' => 400,
-      'max_width' => 400,
       'user_register_form' => FALSE,
     ),
     'widget' => array(
-      'active' => 0,
-      'module' => 'video_filter_field',
-      'settings' => array(),
-      'type' => 'video_filter',
-      'weight' => 5,
+      'active' => 1,
+      'module' => 'entityreference',
+      'settings' => array(
+        'match_operator' => 'CONTAINS',
+        'path' => '',
+        'size' => 60,
+      ),
+      'type' => 'entityreference_autocomplete',
+      'weight' => 7,
     ),
   );
 

+ 3 - 0
sites/all/modules/features/clameurs/clameurs.field_group.inc

@@ -244,6 +244,7 @@ function clameurs_field_group_info() {
     'children' => array(
       0 => 'field_video',
       1 => 'field_description',
+      2 => 'field_emvideo',
     ),
     'format_type' => 'htab',
     'format_settings' => array(
@@ -273,6 +274,7 @@ function clameurs_field_group_info() {
     'children' => array(
       0 => 'field_video',
       1 => 'field_description',
+      2 => 'field_emvideo',
     ),
     'format_type' => 'htab',
     'format_settings' => array(
@@ -302,6 +304,7 @@ function clameurs_field_group_info() {
     'children' => array(
       0 => 'field_video',
       1 => 'field_description',
+      2 => 'field_emvideo',
     ),
     'format_type' => 'htab',
     'format_settings' => array(

+ 5 - 4
sites/all/modules/features/clameurs/clameurs.info

@@ -23,6 +23,7 @@ dependencies[] = rules
 dependencies[] = strongarm
 dependencies[] = taxonomy
 dependencies[] = text
+dependencies[] = video_embed_field
 dependencies[] = video_filter_field
 features[cer][] = node:documentair:field_thematique*node:thematique:field_eclairages
 features[cer][] = node:thematique:field_episodes*node:episode:field_thematique
@@ -40,11 +41,11 @@ features[field_base][] = field_description
 features[field_base][] = field_doc
 features[field_base][] = field_eclairages
 features[field_base][] = field_ecouter
+features[field_base][] = field_emvideo
 features[field_base][] = field_episodes
 features[field_base][] = field_habiter
 features[field_base][] = field_legende
 features[field_base][] = field_thematique
-features[field_base][] = field_video
 features[field_group][] = group_eclairage|node|thematique|form
 features[field_group][] = group_episodes|node|thematique|form
 features[field_group][] = group_htabs|node|documentair|form
@@ -65,19 +66,19 @@ features[field_instance][] = file-image-field_legende
 features[field_instance][] = node-documentair-body
 features[field_instance][] = node-documentair-field_description
 features[field_instance][] = node-documentair-field_doc
+features[field_instance][] = node-documentair-field_emvideo
 features[field_instance][] = node-documentair-field_thematique
-features[field_instance][] = node-documentair-field_video
 features[field_instance][] = node-episode-body
 features[field_instance][] = node-episode-field_description
+features[field_instance][] = node-episode-field_emvideo
 features[field_instance][] = node-episode-field_habiter
 features[field_instance][] = node-episode-field_thematique
-features[field_instance][] = node-episode-field_video
 features[field_instance][] = node-thematique-body
 features[field_instance][] = node-thematique-field_description
 features[field_instance][] = node-thematique-field_eclairages
 features[field_instance][] = node-thematique-field_ecouter
+features[field_instance][] = node-thematique-field_emvideo
 features[field_instance][] = node-thematique-field_episodes
-features[field_instance][] = node-thematique-field_video
 features[node][] = documentair
 features[node][] = episode
 features[node][] = thematique

+ 10 - 7
sites/all/modules/features/clameurs/clameurs.panels_default.inc

@@ -113,19 +113,22 @@ function clameurs_default_panels_mini() {
   $display->content['new-3d79c2a1-ab4e-4a2d-a4d6-3a3960f7ae93'] = $pane;
   $display->panels['left'][0] = 'new-3d79c2a1-ab4e-4a2d-a4d6-3a3960f7ae93';
   $pane = new stdClass();
-  $pane->pid = 'new-31bfe1c2-ad6d-43bf-9abf-1da110424deb';
+  $pane->pid = 'new-5cb200c4-da2c-4eba-972d-24012a9136b7';
   $pane->panel = 'left';
   $pane->type = 'entity_field';
-  $pane->subtype = 'node:field_video';
+  $pane->subtype = 'node:field_emvideo';
   $pane->shown = TRUE;
   $pane->access = array();
   $pane->configuration = array(
     'label' => 'hidden',
-    'formatter' => 'video_filter_field_default',
+    'formatter' => 'video_embed_field_thumbnail',
     'delta_limit' => 0,
     'delta_offset' => '0',
     'delta_reversed' => FALSE,
-    'formatter_settings' => array(),
+    'formatter_settings' => array(
+      'image_style' => 'large',
+      'image_link' => 'source',
+    ),
     'context' => 'requiredcontext_entity:node_1',
     'override_title' => 0,
     'override_title_text' => '',
@@ -139,9 +142,9 @@ function clameurs_default_panels_mini() {
   $pane->extras = array();
   $pane->position = 1;
   $pane->locks = array();
-  $pane->uuid = '31bfe1c2-ad6d-43bf-9abf-1da110424deb';
-  $display->content['new-31bfe1c2-ad6d-43bf-9abf-1da110424deb'] = $pane;
-  $display->panels['left'][1] = 'new-31bfe1c2-ad6d-43bf-9abf-1da110424deb';
+  $pane->uuid = '5cb200c4-da2c-4eba-972d-24012a9136b7';
+  $display->content['new-5cb200c4-da2c-4eba-972d-24012a9136b7'] = $pane;
+  $display->panels['left'][1] = 'new-5cb200c4-da2c-4eba-972d-24012a9136b7';
   $pane = new stdClass();
   $pane->pid = 'new-5c424baf-2ef8-471e-a7f5-d8a5d8048b59';
   $pane->panel = 'right';

+ 6 - 0
sites/all/modules/features/clameurs/clameurs.strongarm.inc

@@ -27,6 +27,9 @@ function clameurs_strongarm() {
         'redirect' => array(
           'weight' => '9',
         ),
+        'workflow' => array(
+          'weight' => '99',
+        ),
       ),
       'display' => array(
         'workflow_current_state' => array(
@@ -63,6 +66,9 @@ function clameurs_strongarm() {
         'redirect' => array(
           'weight' => '5',
         ),
+        'workflow' => array(
+          'weight' => '99',
+        ),
       ),
       'display' => array(
         'workflow_current_state' => array(