updated/sunc feautures betxeen local and online

frequently_asked_questions/frequently_asked_questions.features.inc

@@ -7,8 +7,7 @@
 /**
  * Implements hook_ctools_plugin_api().
  */
-function frequently_asked_questions_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
+function frequently_asked_questions_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }

frequently_asked_questions/frequently_asked_questions.features.taxonomy.inc

@@ -13,11 +13,11 @@ function frequently_asked_questions_taxonomy_default_vocabularies() {
       'name' => 'faq categories',
       'machine_name' => 'faq_categories',
       'description' => '',
-      'hierarchy' => '0',
+      'hierarchy' => 0,
       'module' => 'taxonomy',
-      'weight' => '0',
+      'weight' => 0,
       'language' => 'und',
-      'i18n_mode' => '1',
+      'i18n_mode' => 1,
     ),
   );
 }

frequently_asked_questions/frequently_asked_questions.features.user_permission.inc

@@ -10,129 +10,129 @@
 function frequently_asked_questions_user_default_permissions() {
   $permissions = array();
 
-  // Exported permission: administer faq.
+  // Exported permission: 'administer faq'.
   $permissions['administer faq'] = array(
     'name' => 'administer faq',
     'roles' => array(
-      0 => 'root',
+      'root' => 'root',
     ),
     'module' => 'faq',
   );
 
-  // Exported permission: administer faq order.
+  // Exported permission: 'administer faq order'.
   $permissions['administer faq order'] = array(
     'name' => 'administer faq order',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'root',
+      'administrator' => 'administrator',
+      'root' => 'root',
     ),
     'module' => 'faq',
   );
 
-  // Exported permission: create faq content.
+  // Exported permission: 'create faq content'.
   $permissions['create faq content'] = array(
     'name' => 'create faq content',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'root',
+      'administrator' => 'administrator',
+      'root' => 'root',
     ),
     'module' => 'node',
   );
 
-  // Exported permission: delete any faq content.
+  // Exported permission: 'delete any faq content'.
   $permissions['delete any faq content'] = array(
     'name' => 'delete any faq content',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'root',
+      'administrator' => 'administrator',
+      'root' => 'root',
     ),
     'module' => 'node',
   );
 
-  // Exported permission: delete own faq content.
+  // Exported permission: 'delete own faq content'.
   $permissions['delete own faq content'] = array(
     'name' => 'delete own faq content',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'root',
+      'administrator' => 'administrator',
+      'root' => 'root',
     ),
     'module' => 'node',
   );
 
-  // Exported permission: edit any faq content.
+  // Exported permission: 'edit any faq content'.
   $permissions['edit any faq content'] = array(
     'name' => 'edit any faq content',
     'roles' => array(
-      0 => 'administrator',
-      1 => 'root',
+      'administrator' => 'administrator',
+      'root' => 'root',
     ),
     'module' => 'node',
   );
 
-  // Exported permission: edit own faq content.
+  // Exported permission: 'edit own faq content'.
   $permissions['edit own faq content'] = array(
     'name' => 'edit own faq content',
     'roles' => array(
-      0 => 'root',
+      'root' => 'root',
     ),
     'module' => 'node',
   );
 
-  // Exported permission: enter faq revision log entry.
+  // Exported permission: 'enter faq revision log entry'.
   $permissions['enter faq revision log entry'] = array(
     'name' => 'enter faq revision log entry',
     'roles' => array(),
     'module' => 'override_node_options',
   );
 
-  // Exported permission: override faq authored by option.
+  // Exported permission: 'override faq authored by option'.
   $permissions['override faq authored by option'] = array(
     'name' => 'override faq authored by option',
     'roles' => array(),
     'module' => 'override_node_options',
   );
 
-  // Exported permission: override faq authored on option.
+  // Exported permission: 'override faq authored on option'.
   $permissions['override faq authored on option'] = array(
     'name' => 'override faq authored on option',
     'roles' => array(),
     'module' => 'override_node_options',
   );
 
-  // Exported permission: override faq promote to front page option.
+  // Exported permission: 'override faq promote to front page option'.
   $permissions['override faq promote to front page option'] = array(
     'name' => 'override faq promote to front page option',
     'roles' => array(),
     'module' => 'override_node_options',
   );
 
-  // Exported permission: override faq published option.
+  // Exported permission: 'override faq published option'.
   $permissions['override faq published option'] = array(
     'name' => 'override faq published option',
     'roles' => array(),
     'module' => 'override_node_options',
   );
 
-  // Exported permission: override faq revision option.
+  // Exported permission: 'override faq revision option'.
   $permissions['override faq revision option'] = array(
     'name' => 'override faq revision option',
     'roles' => array(),
     'module' => 'override_node_options',
   );
 
-  // Exported permission: override faq sticky option.
+  // Exported permission: 'override faq sticky option'.
   $permissions['override faq sticky option'] = array(
     'name' => 'override faq sticky option',
     'roles' => array(),
     'module' => 'override_node_options',
   );
 
-  // Exported permission: view faq page.
+  // Exported permission: 'view faq page'.
   $permissions['view faq page'] = array(
     'name' => 'view faq page',
     'roles' => array(
-      0 => 'authenticated user',
-      1 => 'root',
+      'authenticated user' => 'authenticated user',
+      'root' => 'root',
     ),
     'module' => 'faq',
   );

frequently_asked_questions/frequently_asked_questions.info

@@ -1,15 +1,15 @@
 name = frequently asked questions
 core = 7.x
 package = Materio
-php = 5.2.4
 dependencies[] = ctools
 dependencies[] = faq
 dependencies[] = features
+dependencies[] = node
 dependencies[] = override_node_options
 dependencies[] = strongarm
 dependencies[] = taxonomy
 features[ctools][] = strongarm:strongarm:1
-features[features_api][] = api:1
+features[features_api][] = api:2
 features[taxonomy][] = faq_categories
 features[user_permission][] = administer faq
 features[user_permission][] = administer faq order
@@ -54,3 +54,4 @@ features[variable][] = faq_title
 features[variable][] = faq_use_categories
 features[variable][] = faq_use_teaser
 features[variable][] = nodeformscols_field_placements_faq_default
+project path = sites/all/modules/features

frequently_asked_questions/frequently_asked_questions.strongarm.inc

@@ -35,7 +35,7 @@ function frequently_asked_questions_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'faq_category_display';
-  $strongarm->value = 'categories_inline';
+  $strongarm->value = 'none';
   $export['faq_category_display'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -84,7 +84,7 @@ function frequently_asked_questions_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'faq_disable_node_links';
-  $strongarm->value = 1;
+  $strongarm->value = 0;
   $export['faq_disable_node_links'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -160,7 +160,7 @@ function frequently_asked_questions_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'faq_question_long_form';
-  $strongarm->value = 1;
+  $strongarm->value = 0;
   $export['faq_question_long_form'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -174,7 +174,7 @@ function frequently_asked_questions_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'faq_show_node_links';
-  $strongarm->value = 0;
+  $strongarm->value = 1;
   $export['faq_show_node_links'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -202,7 +202,7 @@ function frequently_asked_questions_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'faq_use_teaser';
-  $strongarm->value = 0;
+  $strongarm->value = 1;
   $export['faq_use_teaser'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -212,13 +212,13 @@ function frequently_asked_questions_strongarm() {
   $strongarm->value = array(
     'title' => array(
       'region' => 'main',
-      'weight' => '0',
+      'weight' => '1',
       'has_required' => TRUE,
       'title' => 'Question',
     ),
     'additional_settings' => array(
       'region' => 'main',
-      'weight' => '4',
+      'weight' => '5',
       'has_required' => FALSE,
       'title' => 'Vertical tabs',
       'hidden' => 0,
@@ -227,21 +227,14 @@ function frequently_asked_questions_strongarm() {
       'region' => 'right',
       'weight' => '3',
       'has_required' => FALSE,
-      'title' => 'Enregistrer',
+      'title' => 'Save',
       'hidden' => 0,
     ),
     'language' => array(
       'region' => 'right',
       'weight' => '1',
       'has_required' => FALSE,
-      'title' => 'Langue',
-      'hidden' => 0,
-    ),
-    'detailed_question' => array(
-      'region' => 'main',
-      'weight' => '2',
-      'has_required' => FALSE,
-      'title' => 'Question details',
+      'title' => 'Language',
       'hidden' => 0,
     ),
     'body' => array(
@@ -257,12 +250,17 @@ function frequently_asked_questions_strongarm() {
       'has_required' => TRUE,
       'title' => 'Categories',
     ),
+    'title_field' => array(
+      'region' => 'main',
+      'weight' => '0',
+      'has_required' => TRUE,
+      'title' => 'Title',
+    ),
     'workflow' => array(
       'region' => 'right',
       'weight' => '2',
       'has_required' => FALSE,
-      'title' => 'Publication',
-      'collapsed' => 0,
+      'title' => 'Importé',
       'hidden' => 0,
     ),
   );