From d3dcf44a1e8ff1c9b8a5dca6e55b100b604d1386 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 20 Apr 2015 18:44:52 +0200 Subject: [PATCH] updated features after last modules updates --- .../uc_restrict_qty/uc_restrict_qty.info | 6 +- .../uc_restrict_qty/uc_restrict_qty.install | 20 - .../uc_restrict_qty/uc_restrict_qty.module | 170 +++++---- .../uc_termsofservice/uc_termsofservice.info | 4 +- .../users/user_import_delete/LICENSE.txt | 339 ----------------- .../users/user_import_delete/README.txt | 61 --- .../user_import_delete.info | 18 - .../user_import_delete.install | 103 ----- .../user_import_delete.module | 219 ----------- ...rio_administration.features.menu_links.inc | 2 + .../materio_administration.info | 2 +- .../materio_administration.views_default.inc | 355 +++++++++--------- .../materio_bookmarks.features.inc | 8 - ...erio_content_types.features.field_base.inc | 149 -------- ..._content_types.features.field_instance.inc | 19 +- .../materio_content_types.features.inc | 33 +- .../materio_content_types.info | 1 - .../materio_content_types.views_default.inc | 11 +- ...erio_subscriptions.features.field_base.inc | 40 -- .../materio_subscriptions.features.inc | 1 + .../materio_subscriptions.info | 1 - .../materio_user_import.info | 1 - ...erio_user_profiles.features.field_base.inc | 103 ----- ..._user_profiles.features.field_instance.inc | 26 +- 24 files changed, 305 insertions(+), 1387 deletions(-) delete mode 100644 sites/all/modules/contrib/users/user_import_delete/LICENSE.txt delete mode 100644 sites/all/modules/contrib/users/user_import_delete/README.txt delete mode 100644 sites/all/modules/contrib/users/user_import_delete/user_import_delete.info delete mode 100644 sites/all/modules/contrib/users/user_import_delete/user_import_delete.install delete mode 100644 sites/all/modules/contrib/users/user_import_delete/user_import_delete.module diff --git a/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.info b/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.info index 01c3d104..0611567c 100644 --- a/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.info +++ b/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.info @@ -4,9 +4,9 @@ dependencies[] = uc_cart package = Ubercart - extra core = 7.x -; Information added by drupal.org packaging script on 2013-10-19 -version = "7.x-1.0+0-dev" +; Information added by Drupal.org packaging script on 2015-03-27 +version = "7.x-1.1" core = "7.x" project = "uc_restrict_qty" -datestamp = "1382149607" +datestamp = "1427491982" diff --git a/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.install b/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.install index 536fd2e7..79bdb44d 100644 --- a/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.install +++ b/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.install @@ -73,23 +73,3 @@ function uc_restrict_qty_uninstall() { db_query("DELETE FROM {variable} WHERE name LIKE 'uc_restrict_qty_%%'"); } -/** - * Implements hook_update_N(). - * - * If updating from an earlier version than 6.x-2.0, the database needs to be installed. - */ -function uc_restrict_qty_update_6200() { - $ret = array(); - uc_restrict_qty_install(); - return $ret; -} - - -/** - * Add lifetime value to the scheme. - */ -function uc_restrict_qty_update_6201() { - $ret = array(); - db_add_field($ret, 'uc_restrict_qty_products', 'lifetime', array('type' => 'int', 'size' => 'tiny', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 1)); - return $ret; -} diff --git a/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.module b/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.module index 1591c610..44d25fa5 100644 --- a/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.module +++ b/sites/all/modules/contrib/ecommerce/uc_restrict_qty/uc_restrict_qty.module @@ -2,24 +2,24 @@ /** * @file - * Restrict the quantity on specified products so that only specified quantity may be purchased - * at a time. + * Restrict the quantity on specified products so that only specified quantity + * may be purchased at a time. */ /** - * Implementation of hook_theme(). + * Implements hook_theme(). */ function uc_restrict_qty_theme() { - return array( - 'restrict_qty_field' => array( - 'render element' => 'form', - ), - ); + return array( + 'restrict_qty_field' => array( + 'render element' => 'form', + ), + ); } /** - * Implementation of hook_uc_product_feature(). + * Implements hook_uc_product_feature(). */ function uc_restrict_qty_uc_product_feature() { $features[] = array( @@ -32,8 +32,10 @@ function uc_restrict_qty_uc_product_feature() { return $features; } -// Adds settings to the product features form for UC Restrict Qty. -function uc_restrict_qty_settings() { +/** + * Adds settings to the product features form for UC Restrict Qty. + */ +function uc_restrict_qty_settings($form, &$form_state) { $form['#description'] = t('This feature is limited in scope to preventing a user from adding different products to the cart. This does not restrict the quantity of products in the cart if updated after being added, so this feature is best used on sites where all products have a restrict quantity feature on them.'); $form['uc_restrict_qty_global'] = array( @@ -46,10 +48,10 @@ function uc_restrict_qty_settings() { ); $form['uc_restrict_qty_global_replace'] = array( '#title' => t('Replace Contents'), - '#type' => 'checkbox', + '#type' => 'checkbox', '#description' => t('Enabling this feature will cause the users cart to be emptied if they add more items than the Global Limit set above. This is best used when you offer mutually exclusive content (such as subscription services) where purchasing more then one product is not a valid option.'), '#default_value' => variable_get('uc_restrict_qty_global_replace', FALSE), - ); + ); $form['defaults'] = array( '#title' => t('Defaults'), '#type' => 'fieldset', @@ -73,7 +75,9 @@ function uc_restrict_qty_settings() { return $form; } -// Validates the textfield on the product features settings form. +/** + * Validates the textfield on the product features settings form. + */ function uc_restrict_qty_settings_validate($form, &$form_state) { if (!is_numeric($form_state['values']['uc_restrict_qty_global']) || $form_state['values']['uc_restrict_qty_global'] < 0) { form_set_error('uc_restrict_qty_global', t('You must enter 0 or a positive number value.')); @@ -83,9 +87,11 @@ function uc_restrict_qty_settings_validate($form, &$form_state) { } } -// Builds the form to display for adding or editing a the restricted quantity feature. +/** + * Builds the form to display for adding or editing a the restricted quantity feature. + */ function uc_restrict_qty_feature_form($form, &$form_state, $node, $feature) { - $models = uc_product_get_models($node->nid); + $models = uc_product_get_models($node->nid, FALSE); if (!empty($feature)) { $product_qty = db_query("SELECT * FROM {uc_restrict_qty_products} WHERE pfid = :pfid", array(':pfid' => $feature['pfid']))->fetchObject(); @@ -102,15 +108,6 @@ function uc_restrict_qty_feature_form($form, &$form_state, $node, $feature) { '#value' => $product_qty->rqpid, ); } -/* if ($result = db_result(db_query("SELECT COUNT(*) FROM {uc_product_features} WHERE nid = %d AND fid = '%s'", $node->nid, 'restrict_qty'))) { - drupal_set_message(t('Adding more than one Restrict Qty. does nothing for now.', 'error')); - $form['no_roles'] = array( - '#value' => t('You need to create new roles before any can be added as product features.', array('!url' => url('admin/user/roles', array('query' => 'destination=admin/store/settings/products/edit/features')))), - '#prefix' => '

', - '#suffix' => '

', - ); - return $form; - }*/ $form['nid'] = array( '#type' => 'value', @@ -140,14 +137,16 @@ function uc_restrict_qty_feature_form($form, &$form_state, $node, $feature) { return uc_product_feature_form($form, $form_state, $node, $feature); } -// Validates the textfield on the product features settings form. +/** + * Validates the textfield on the product node feature settings form. + */ function uc_restrict_qty_feature_form_validate($form, &$form_state) { - // Invalid quantity? + // Check for invalid quantity. if (!is_numeric($form_state['values']['quantity']) || $form_state['values']['quantity'] < 0) { form_set_error('uc_restrict_qty_product_qty', t('You must enter 0 or a positive integer value.')); } - // This feature is already set on this SKU? + // Check if this feature is already set on this SKU. $product_roles = db_query("SELECT * FROM {uc_restrict_qty_products} WHERE nid = :nid AND model = :model", array( ':nid' => $form_state['values']['nid'], ':model' => $form_state['values']['model'], @@ -161,7 +160,7 @@ function uc_restrict_qty_feature_form_validate($form, &$form_state) { /** * Form submit handler for the roles feature form. */ -function uc_restrict_qty_feature_form_submit($form, &$form_state) {dpm($form_state); +function uc_restrict_qty_feature_form_submit($form, &$form_state) { $product_qty = array( 'rqpid' => isset($form_state['values']['rqpid']) ? $form_state['values']['rqpid'] : NULL, 'pfid' => isset($form_state['values']['pfid']) ? $form_state['values']['pfid'] : NULL, @@ -171,9 +170,9 @@ function uc_restrict_qty_feature_form_submit($form, &$form_state) {dpm($form_sta 'lifetime' => $form_state['values']['lifetime'], ); - $description = ''. t('SKU') .': '. (empty($product_qty['model']) ? t('Any') : $product_qty['model']) .'
'; - $description .= ''. t('Quantity restriction') .': '. $product_qty['qty'] .'
'; - $description .= ''. t('Type') .': '. ($product_qty['lifetime'] ? t('Lifetime') : t('Cart max.')) .'
'; + $description = '' . t('SKU') . ':' . (empty($product_qty['model']) ? t('Any') : $product_qty['model']) . '
'; + $description .= '' . t('Quantity restriction') . ':' . $product_qty['qty'] . '
'; + $description .= '' . t('Type') . ':' . ($product_qty['lifetime'] ? t('Lifetime') : t('Cart max.')) . '
'; $data = array( 'nid' => $product_qty['nid'], @@ -187,10 +186,10 @@ function uc_restrict_qty_feature_form_submit($form, &$form_state) {dpm($form_sta $form_state['redirect'] = uc_product_feature_save($data); - $key = array(); - if ($product_qty['rqpid']) { - $key[] = 'rqpid'; - } + $key = array(); + if ($product_qty['rqpid']) { + $key[] = 'rqpid'; + } // Insert or update uc_file_product table if (empty($product_qty['pfid'])) { @@ -201,22 +200,23 @@ function uc_restrict_qty_feature_form_submit($form, &$form_state) {dpm($form_sta } /** - * Implementation of hook_add_to_cart(). + * Implements hook_uc_add_to_cart(). */ -function uc_restrict_qty_add_to_cart($nid, $qty, $data) { +function uc_restrict_qty_uc_add_to_cart($nid, $qty, $data) { $limit = variable_get('uc_restrict_qty_global', 0); - $replaceCart = variable_get('uc_restrict_qty_global_replace', FALSE); + $replacecart = variable_get('uc_restrict_qty_global_replace', FALSE); + $result = NULL; // added by Jeff // If a global restriction on the number of items has been made. if ($limit > 0) { if (count(uc_cart_get_contents()) >= $limit) { - if($replaceCart) { - db_query("DELETE FROM {uc_cart_products} WHERE cart_id = '%s'", uc_cart_get_id()); + if ($replacecart) { + db_query("DELETE FROM {uc_cart_products} WHERE cart_id = :cart", array(':cart' => uc_cart_get_id())); $result[] = array('success' => TRUE); } else { $message = format_plural($limit, 'Sorry, you may only have 1 item in your cart. You must checkout or remove the item in your cart before adding a different item.', - 'Sorry, you may only have a total of @count items in your cart. You must checkout or remove items from your cart before adding others.'); + 'Sorry, you may only have a total of @count items in your cart. You must checkout or remove items from your cart before adding others.'); $result[] = array( 'success' => FALSE, @@ -232,8 +232,8 @@ function uc_restrict_qty_add_to_cart($nid, $qty, $data) { $message = t('Sorry, you have reached the quantity limit for this product. You can not order more items of this product.'); $result[] = array( - 'success' => FALSE, - 'message' => $message, + 'success' => FALSE, + 'message' => $message, ); } } @@ -241,33 +241,41 @@ function uc_restrict_qty_add_to_cart($nid, $qty, $data) { } /** - * Implementation of hook_add_to_cart_data(). + * Implements hook_add_to_cart_data(). + * @param $form_values + * The values submitted to the Add to Cart form. + * + * @return + * An array of data to be merged into the item added to the cart. */ function uc_restrict_qty_uc_add_to_cart_data($form_values) { return array('restrict_qty' => uc_restrict_qty_count($form_values)); } /** - * Implementation of hook_cart_item(). + * Implements of hook_uc_cart_item_update(). */ -function uc_restrict_qty_uc_cart_item($op, &$item) { - if ($op == 'load') { - // If this item has a quantity restriction on it... - if ($item->data['restrict_qty']['qty'] > 0) { - $is_lifetime = isset($item->data['restrict_qty']['lifetime']) && $item->data['restrict_qty']['lifetime']; - $restrict_qty = $is_lifetime ? $item->data['restrict_qty']['rest'] : $item->data['restrict_qty']['qty']; - if ($item->qty > $restrict_qty) { - // Reduce the quantity to 1 if necessary. - $item->qty = $restrict_qty; - db_query("UPDATE {uc_cart_products} SET qty = %d, changed = %d WHERE cart_id = '%s' AND nid = %d AND data = '%s'", $restrict_qty, time(), uc_cart_get_id(), $item->nid, serialize($item->data)); - drupal_set_message(format_plural($restrict_qty, 'You may only add 1 !item to your cart. Quantity has been restricted.', 'You may only add @count !item to your cart. Quantity has been restricted.', array('!item' => $item->title)), 'warning'); - } +function uc_restrict_qty_uc_cart_item_update($item) { + // Check if this item has a quantity restriction on it. + if (isset($item->data['restrict_qty']['qty']) && $item->data['restrict_qty']['qty'] > 0) { + $is_lifetime = isset($item->data['restrict_qty']['lifetime']) && $item->data['restrict_qty']['lifetime']; + $restrict_qty = $is_lifetime ? $item->data['restrict_qty']['rest'] : $item->data['restrict_qty']['qty']; + if ($item->qty > $restrict_qty) { + // Reduce the quantity to 1 if necessary. + $item->qty = $restrict_qty; + db_update('uc_cart_products') + ->fields(array('qty' => $restrict_qty, 'changed' => time())) + ->condition('cart_id', uc_cart_get_id()) + ->condition('nid', $item->nid) + ->condition('data', serialize($item->data)) + ->execute(); + drupal_set_message(format_plural($restrict_qty, 'You may only add 1 !item to your cart. Quantity has been restricted.', 'You may only add @count !item to your cart. Quantity has been restricted.', array('!item' => $item->title)), 'warning'); } } } /** - * Implementation of hook_form_alter(). + * Implements hook_form_alter(). */ function uc_restrict_qty_form_alter(&$form, &$form_state, $form_id) { // Disable the appropriate Qty. fields on the cart view form. @@ -275,12 +283,14 @@ function uc_restrict_qty_form_alter(&$form, &$form_state, $form_id) { for ($i = 0, $j = count(uc_cart_get_contents()); $i < $j; $i++) { $data = unserialize($form['items'][$i]['data']['#value']); - // If this item has a quantity restriction on it... - $is_lifetime = isset($data['restrict_qty']['lifetime']) && $data['restrict_qty']['lifetime']; - $restrict_qty = $is_lifetime ? $data['restrict_qty']['rest'] : $data['restrict_qty']['qty']; - if ($restrict_qty == 1) { - $form['items'][$i]['qty']['#type'] = 'value'; - $form['items'][$i]['qty']['#theme'] = 'restrict_qty_field'; + // If this item has a quantity restriction on it. + if (isset($data['restrict_qty'])) { + $is_lifetime = isset($data['restrict_qty']['lifetime']) && $data['restrict_qty']['lifetime']; + $restrict_qty = $is_lifetime ? $data['restrict_qty']['rest'] : $data['restrict_qty']['qty']; + if ($restrict_qty == 1) { + $form['items'][$i]['qty']['#type'] = 'value'; + $form['items'][$i]['qty']['#theme'] = 'restrict_qty_field'; + } } } } @@ -290,18 +300,26 @@ function uc_restrict_qty_form_alter(&$form, &$form_state, $form_id) { } } -// Themes cart Qty. boxes so they can't be changed. (currently not in use) +/** + * Themes cart Qty. boxes so they can't be changed. (currently not in use) + */ function theme_restrict_qty_field($variables) { - return check_plain($variables['form']['#value']); + return check_plain($variables['form']['#value']); } -// Returns the number of restrict_qty features on a product node. +/** + * Returns the number of restrict_qty features on a product node. + */ function uc_restrict_qty_count($form_values) { global $user; $data = db_query("SELECT qty, lifetime FROM {uc_restrict_qty_products} WHERE nid = :nid", array(':nid' => $form_values['nid']))->fetchAssoc(); if ($data['lifetime']) { - $bought_qty = db_query('SELECT SUM(uop.qty) FROM {uc_orders} uo LEFT JOIN {uc_order_products} uop ON uo.order_id = uop.order_id WHERE uo.order_status = "completed" AND uo.uid = :uid AND uop.nid = :nid ORDER BY uop.nid', array(':uid' => $user->uid , ':nid' => $form_values['nid']))->fetchField(); + $bought_qty = db_query('SELECT SUM(uop.qty) FROM {uc_orders} uo LEFT JOIN {uc_order_products} uop ON uo.order_id = uop.order_id WHERE uo.order_status = :completed AND uo.uid = :uid AND uop.nid = :nid ORDER BY uop.nid', array( + ':completed' => 'completed', + ':uid' => $user->uid, + ':nid' => $form_values['nid'] + ))->fetchField(); $data['rest'] = $data['qty'] - $bought_qty; } @@ -315,11 +333,13 @@ function uc_restrict_qty_count($form_values) { /** * Delete all data associated with a given node. * - * @param $nid - * A Drupal node ID. + * @param obejct $node + * A Drupal node object. */ -function uc_restrict_qty_node_delete($nid) { - db_query("DELETE FROM {uc_restrict_qty_products} WHERE nid = :nid", array(':nid' => $node->nid)); +function uc_restrict_qty_node_delete($node) { + db_delete('uc_restrict_qty_products') + ->condition('nid', $node->nid) + ->execute(); } /** @@ -329,5 +349,7 @@ function uc_restrict_qty_node_delete($nid) { * An Ubercart product feature array. */ function uc_restrict_qty_feature_delete($feature) { - db_query("DELETE FROM {uc_restrict_qty_products} WHERE pfid = :pfid", array(':pfid' => $feature['pfid'])); + db_delete('uc_restrict_qty_products') + ->condition('pfid', $feature['pfid']) + ->execute(); } diff --git a/sites/all/modules/contrib/ecommerce/uc_termsofservice/uc_termsofservice.info b/sites/all/modules/contrib/ecommerce/uc_termsofservice/uc_termsofservice.info index 0a654816..b08ea206 100644 --- a/sites/all/modules/contrib/ecommerce/uc_termsofservice/uc_termsofservice.info +++ b/sites/all/modules/contrib/ecommerce/uc_termsofservice/uc_termsofservice.info @@ -5,9 +5,9 @@ dependencies[] = uc_cart package = Ubercart - extra core = 7.x -; Information added by drupal.org packaging script on 2013-09-11 +; Information added by drupal.org packaging script on 2013-10-19 version = "7.x-1.0-beta1+1-dev" core = "7.x" project = "uc_termsofservice" -datestamp = "1378897545" +datestamp = "1382149680" diff --git a/sites/all/modules/contrib/users/user_import_delete/LICENSE.txt b/sites/all/modules/contrib/users/user_import_delete/LICENSE.txt deleted file mode 100644 index d159169d..00000000 --- a/sites/all/modules/contrib/users/user_import_delete/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/sites/all/modules/contrib/users/user_import_delete/README.txt b/sites/all/modules/contrib/users/user_import_delete/README.txt deleted file mode 100644 index a9b35b83..00000000 --- a/sites/all/modules/contrib/users/user_import_delete/README.txt +++ /dev/null @@ -1,61 +0,0 @@ -******************************************************************** - D R U P A L M O D U L E -******************************************************************** -Name: User Import Delete Module -Author: Robert Castelo -Drupal: 7.x -******************************************************************** -DESCRIPTION: - -Provides options for cancelling existing accounts that are not in an import. - -The typical user case is that a staff list is imported into an intranet every month, and if someone -has left the organisation they are not included in the staff list, and so their account is cancelled. - -The options provided are the same as are available when deleting user accounts individually or -from the People admin page. - - -******************************************************************** -PREREQUISITES: - -User Import module required. - - -******************************************************************** -INSTALLATION: - -Note: It is assumed that you have Drupal up and running. Be sure to -check the Drupal web site if you need assistance. - -1. Place the entire module directory into your Drupal directory: - sites/all/modules/ - - -2. Enable the module by navigating to: - - administer > build > modules - - Click the 'Save configuration' button at the bottom to commit your - changes. - - - -******************************************************************** -AUTHOR CONTACT - -- Report Bugs/Request Features: - http://drupal.org/project/user_import - -- Commission New Features: - http://drupal.org/user/3555/contact - -- Want To Say Thank You: - http://www.amazon.com/gp/registry/O6JKRQEQ774F - - http://www.amazon.co.uk/registry/wishlist/4KP50DVHBY62 - - -******************************************************************** -ACKNOWLEDGEMENT - diff --git a/sites/all/modules/contrib/users/user_import_delete/user_import_delete.info b/sites/all/modules/contrib/users/user_import_delete/user_import_delete.info deleted file mode 100644 index 08b962d2..00000000 --- a/sites/all/modules/contrib/users/user_import_delete/user_import_delete.info +++ /dev/null @@ -1,18 +0,0 @@ -name = User Import Delete -description = "Delete existing users that are not in an import - WARNING: Read the README.txt before installing." -core = 7.x -package = Deployment -dependencies[] = user_import -files[] = user_import_delete.module -files[] = user_import_delete.install - - - - - -; Information added by Drupal.org packaging script on 2014-07-07 -version = "7.x-3.0-rc1+0-dev" -core = "7.x" -project = "user_import_delete" -datestamp = "1404693531" - diff --git a/sites/all/modules/contrib/users/user_import_delete/user_import_delete.install b/sites/all/modules/contrib/users/user_import_delete/user_import_delete.install deleted file mode 100644 index 1d38228d..00000000 --- a/sites/all/modules/contrib/users/user_import_delete/user_import_delete.install +++ /dev/null @@ -1,103 +0,0 @@ - t("Log of users that have been imported."), - 'fields' => array( - 'import_id' => array( - 'description' => t("ID key of import."), - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'disp-width' => '10' - ), - 'uid' => array( - 'description' => t("ID key of user imported."), - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'disp-width' => '10' - ), - 'cancellation_method' => array( - 'description' => t("Account cancellation method."), - 'type' => 'varchar', - 'length' => '35', - 'not null' => TRUE, - 'default' => '' - ), - 'delete_ready' => array( - 'description' => t("Flag user for deletion."), - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'disp-width' => '10' - ), - ), - ); - - return $schema; -} - -/** - * Change the account_key field to a standard uid field. - */ -function user_import_delete_update_7000() { - - db_change_field('user_import_delete', 'account_key', 'uid', - array( - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'description' => "ID key of user imported.", - ) - ); -} - -/** - * Add the delete ready flag field. - */ -function user_import_delete_update_7001() { - - db_add_field('user_import_delete', 'delete_ready', - array( - 'description' => t("Flag user for deletion."), - 'type' => 'int', - 'not null' => TRUE, - 'default' => 0, - 'initial' => 0, - 'disp-width' => '10' - ) - ); -} - -/** - * Add the cancellation method field. - */ -function user_import_delete_update_7002() { - - db_add_field('user_import_delete', 'cancellation_method', - array( - 'description' => t("Account cancellation method."), - 'type' => 'varchar', - 'length' => '35', - 'not null' => TRUE, - 'default' => '' - ) - ); -} - -/** - * Clear all in progress deletes. IMPORTANT: Please redo the previous import if you want to delete unwanted accounts. - */ -function user_import_delete_update_7003() { - db_delete('user_import_delete')->execute(); -} - diff --git a/sites/all/modules/contrib/users/user_import_delete/user_import_delete.module b/sites/all/modules/contrib/users/user_import_delete/user_import_delete.module deleted file mode 100644 index 241a992e..00000000 --- a/sites/all/modules/contrib/users/user_import_delete/user_import_delete.module +++ /dev/null @@ -1,219 +0,0 @@ -rowCount(); - - if (!empty($accounts_not_created)) { - drupal_set_message(t('@delete_count accounts scheduled to be cancelled.', array('@delete_count' => $accounts_not_created)), 'status'); - } - -} - -/** - * Implements hook_form_alter(). - * - */ -function user_import_delete_form_alter(&$form, &$form_state, $form_id) { - - if ($form_id == 'user_import_edit') { - array_unshift($form['import']['#submit'], 'user_import_delete_import_submit'); - } -} - -/** - * Implementation of hook_user_import_form_fieldsets(). - * Add options to User Import settings form. - */ -function user_import_delete_user_import_form_fieldset($import, $collapsed) { - $form = array(); - user_import_delete_user_import_edit_account_cancel($form, $import, $collapsed); - return $form; -} - -/** - * Create a list of all existing users. - */ -function user_import_delete_import_submit($form, &$form_state) { - global $user; - - if (empty($form_state['values']['user_import_delete'])) { - return; - } - - $import_id = $form_state['values']['import_id']; - $method = $form_state['values']['user_import_delete']; - - // Can't find a way to copy all users into table and set import_id and cancellation_method in one query, - // so have to do it in three steps. - - // Delete any records without an import_id. - $deleted_count = db_delete('user_import_delete') - ->condition('import_id', 0) - ->execute(); - - // Add all users, except user 1. - $query = db_select('users', 'u'); - $query->addField('u','uid', 'uid'); - $query->condition('uid', 1, '>'); - $query->condition('uid', $user->uid, '!='); - - db_insert('user_import_delete') - ->from($query) - ->execute(); - - // Add import_id to all users. - $updated_count = db_update('user_import_delete') - ->fields(array( - 'import_id' => $import_id, - 'cancellation_method' => $method, - )) - ->condition('import_id', 0) - ->execute(); - -} - -/** - * Implementation of hook_user_import_after_save(). - * - * Delete imported users from log of original users, - * so we have a list of which users where not in the import. - * - **/ -function user_import_delete_user_import_pre_save($settings, $account, $fields, $errors, $update_setting_per_module) { - $method = $settings['user_import_delete']; - - // If no cancellation method is set, don't add accounts to list to be processed. - if (empty($method)) { - return; - } - - // Check if accounts are to be updated as well as created. - $update_setting = _user_import_update_user_check($settings['update_user']); - - // @todo document this logic. - if (isset($account['uid'])) { - db_delete('user_import_delete') - ->condition('import_id', $settings['import_id']) - ->condition('uid', $account['uid']) - ->execute(); - } - elseif (!$update_setting) { // If account is not being updated check there's a match between existing account and import. - $email = $fields['user']['email'][0]; - $uid = db_query('SELECT u.uid FROM {users} u WHERE mail = :mail', array(':mail' => $email))->fetchField(); - - if (!empty($uid)) { - db_delete('user_import_delete') - ->condition('import_id', $settings['import_id']) - ->condition('uid', $uid) - ->execute(); - } - } -} - -/** - * Implementation of hook_user_import_imported(). - * Process import once it's completed. - * - **/ -function user_import_delete_user_import_imported($import_id, $settings) { - $method = $settings['user_import_delete']; - - if (!empty($method)) { - user_import_delete_set_delete_flag($import_id); - user_import_delete_cancel_accounts(); - } -} - -/** - * Flag users as ready for deletion. - * - **/ -function user_import_delete_set_delete_flag($import_id) { - - // Prevent cancelling Anonymous user. - db_delete('user_import_delete') - ->condition('uid', 0) - ->execute(); - - // Prevent cancelling user 1 without confirmation. - db_delete('user_import_delete') - ->condition('uid', 1) - ->execute(); - - // Set users as ready to be deleted. - $updated_count = db_update('user_import_delete') - ->fields(array( - 'delete_ready' => 1, - )) - ->condition('import_id', $import_id) - ->execute(); - -} - -/** - * Delete users flagged as ready for deletion. - * - **/ -function user_import_delete_cancel_accounts() { - - $accounts_not_created = db_query('SELECT u.uid, u.cancellation_method FROM {user_import_delete} u WHERE delete_ready = 1 ORDER BY import_id'); - - foreach ($accounts_not_created as $account_info) { - - $account = user_load($account_info->uid); - - if (!empty($account) && !empty($account_info->cancellation_method)) { - - // Set not to notify users that their account has been cancelled. - $edit['user_cancel_notify'] = ''; - - if ($account_info->cancellation_method != 'user_cancel_delete') { - // Allow modules to add further sets to this operation. - module_invoke_all('user_cancel', $edit, $account, $account_info->cancellation_method); - } - - _user_cancel($edit, $account, $account_info->cancellation_method); - - db_delete('user_import_delete') - ->condition('uid', $account->uid) - ->execute(); - } - } - - return; -} - -/** - * Options for the User Import settings form. - */ -function user_import_delete_user_import_edit_account_cancel(&$form, $import, $collapsed) { - - $options = array( - 'user_cancel_block' => t('Disable the account and keep its content'), - 'user_cancel_block_unpublish' => t('Disable the account and unpublish its content'), - 'user_cancel_reassign' => t('Delete the account and make its content belong to the !anonymous-name user', array('!anonymous-name' => variable_get('anonymous', t('Anonymous')))), - 'user_cancel_delete' => t('Delete the account and its content'), - ); - - $form['optional']['user_import_delete'] = array( - '#type' => 'select', - '#title' => t('Existing Accounts Not In Import'), - '#description' => t('How to deal with existing accounts that are not in this import.'), - '#default_value' => isset($import['options']['user_import_delete']) ? $import['options']['user_import_delete'] : '', - '#empty_option' => t("Leave active"), - '#options' => $options, - ); - -} diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc index 61482a95..dec66969 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc +++ b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc @@ -26,6 +26,8 @@ function materio_administration_menu_default_menu_links() { 'expanded' => 0, 'weight' => -45, 'customized' => 1, + 'language' => 'und', + 'menu_links_customized' => 1, ); diff --git a/sites/all/modules/features/materio_administration/materio_administration.info b/sites/all/modules/features/materio_administration/materio_administration.info index e6bf7a95..eab063d2 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.info +++ b/sites/all/modules/features/materio_administration/materio_administration.info @@ -5,6 +5,7 @@ dependencies[] = admin dependencies[] = admin_menu dependencies[] = admin_menu_source dependencies[] = admin_menu_toolbar +dependencies[] = ctools dependencies[] = features dependencies[] = menu dependencies[] = strongarm @@ -35,5 +36,4 @@ features[views_view][] = admin_content_node features[views_view][] = admin_contents features[views_view][] = admin_peoples features[views_view][] = taxonomy_companies_manager -mtime = 1429534608 project path = sites/all/modules/features diff --git a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc index 23d8c82e..b1c2f041 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc +++ b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc @@ -95,45 +95,45 @@ function materio_administration_views_default_views() { 'separator' => '', ), ); - /* Relationship: Content revision: User */ + /* Relation: Révision de contenu : Utilisateur */ $handler->display->display_options['relationships']['uid']['id'] = 'uid'; $handler->display->display_options['relationships']['uid']['table'] = 'node_revision'; $handler->display->display_options['relationships']['uid']['field'] = 'uid'; $handler->display->display_options['relationships']['uid']['label'] = 'Utilisateur'; $handler->display->display_options['relationships']['uid']['required'] = TRUE; - /* Relationship: Content: Taxonomy terms on node */ + /* Relation: Contenu : Termes de taxonomie du nœud */ $handler->display->display_options['relationships']['term_node_tid']['id'] = 'term_node_tid'; $handler->display->display_options['relationships']['term_node_tid']['table'] = 'node'; $handler->display->display_options['relationships']['term_node_tid']['field'] = 'term_node_tid'; - /* Field: Content: Title */ + /* Champ: Contenu : Titre */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; - /* Field: Content: Type */ + /* Champ: Contenu : 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'; - /* Field: Content: Published */ + /* 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']['not'] = 0; - /* Field: Content: Updated date */ + /* Champ: Contenu : Date de mise à jour */ $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']['label'] = 'Mis à jour'; - /* Field: Content: Edit link */ + /* Champ: Contenu : Lien de modification */ $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'] = ''; - /* Field: Content: Delete link */ + /* Champ: Contenu : Lien de suppression */ $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'; $handler->display->display_options['fields']['delete_node']['label'] = ''; - /* Sort criterion: Content: Post date */ + /* Critère de tri: Contenu : Date de publication */ $handler->display->display_options['sorts']['created']['id'] = 'created'; $handler->display->display_options['sorts']['created']['table'] = 'node'; $handler->display->display_options['sorts']['created']['field'] = 'created'; @@ -142,7 +142,7 @@ function materio_administration_views_default_views() { 1 => 'AND', 2 => 'AND', ); - /* Filter criterion: Content: Title */ + /* Critère de filtrage: Contenu : Titre */ $handler->display->display_options['filters']['title']['id'] = 'title'; $handler->display->display_options['filters']['title']['table'] = 'node'; $handler->display->display_options['filters']['title']['field'] = 'title'; @@ -153,7 +153,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['title']['expose']['label'] = 'Titre'; $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op'; $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title'; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : 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'; @@ -165,7 +165,7 @@ function materio_administration_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; - /* Filter criterion: User: Name */ + /* Critère de filtrage: Utilisateur : Nom */ $handler->display->display_options['filters']['uid']['id'] = 'uid'; $handler->display->display_options['filters']['uid']['table'] = 'users'; $handler->display->display_options['filters']['uid']['field'] = 'uid'; @@ -177,7 +177,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['uid']['expose']['label'] = 'Auteur'; $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op'; $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'name'; - /* Filter criterion: Content: Published */ + /* 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'; @@ -187,7 +187,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['status']['expose']['label'] = 'Publié'; $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status'; $handler->display->display_options['filters']['status']['expose']['remember'] = TRUE; - /* Filter criterion: Taxonomy term: Vocabulary */ + /* Critère de filtrage: Terme de taxonomie : Vocabulaire */ $handler->display->display_options['filters']['vid']['id'] = 'vid'; $handler->display->display_options['filters']['vid']['table'] = 'taxonomy_term_data'; $handler->display->display_options['filters']['vid']['field'] = 'vid'; @@ -219,14 +219,12 @@ function materio_administration_views_default_views() { t('suivant ›'), t('dernier »'), t('Utilisateur'), - t('term'), - t('Title'), - t('Type'), - t('Published'), - t('Mis à jour'), + t('terme'), t('Titre'), - t('Auteur'), + t('Type'), t('Publié'), + t('Mis à jour'), + t('Auteur'), t('Vocabulaire'), t('System'), ); @@ -406,16 +404,16 @@ function materio_administration_views_default_views() { ), ); $handler->display->display_options['style_options']['override'] = FALSE; - /* Header: Global: Result summary */ + /* Entête: Global : Résumé des résultats */ $handler->display->display_options['header']['result']['id'] = 'result'; $handler->display->display_options['header']['result']['table'] = 'views'; $handler->display->display_options['header']['result']['field'] = 'result'; $handler->display->display_options['header']['result']['label'] = 'Résumé'; - /* Field: Content: Type */ + /* Champ: Contenu : 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'; - /* Field: Content: Title */ + /* Champ: Contenu : Titre */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; @@ -424,69 +422,69 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; $handler->display->display_options['fields']['title']['element_type'] = 'strong'; $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE; - /* Field: Content: Référence Materio */ + /* Champ: Contenu : Référence Materio */ $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio'; $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio'; $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio'; - /* Field: Content: Edit link */ + /* Champ: Contenu : Lien de modification */ $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']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]'; - /* Field: Content: Manufacturer */ + /* Champ: Contenu : Manufacturer */ $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab'; $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab'; $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab'; $handler->display->display_options['fields']['field_company_fab']['label'] = 'Fabricants / Distributeurs'; $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0'; - /* Field: Content: Distributor */ + /* Champ: Contenu : Distributor */ $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib'; $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib'; $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib'; $handler->display->display_options['fields']['field_company_distrib']['delta_offset'] = '0'; - /* Field: Content: Language */ + /* 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'; - /* Field: Content translation: Translate link */ + /* 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']['text'] = '[translate_node]'; - /* Field: Content translation: Translation status */ + /* Champ: Traduction du contenu : Statut de la traduction */ $handler->display->display_options['fields']['translate']['id'] = 'translate'; $handler->display->display_options['fields']['translate']['table'] = 'node'; $handler->display->display_options['fields']['translate']['field'] = 'translate'; $handler->display->display_options['fields']['translate']['exclude'] = TRUE; $handler->display->display_options['fields']['translate']['not'] = 0; - /* Field: Workflow: Current state */ + /* Champ: Processus : État actuel */ $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: Content: Updated date */ + /* Champ: Contenu : Date de mise à jour */ $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'; - /* Field: Field: Mémo */ + /* Champ: Champ : Mémo */ $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo'; $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE; - /* Field: Content: Delete link */ + /* Champ: Contenu : Lien de suppression */ $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'; $handler->display->display_options['fields']['delete_node']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['delete_node']['alter']['text'] = '[delete_node]'; - /* Sort criterion: Content: Updated date */ + /* Critère de tri: Contenu : Date de mise à jour */ $handler->display->display_options['sorts']['changed']['id'] = 'changed'; $handler->display->display_options['sorts']['changed']['table'] = 'node'; $handler->display->display_options['sorts']['changed']['field'] = 'changed'; $handler->display->display_options['sorts']['changed']['order'] = 'DESC'; $handler->display->display_options['sorts']['changed']['granularity'] = 'minute'; - /* Filter criterion: Content: Title */ + /* Critère de filtrage: Contenu : Titre */ $handler->display->display_options['filters']['title']['id'] = 'title'; $handler->display->display_options['filters']['title']['table'] = 'node'; $handler->display->display_options['filters']['title']['field'] = 'title'; @@ -498,7 +496,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op'; $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title'; $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE; - /* Filter criterion: Workflow: Current state */ + /* Critère de filtrage: Processus : État actuel */ $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'; @@ -509,7 +507,7 @@ function materio_administration_views_default_views() { $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; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : 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'; @@ -526,7 +524,7 @@ function materio_administration_views_default_views() { $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; - /* Filter criterion: Field: Mémo (field_memo) */ + /* Critère de filtrage: Champ : Mémo (field_memo) */ $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value'; $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo'; $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value'; @@ -574,19 +572,19 @@ function materio_administration_views_default_views() { $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; - /* Field: Content: Type */ + /* Champ: Contenu : 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; - /* Field: Content: Title */ + /* Champ: Contenu : Titre */ $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; - /* Field: Content: Edit link */ + /* Champ: Contenu : Lien de modification */ $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'; @@ -594,20 +592,20 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]'; $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = FALSE; - /* Field: Content: Published */ + /* 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; - /* Field: Content: Language */ + /* 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_alter_empty'] = FALSE; - /* Field: Content translation: Translate link */ + /* 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'; @@ -634,7 +632,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›'; $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »'; $handler->display->display_options['defaults']['fields'] = FALSE; - /* Field: Bulk operations: Content */ + /* Champ: Opérations en masse : Contenu */ $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'; @@ -789,7 +787,7 @@ function materio_administration_views_default_views() { 'postpone_processing' => 0, ), ); - /* Field: Content: Image */ + /* Champ: Contenu : Image */ $handler->display->display_options['fields']['field_materiau_image']['id'] = 'field_materiau_image'; $handler->display->display_options['fields']['field_materiau_image']['table'] = 'field_data_field_materiau_image'; $handler->display->display_options['fields']['field_materiau_image']['field'] = 'field_materiau_image'; @@ -800,7 +798,7 @@ function materio_administration_views_default_views() { ); $handler->display->display_options['fields']['field_materiau_image']['delta_limit'] = '1'; $handler->display->display_options['fields']['field_materiau_image']['delta_offset'] = '0'; - /* Field: Content: Image */ + /* Champ: Contenu : Image */ $handler->display->display_options['fields']['field_visuel']['id'] = 'field_visuel'; $handler->display->display_options['fields']['field_visuel']['table'] = 'field_data_field_visuel'; $handler->display->display_options['fields']['field_visuel']['field'] = 'field_visuel'; @@ -811,11 +809,11 @@ function materio_administration_views_default_views() { ); $handler->display->display_options['fields']['field_visuel']['delta_limit'] = '1'; $handler->display->display_options['fields']['field_visuel']['delta_offset'] = '0'; - /* Field: Content: Type */ + /* Champ: Contenu : 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'; - /* Field: Content: Title */ + /* Champ: Contenu : Titre */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; @@ -824,17 +822,17 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; $handler->display->display_options['fields']['title']['element_type'] = 'strong'; $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE; - /* Field: Content: Référence Materio */ + /* Champ: Contenu : Référence Materio */ $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio'; $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio'; $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio'; - /* Field: Content: Edit link */ + /* Champ: Contenu : Lien de modification */ $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']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]'; - /* Field: Content: Manufacturer */ + /* Champ: Contenu : Manufacturer */ $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab'; $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab'; $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab'; @@ -843,7 +841,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['field_company_fab']['alter']['text'] = 'Fab :
[field_company_fab] '; $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0'; - /* Field: Content: Distributor */ + /* Champ: Contenu : Distributor */ $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib'; $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib'; $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib'; @@ -851,7 +849,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['field_company_distrib']['alter']['text'] = 'Distrib :
[field_company_distrib]'; $handler->display->display_options['fields']['field_company_distrib']['delta_offset'] = '0'; - /* Field: Content: Onthologie */ + /* Champ: Contenu : Onthologie */ $handler->display->display_options['fields']['field_onthologie']['id'] = 'field_onthologie'; $handler->display->display_options['fields']['field_onthologie']['table'] = 'field_data_field_onthologie'; $handler->display->display_options['fields']['field_onthologie']['field'] = 'field_onthologie'; @@ -859,7 +857,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['field_onthologie']['delta_limit'] = '5'; $handler->display->display_options['fields']['field_onthologie']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_onthologie']['multi_type'] = 'ol'; - /* Field: Content: Tags libres */ + /* Champ: Contenu : Tags libres */ $handler->display->display_options['fields']['field_tags_libres']['id'] = 'field_tags_libres'; $handler->display->display_options['fields']['field_tags_libres']['table'] = 'field_data_field_tags_libres'; $handler->display->display_options['fields']['field_tags_libres']['field'] = 'field_tags_libres'; @@ -867,7 +865,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['field_tags_libres']['delta_limit'] = '4'; $handler->display->display_options['fields']['field_tags_libres']['delta_offset'] = '0'; $handler->display->display_options['fields']['field_tags_libres']['multi_type'] = 'ul'; - /* Field: Content: Materiau(x) lié(s) */ + /* Champ: Contenu : Materiau(x) lié(s) */ $handler->display->display_options['fields']['field_materiau_ref']['id'] = 'field_materiau_ref'; $handler->display->display_options['fields']['field_materiau_ref']['table'] = 'field_data_field_materiau_ref'; $handler->display->display_options['fields']['field_materiau_ref']['field'] = 'field_materiau_ref'; @@ -878,7 +876,7 @@ function materio_administration_views_default_views() { 'link' => 1, ); $handler->display->display_options['fields']['field_materiau_ref']['delta_offset'] = '0'; - /* Field: Content: Brève(s) liée(s) */ + /* Champ: Contenu : Brève(s) liée(s) */ $handler->display->display_options['fields']['field_breve_ref']['id'] = 'field_breve_ref'; $handler->display->display_options['fields']['field_breve_ref']['table'] = 'field_data_field_breve_ref'; $handler->display->display_options['fields']['field_breve_ref']['field'] = 'field_breve_ref'; @@ -888,7 +886,7 @@ function materio_administration_views_default_views() { 'link' => 1, ); $handler->display->display_options['fields']['field_breve_ref']['delta_offset'] = '0'; - /* Field: Field: Mémo */ + /* Champ: Champ : Mémo */ $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo'; $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo'; @@ -896,21 +894,21 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300'; $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE; $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE; - /* Field: Content: Fichiers joints */ + /* Champ: Contenu : Fichiers joints */ $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments'; $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments'; $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments'; $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid'; $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0'; - /* Field: Content: Localisation */ + /* Champ: Contenu : Localisation */ $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation'; $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation'; $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation'; - /* Field: Workflow: Current state */ + /* Champ: Processus : État actuel */ $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: Content: Delete link */ + /* Champ: Contenu : Lien de suppression */ $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'; @@ -918,7 +916,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['delete_node']['alter']['text'] = '[delete_node]'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : Type */ $handler->display->display_options['filters']['type_1']['id'] = 'type_1'; $handler->display->display_options['filters']['type_1']['table'] = 'node'; $handler->display->display_options['filters']['type_1']['field'] = 'type'; @@ -935,7 +933,7 @@ function materio_administration_views_default_views() { 'looping_embed_video' => 'looping_embed_video', ); $handler->display->display_options['filters']['type_1']['group'] = 1; - /* Filter criterion: Content: Title */ + /* Critère de filtrage: Contenu : Titre */ $handler->display->display_options['filters']['title']['id'] = 'title'; $handler->display->display_options['filters']['title']['table'] = 'node'; $handler->display->display_options['filters']['title']['field'] = 'title'; @@ -947,7 +945,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op'; $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title'; $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE; - /* Filter criterion: Field: Mémo (field_memo) */ + /* Critère de filtrage: Champ : Mémo (field_memo) */ $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value'; $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo'; $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value'; @@ -958,7 +956,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient'; $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op'; $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value'; - /* Filter criterion: Workflow: Current state */ + /* Critère de filtrage: Processus : État actuel */ $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'; @@ -969,7 +967,7 @@ function materio_administration_views_default_views() { $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; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : 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'; @@ -997,7 +995,7 @@ function materio_administration_views_default_views() { 4 => 0, ); $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE; - /* Filter criterion: Content: Famille (field_famille) */ + /* Critère de filtrage: Contenu : Famille (field_famille) */ $handler->display->display_options['filters']['field_famille_value']['id'] = 'field_famille_value'; $handler->display->display_options['filters']['field_famille_value']['table'] = 'field_data_field_famille'; $handler->display->display_options['filters']['field_famille_value']['field'] = 'field_famille_value'; @@ -1008,7 +1006,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['field_famille_value']['expose']['operator'] = 'field_famille_value_op'; $handler->display->display_options['filters']['field_famille_value']['expose']['identifier'] = 'field_famille_value'; $handler->display->display_options['filters']['field_famille_value']['expose']['remember'] = TRUE; - /* Filter criterion: Content: Référence Materio (field_reference_materio) */ + /* Critère de filtrage: Contenu : Référence Materio (field_reference_materio) */ $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value'; $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio'; $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value'; @@ -1018,7 +1016,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['field_reference_materio_value']['expose']['label'] = 'Référence'; $handler->display->display_options['filters']['field_reference_materio_value']['expose']['operator'] = 'field_reference_materio_value_op'; $handler->display->display_options['filters']['field_reference_materio_value']['expose']['identifier'] = 'field_reference_materio_value'; - /* Filter criterion: Content: Has taxonomy term */ + /* Critère de filtrage: Contenu : Possède un terme de la taxonomie */ $handler->display->display_options['filters']['tid']['id'] = 'tid'; $handler->display->display_options['filters']['tid']['table'] = 'taxonomy_index'; $handler->display->display_options['filters']['tid']['field'] = 'tid'; @@ -1042,7 +1040,7 @@ function materio_administration_views_default_views() { ); $handler->display->display_options['filters']['tid']['reduce_duplicates'] = TRUE; $handler->display->display_options['filters']['tid']['vocabulary'] = 'onthologie'; - /* Filter criterion: Content: Has taxonomy term */ + /* Critère de filtrage: Contenu : Possède un terme de la taxonomie */ $handler->display->display_options['filters']['tid_1']['id'] = 'tid_1'; $handler->display->display_options['filters']['tid_1']['table'] = 'taxonomy_index'; $handler->display->display_options['filters']['tid_1']['field'] = 'tid'; @@ -1062,7 +1060,7 @@ function materio_administration_views_default_views() { 4 => 0, ); $handler->display->display_options['filters']['tid_1']['vocabulary'] = 'tag_libres'; - /* Filter criterion: Content: Has taxonomy term */ + /* Critère de filtrage: Contenu : Possède un terme de la taxonomie */ $handler->display->display_options['filters']['tid_2']['id'] = 'tid_2'; $handler->display->display_options['filters']['tid_2']['table'] = 'taxonomy_index'; $handler->display->display_options['filters']['tid_2']['field'] = 'tid'; @@ -1082,7 +1080,7 @@ function materio_administration_views_default_views() { 4 => 0, ); $handler->display->display_options['filters']['tid_2']['vocabulary'] = 'company'; - /* Filter criterion: Content: Published */ + /* 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'; @@ -1119,7 +1117,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »'; $handler->display->display_options['defaults']['relationships'] = FALSE; $handler->display->display_options['defaults']['fields'] = FALSE; - /* Field: Bulk operations: Content */ + /* Champ: Opérations en masse : Contenu */ $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'; @@ -1272,7 +1270,7 @@ function materio_administration_views_default_views() { 'postpone_processing' => 0, ), ); - /* Field: Content: Title */ + /* Champ: Contenu : Titre */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; @@ -1281,19 +1279,19 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; $handler->display->display_options['fields']['title']['element_type'] = 'strong'; $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE; - /* Field: Content: Post date */ + /* Champ: Contenu : Date de publication */ $handler->display->display_options['fields']['created']['id'] = 'created'; $handler->display->display_options['fields']['created']['table'] = 'node'; $handler->display->display_options['fields']['created']['field'] = 'created'; $handler->display->display_options['fields']['created']['date_format'] = 'custom'; $handler->display->display_options['fields']['created']['custom_date_format'] = 'Y/m/d'; - /* Field: Content: Edit link */ + /* Champ: Contenu : Lien de modification */ $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']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]'; - /* Field: Content: Adresse */ + /* Champ: Contenu : Adresse */ $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address'; $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address'; $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address'; @@ -1304,58 +1302,58 @@ function materio_administration_views_default_views() { 'address' => 'address', ), ); - /* Field: Content: Phone */ + /* Champ: Contenu : Phone */ $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone'; $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone'; $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone'; $handler->display->display_options['fields']['field_public_phone']['label'] = 'Téléphone'; $handler->display->display_options['fields']['field_public_phone']['click_sort_column'] = 'number'; $handler->display->display_options['fields']['field_public_phone']['delta_offset'] = '0'; - /* Field: Content: Language */ + /* 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'; - /* Field: Content translation: Translate link */ + /* 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']['text'] = '[translate_node]'; - /* Field: Content translation: Translation status */ + /* Champ: Traduction du contenu : Statut de la traduction */ $handler->display->display_options['fields']['translate']['id'] = 'translate'; $handler->display->display_options['fields']['translate']['table'] = 'node'; $handler->display->display_options['fields']['translate']['field'] = 'translate'; $handler->display->display_options['fields']['translate']['exclude'] = TRUE; $handler->display->display_options['fields']['translate']['not'] = 0; - /* Field: Content: website */ + /* Champ: Contenu : website */ $handler->display->display_options['fields']['field_website']['id'] = 'field_website'; $handler->display->display_options['fields']['field_website']['table'] = 'field_data_field_website'; $handler->display->display_options['fields']['field_website']['field'] = 'field_website'; $handler->display->display_options['fields']['field_website']['click_sort_column'] = 'url'; - /* Field: Content: Email */ + /* Champ: Contenu : Email */ $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email'; $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email'; $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email'; $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel'; - /* Field: Content: Note */ + /* Champ: Contenu : Note */ $handler->display->display_options['fields']['field_note']['id'] = 'field_note'; $handler->display->display_options['fields']['field_note']['table'] = 'field_data_field_note'; $handler->display->display_options['fields']['field_note']['field'] = 'field_note'; - /* Field: Content: Fichiers joints */ + /* Champ: Contenu : Fichiers joints */ $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments'; $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments'; $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments'; $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid'; $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0'; - /* Field: Field: Mémo */ + /* Champ: Champ : Mémo */ $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo'; $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE; - /* Field: Workflow: Current state */ + /* Champ: Processus : État actuel */ $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: Content: Delete link */ + /* Champ: Contenu : Lien de suppression */ $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'; @@ -1363,7 +1361,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['delete_node']['alter']['text'] = '[delete_node]'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Title */ + /* Critère de filtrage: Contenu : Titre */ $handler->display->display_options['filters']['title']['id'] = 'title'; $handler->display->display_options['filters']['title']['table'] = 'node'; $handler->display->display_options['filters']['title']['field'] = 'title'; @@ -1375,7 +1373,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op'; $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title'; $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE; - /* Filter criterion: Workflow: Current state */ + /* Critère de filtrage: Processus : État actuel */ $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'; @@ -1386,7 +1384,7 @@ function materio_administration_views_default_views() { $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; - /* Filter criterion: Field: Mémo (field_memo) */ + /* Critère de filtrage: Champ : Mémo (field_memo) */ $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value'; $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo'; $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value'; @@ -1397,7 +1395,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient'; $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op'; $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value'; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : Type */ $handler->display->display_options['filters']['type_2']['id'] = 'type_2'; $handler->display->display_options['filters']['type_2']['table'] = 'node'; $handler->display->display_options['filters']['type_2']['field'] = 'type'; @@ -1443,7 +1441,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['pager']['options']['tags']['next'] = 'suivant ›'; $handler->display->display_options['pager']['options']['tags']['last'] = 'dernier »'; $handler->display->display_options['defaults']['fields'] = FALSE; - /* Field: Bulk operations: Content */ + /* Champ: Opérations en masse : Contenu */ $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'; @@ -1598,11 +1596,11 @@ function materio_administration_views_default_views() { 'postpone_processing' => 0, ), ); - /* Field: Content: Type */ + /* Champ: Contenu : 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'; - /* Field: Content: Title */ + /* Champ: Contenu : Titre */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; @@ -1611,13 +1609,13 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; $handler->display->display_options['fields']['title']['element_type'] = 'strong'; $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE; - /* Field: Content: Edit link */ + /* Champ: Contenu : Lien de modification */ $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']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]'; - /* Field: Field: Mémo */ + /* Champ: Champ : Mémo */ $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo'; $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo'; @@ -1625,21 +1623,21 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300'; $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE; $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE; - /* Field: Content: Fichiers joints */ + /* Champ: Contenu : Fichiers joints */ $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments'; $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments'; $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments'; $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid'; $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0'; - /* Field: Content: Localisation */ + /* Champ: Contenu : Localisation */ $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation'; $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation'; $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation'; - /* Field: Workflow: Current state */ + /* Champ: Processus : État actuel */ $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: Content: Delete link */ + /* Champ: Contenu : Lien de suppression */ $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'; @@ -1647,7 +1645,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['delete_node']['alter']['text'] = '[delete_node]'; $handler->display->display_options['defaults']['filter_groups'] = FALSE; $handler->display->display_options['defaults']['filters'] = FALSE; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : Type */ $handler->display->display_options['filters']['type_1']['id'] = 'type_1'; $handler->display->display_options['filters']['type_1']['table'] = 'node'; $handler->display->display_options['filters']['type_1']['field'] = 'type'; @@ -1662,7 +1660,7 @@ function materio_administration_views_default_views() { 'webform' => 'webform', ); $handler->display->display_options['filters']['type_1']['group'] = 1; - /* Filter criterion: Content: Title */ + /* Critère de filtrage: Contenu : Titre */ $handler->display->display_options['filters']['title']['id'] = 'title'; $handler->display->display_options['filters']['title']['table'] = 'node'; $handler->display->display_options['filters']['title']['field'] = 'title'; @@ -1674,7 +1672,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op'; $handler->display->display_options['filters']['title']['expose']['identifier'] = 'title'; $handler->display->display_options['filters']['title']['expose']['remember'] = TRUE; - /* Filter criterion: Field: Mémo (field_memo) */ + /* Critère de filtrage: Champ : Mémo (field_memo) */ $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value'; $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo'; $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value'; @@ -1685,7 +1683,7 @@ function materio_administration_views_default_views() { $handler->display->display_options['filters']['field_memo_value']['expose']['label'] = 'Mémo contient'; $handler->display->display_options['filters']['field_memo_value']['expose']['operator'] = 'field_memo_value_op'; $handler->display->display_options['filters']['field_memo_value']['expose']['identifier'] = 'field_memo_value'; - /* Filter criterion: Workflow: Current state */ + /* Critère de filtrage: Processus : État actuel */ $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'; @@ -1696,7 +1694,7 @@ function materio_administration_views_default_views() { $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; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : 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'; @@ -1725,7 +1723,7 @@ function materio_administration_views_default_views() { 4 => 0, ); $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE; - /* Filter criterion: Content: Référence Materio (field_reference_materio) */ + /* Critère de filtrage: Contenu : Référence Materio (field_reference_materio) */ $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value'; $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio'; $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value'; @@ -1767,33 +1765,33 @@ function materio_administration_views_default_views() { t('Type'), t('Title / Name'), t('Référence Materio'), - t('Edit link'), + t('Lien de modification'), t('[edit_node]'), t('Fabricants / Distributeurs'), t('Distributor'), - t('Language'), - t('Translate link'), + t('Langue'), + t('Lien de traduction'), t('[translate_node]'), - t('Translation status'), - t('Current state'), - t('Updated date'), + t('Statut de la traduction'), + t('État actuel'), + t('Date de mise à jour'), t('Mémo'), - t('Delete link'), + t('Lien de suppression'), t('[delete_node]'), t('Le titre contient'), t('Processus'), t('Type de contenu'), t('Mémo contient'), t('Page : all'), - t('more'), t('Block'), t('Recent Content'), - t('Title'), + t('Titre'), t('Modifier'), - t('Published'), + t('Publié'), t('Traduire'), t('Page : materiaux'), t('Materiaux/brèves'), + t('- Choisir une opération -'), t('Image'), t('Title/Name'), t('Fabricants/Distributeurs'), @@ -1818,8 +1816,7 @@ function materio_administration_views_default_views() { t('Société'), t('Page : companies'), t('Companies'), - t('Content'), - t('Post date'), + t('Date de publication'), t('Adresse'), t('Téléphone'), t('website'), @@ -2077,19 +2074,19 @@ function materio_administration_views_default_views() { 'empty_column' => 0, ), ); - /* Header: Global: Result summary */ + /* Entête: Global : Résumé des résultats */ $handler->display->display_options['header']['result']['id'] = 'result'; $handler->display->display_options['header']['result']['table'] = 'views'; $handler->display->display_options['header']['result']['field'] = 'result'; $handler->display->display_options['header']['result']['label'] = 'Résumé'; - /* Relationship: User: Profile */ + /* Relation: Utilisateur : Profil */ $handler->display->display_options['relationships']['profile']['id'] = 'profile'; $handler->display->display_options['relationships']['profile']['table'] = 'users'; $handler->display->display_options['relationships']['profile']['field'] = 'profile'; $handler->display->display_options['relationships']['profile']['bundle_types'] = array( 'adherent' => 'adherent', ); - /* Field: Bulk operations: User */ + /* Champ: Opérations en masse : Utilisateur */ $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations'; $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users'; $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations'; @@ -2185,7 +2182,7 @@ function materio_administration_views_default_views() { 'label' => '', ), ); - /* Field: User: Uid */ + /* Champ: Utilisateur : Uid */ $handler->display->display_options['fields']['uid']['id'] = 'uid'; $handler->display->display_options['fields']['uid']['table'] = 'users'; $handler->display->display_options['fields']['uid']['field'] = 'uid'; @@ -2193,19 +2190,19 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['uid']['exclude'] = TRUE; $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE; - /* Field: Profile: Titre */ + /* Champ: Profil : Titre */ $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title'; $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title'; $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title'; $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile'; - /* Field: Profile: First name */ + /* Champ: Profil : First name */ $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name'; $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name'; $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name'; $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile'; $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom'; $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE; - /* Field: Profile: Name */ + /* Champ: Profil : Name */ $handler->display->display_options['fields']['field_name']['id'] = 'field_name'; $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name'; $handler->display->display_options['fields']['field_name']['field'] = 'field_name'; @@ -2213,21 +2210,21 @@ function materio_administration_views_default_views() { $handler->display->display_options['fields']['field_name']['label'] = 'Nom'; $handler->display->display_options['fields']['field_name']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['field_name']['alter']['text'] = '[field_first_name] [field_name]'; - /* Field: User: E-mail */ + /* Champ: Utilisateur : Courriel */ $handler->display->display_options['fields']['mail']['id'] = 'mail'; $handler->display->display_options['fields']['mail']['table'] = 'users'; $handler->display->display_options['fields']['mail']['field'] = 'mail'; - /* Field: User: Edit link */ + /* Champ: Utilisateur : Lien de modification */ $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node'; $handler->display->display_options['fields']['edit_node']['table'] = 'users'; $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node'; $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['edit_node']['alter']['text'] = '[edit_node]'; - /* Field: User: Roles */ + /* Champ: Utilisateur : Rôles */ $handler->display->display_options['fields']['rid']['id'] = 'rid'; $handler->display->display_options['fields']['rid']['table'] = 'users_roles'; $handler->display->display_options['fields']['rid']['field'] = 'rid'; - /* Field: Global: PHP */ + /* Champ: Global : PHP */ $handler->display->display_options['fields']['php']['id'] = 'php'; $handler->display->display_options['fields']['php']['table'] = 'views'; $handler->display->display_options['fields']['php']['field'] = 'php'; @@ -2257,17 +2254,17 @@ if($value){ ?>'; $handler->display->display_options['fields']['php']['use_php_click_sortable'] = '4'; $handler->display->display_options['fields']['php']['php_click_sortable'] = ''; - /* Field: User: Company */ + /* Champ: Utilisateur : Company */ $handler->display->display_options['fields']['field_company']['id'] = 'field_company'; $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company'; $handler->display->display_options['fields']['field_company']['field'] = 'field_company'; $handler->display->display_options['fields']['field_company']['label'] = 'Société'; - /* Field: Profile: Organization */ + /* Champ: Profil : Organization */ $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization'; $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization'; $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization'; $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile'; - /* Field: Profile: service */ + /* Champ: Profil : service */ $handler->display->display_options['fields']['field_service']['id'] = 'field_service'; $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service'; $handler->display->display_options['fields']['field_service']['field'] = 'field_service'; @@ -2276,7 +2273,7 @@ if($value){ $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]'; $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE; $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE; - /* Field: Profile: Qualité */ + /* Champ: Profil : Qualité */ $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality'; $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality'; $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality'; @@ -2285,7 +2282,7 @@ if($value){ $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]'; $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE; $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE; - /* Field: Profile: SIRET */ + /* Champ: Profil : SIRET */ $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret'; $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret'; $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret'; @@ -2293,7 +2290,7 @@ if($value){ $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE; $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]'; $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE; - /* Field: Profile: Employee */ + /* Champ: Profil : Employee */ $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee'; $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee'; $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee'; @@ -2307,14 +2304,14 @@ if($value){ 'thousand_separator' => ' ', 'prefix_suffix' => 1, ); - /* Field: Profile: Website */ + /* Champ: Profil : Website */ $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website'; $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website'; $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website'; $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile'; $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet'; $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url'; - /* Field: Profile: Adresse */ + /* Champ: Profil : Adresse */ $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse'; $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse'; $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse'; @@ -2326,7 +2323,7 @@ if($value){ 'address' => 'address', ), ); - /* Field: Profile: Phone */ + /* Champ: Profil : Phone */ $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone'; $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone'; $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone'; @@ -2334,7 +2331,7 @@ if($value){ $handler->display->display_options['fields']['field_private_phone']['label'] = 'Téléphone'; $handler->display->display_options['fields']['field_private_phone']['click_sort_column'] = 'number'; $handler->display->display_options['fields']['field_private_phone']['delta_offset'] = '0'; - /* Field: Global: PHP */ + /* Champ: Global : PHP */ $handler->display->display_options['fields']['php_2']['id'] = 'php_2'; $handler->display->display_options['fields']['php_2']['table'] = 'views'; $handler->display->display_options['fields']['php_2']['field'] = 'php'; @@ -2352,44 +2349,44 @@ print implode($value, \'
\'); ?>'; $handler->display->display_options['fields']['php_2']['use_php_click_sortable'] = '0'; $handler->display->display_options['fields']['php_2']['php_click_sortable'] = ''; - /* Field: Field: Mémo */ + /* Champ: Champ : Mémo */ $handler->display->display_options['fields']['field_memo']['id'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['table'] = 'field_data_field_memo'; $handler->display->display_options['fields']['field_memo']['field'] = 'field_memo'; $handler->display->display_options['fields']['field_memo']['alter']['nl2br'] = TRUE; - /* Field: User: Created date */ + /* Champ: Utilisateur : Date de création */ $handler->display->display_options['fields']['created']['id'] = 'created'; $handler->display->display_options['fields']['created']['table'] = 'users'; $handler->display->display_options['fields']['created']['field'] = 'created'; $handler->display->display_options['fields']['created']['date_format'] = 'custom'; $handler->display->display_options['fields']['created']['custom_date_format'] = 'Y-m-d h:m'; - /* Field: User: Last access */ + /* Champ: Utilisateur : Dernier accès */ $handler->display->display_options['fields']['access']['id'] = 'access'; $handler->display->display_options['fields']['access']['table'] = 'users'; $handler->display->display_options['fields']['access']['field'] = 'access'; $handler->display->display_options['fields']['access']['date_format'] = 'custom'; $handler->display->display_options['fields']['access']['custom_date_format'] = 'Y-m-d h:m'; - /* Field: User: Language */ + /* Champ: Utilisateur : Langue */ $handler->display->display_options['fields']['language']['id'] = 'language'; $handler->display->display_options['fields']['language']['table'] = 'users'; $handler->display->display_options['fields']['language']['field'] = 'language'; $handler->display->display_options['fields']['language']['link_to_user'] = FALSE; - /* Field: User: Active */ + /* Champ: Utilisateur : Actif */ $handler->display->display_options['fields']['status']['id'] = 'status'; $handler->display->display_options['fields']['status']['table'] = 'users'; $handler->display->display_options['fields']['status']['field'] = 'status'; - /* Field: User Stats: Value */ + /* Champ: User Stats : Valeur */ $handler->display->display_options['fields']['value']['id'] = 'value'; $handler->display->display_options['fields']['value']['table'] = 'user_stats_values'; $handler->display->display_options['fields']['value']['field'] = 'value'; $handler->display->display_options['fields']['value']['label'] = 'Login count (?)'; $handler->display->display_options['fields']['value']['hide_empty'] = TRUE; $handler->display->display_options['fields']['value']['empty_zero'] = TRUE; - /* Field: Global: Send e-mail */ + /* Champ: Global : Envoyer le courriel */ $handler->display->display_options['fields']['views_send']['id'] = 'views_send'; $handler->display->display_options['fields']['views_send']['table'] = 'views'; $handler->display->display_options['fields']['views_send']['field'] = 'views_send'; - /* Field: Global: PHP */ + /* Champ: Global : PHP */ $handler->display->display_options['fields']['php_1']['id'] = 'php_1'; $handler->display->display_options['fields']['php_1']['table'] = 'views'; $handler->display->display_options['fields']['php_1']['field'] = 'php'; @@ -2402,12 +2399,12 @@ print user_pass_reset_url($account); ?>'; $handler->display->display_options['fields']['php_1']['use_php_click_sortable'] = '0'; $handler->display->display_options['fields']['php_1']['php_click_sortable'] = ''; - /* Sort criterion: User: Created date */ + /* Critère de tri: Utilisateur : Date de création */ $handler->display->display_options['sorts']['created']['id'] = 'created'; $handler->display->display_options['sorts']['created']['table'] = 'users'; $handler->display->display_options['sorts']['created']['field'] = 'created'; $handler->display->display_options['sorts']['created']['order'] = 'DESC'; - /* Filter criterion: User: Active */ + /* Critère de filtrage: Utilisateur : Actif */ $handler->display->display_options['filters']['status']['id'] = 'status'; $handler->display->display_options['filters']['status']['table'] = 'users'; $handler->display->display_options['filters']['status']['field'] = 'status'; @@ -2419,7 +2416,7 @@ print user_pass_reset_url($account); $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; - /* Filter criterion: User: Roles */ + /* Critère de filtrage: Utilisateur : Rôles */ $handler->display->display_options['filters']['rid']['id'] = 'rid'; $handler->display->display_options['filters']['rid']['table'] = 'users_roles'; $handler->display->display_options['filters']['rid']['field'] = 'rid'; @@ -2452,7 +2449,7 @@ print user_pass_reset_url($account); 4 => 0, ); $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE; - /* Filter criterion: User: Company (field_company) */ + /* Critère de filtrage: Utilisateur : Company (field_company) */ $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid'; $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company'; $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid'; @@ -2464,7 +2461,7 @@ print user_pass_reset_url($account); $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op'; $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid'; $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company'; - /* Filter criterion: Profile: Organization (field_organization) */ + /* Critère de filtrage: Profil : Organization (field_organization) */ $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value'; $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization'; $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value'; @@ -2487,7 +2484,7 @@ print user_pass_reset_url($account); 3 => 0, 4 => 0, ); - /* Filter criterion: Field: Mémo (field_memo) */ + /* Critère de filtrage: Champ : Mémo (field_memo) */ $handler->display->display_options['filters']['field_memo_value']['id'] = 'field_memo_value'; $handler->display->display_options['filters']['field_memo_value']['table'] = 'field_data_field_memo'; $handler->display->display_options['filters']['field_memo_value']['field'] = 'field_memo_value'; @@ -2509,7 +2506,7 @@ print user_pass_reset_url($account); 3 => 0, 4 => 0, ); - /* Filter criterion: User: Roles */ + /* Critère de filtrage: Utilisateur : Rôles */ $handler->display->display_options['filters']['rid_1']['id'] = 'rid_1'; $handler->display->display_options['filters']['rid_1']['table'] = 'users_roles'; $handler->display->display_options['filters']['rid_1']['field'] = 'rid'; @@ -2518,7 +2515,7 @@ print user_pass_reset_url($account); 4 => '4', ); $handler->display->display_options['filters']['rid_1']['group'] = 1; - /* Filter criterion: User: E-mail */ + /* Critère de filtrage: Utilisateur : Courriel */ $handler->display->display_options['filters']['mail']['id'] = 'mail'; $handler->display->display_options['filters']['mail']['table'] = 'users'; $handler->display->display_options['filters']['mail']['field'] = 'mail'; @@ -2538,7 +2535,7 @@ print user_pass_reset_url($account); 3 => 0, 4 => 0, ); - /* Filter criterion: User: Language */ + /* Critère de filtrage: Utilisateur : Langue */ $handler->display->display_options['filters']['language']['id'] = 'language'; $handler->display->display_options['filters']['language']['table'] = 'users'; $handler->display->display_options['filters']['language']['field'] = 'language'; @@ -2563,7 +2560,7 @@ print user_pass_reset_url($account); 4 => 0, ); $handler->display->display_options['filters']['language']['expose']['reduce'] = TRUE; - /* Filter criterion: User: E-mail */ + /* Critère de filtrage: Utilisateur : Courriel */ $handler->display->display_options['filters']['mail_1']['id'] = 'mail_1'; $handler->display->display_options['filters']['mail_1']['table'] = 'users'; $handler->display->display_options['filters']['mail_1']['field'] = 'mail'; @@ -2603,16 +2600,17 @@ print user_pass_reset_url($account); t('dernier »'), t('Résumé'), t('Displaying @start - @end of @total'), - t('Profile'), - t('User'), + t('Profil'), + t('Utilisateur'), + t('- Choisir une opération -'), t('Titre'), t('Prénom'), t('Nom'), t('[field_first_name] [field_name]'), - t('E-mail'), - t('Edit link'), + t('Courriel'), + t('Lien de modification'), t('[edit_node]'), - t('Roles'), + t('Rôles'), t('Expiration'), t('Société'), t('Organization'), @@ -2629,22 +2627,17 @@ print user_pass_reset_url($account); t('Téléphone'), t('Lettres d’information'), t('Mémo'), - t('Created date'), - t('Last access'), - t('Language'), - t('Active'), + t('Date de création'), + t('Dernier accès'), + t('Langue'), + t('Actif'), t('Login count (?)'), t('.'), t(','), - t('Send e-mail'), + t('Envoyer le courriel'), t('One time login'), - t('Actif'), - t('Rôles'), t('Mémo Contient'), - t('Courriel'), - t('Langue'), t('Page'), - t('more'), t('Data export'), ); $export['admin_peoples'] = $view; @@ -2684,7 +2677,7 @@ print user_pass_reset_url($account); $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'; - /* Field: Bulk operations: Taxonomy term */ + /* Champ: Opérations en masse : Terme de taxonomie */ $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations'; $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'taxonomy_term_data'; $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations'; @@ -2758,7 +2751,7 @@ print user_pass_reset_url($account); 'postpone_processing' => 0, ), ); - /* Field: Taxonomy term: Name */ + /* Champ: Terme de taxonomie : Nom */ $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'taxonomy_term_data'; $handler->display->display_options['fields']['name']['field'] = 'name'; @@ -2766,7 +2759,7 @@ print user_pass_reset_url($account); $handler->display->display_options['fields']['name']['alter']['word_boundary'] = FALSE; $handler->display->display_options['fields']['name']['alter']['ellipsis'] = FALSE; $handler->display->display_options['fields']['name']['link_to_taxonomy'] = TRUE; - /* Filter criterion: Taxonomy vocabulary: Machine name */ + /* Critère de filtrage: Vocabulaire de taxonomie : Nom système */ $handler->display->display_options['filters']['machine_name']['id'] = 'machine_name'; $handler->display->display_options['filters']['machine_name']['table'] = 'taxonomy_vocabulary'; $handler->display->display_options['filters']['machine_name']['field'] = 'machine_name'; @@ -2781,7 +2774,7 @@ print user_pass_reset_url($account); $handler->display->display_options['filters']['machine_name']['expose']['operator'] = 'machine_name_op'; $handler->display->display_options['filters']['machine_name']['expose']['identifier'] = 'machine_name'; $handler->display->display_options['filters']['machine_name']['expose']['reduce'] = TRUE; - /* Filter criterion: Taxonomy vocabulary: Machine name */ + /* Critère de filtrage: Vocabulaire de taxonomie : Nom système */ $handler->display->display_options['filters']['machine_name_1']['id'] = 'machine_name_1'; $handler->display->display_options['filters']['machine_name_1']['table'] = 'taxonomy_vocabulary'; $handler->display->display_options['filters']['machine_name_1']['field'] = 'machine_name'; @@ -2811,10 +2804,10 @@ print user_pass_reset_url($account); t('‹ précédent'), t('suivant ›'), t('dernier »'), - t('Taxonomy term'), + t('Terme de taxonomie'), + t('- Choisir une opération -'), t('Vocabulaire'), t('Page'), - t('more'), ); $export['taxonomy_companies_manager'] = $view; diff --git a/sites/all/modules/features/materio_bookmarks/materio_bookmarks.features.inc b/sites/all/modules/features/materio_bookmarks/materio_bookmarks.features.inc index be29c7fc..11a4477f 100644 --- a/sites/all/modules/features/materio_bookmarks/materio_bookmarks.features.inc +++ b/sites/all/modules/features/materio_bookmarks/materio_bookmarks.features.inc @@ -66,16 +66,8 @@ function materio_bookmarks_image_default_styles() { // Exported image style: card-bookmark. $styles['card-bookmark'] = array( - 'name' => 'card-bookmark', 'effects' => array( 5 => array( - 'label' => 'Mise à l\'échelle et recadrage', - 'help' => 'La mise à l\'échelle et le recadrage maintiendront les proportions originales de l\'image puis recadreront la dimension la plus large. C\'est très utile pour créer des vignettes carrées sans étirer les images.', - 'effect callback' => 'image_scale_and_crop_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_resize_form', - 'summary theme' => 'image_resize_summary', - 'module' => 'image', 'name' => 'image_scale_and_crop', 'data' => array( 'width' => 50, diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc index 7c326fd3..b7d998d9 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc @@ -20,14 +20,6 @@ function materio_content_types_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'fid' => array( - 'columns' => array( - 'fid' => 'fid', - ), - 'table' => 'file_managed', - ), - ), 'indexes' => array( 'fid' => array( 0 => 'fid', @@ -58,7 +50,6 @@ function materio_content_types_field_default_field_bases() { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'computed_field', @@ -94,14 +85,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'node' => array( - 'columns' => array( - 'target_id' => 'nid', - ), - 'table' => 'node', - ), - ), 'indexes' => array( 'target_id' => array( 0 => 'target_id', @@ -146,14 +129,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'tid' => array( - 'columns' => array( - 'tid' => 'tid', - ), - 'table' => 'taxonomy_term_data', - ), - ), 'indexes' => array( 'tid' => array( 0 => 'tid', @@ -186,14 +161,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'tid' => array( - 'columns' => array( - 'tid' => 'tid', - ), - 'table' => 'taxonomy_term_data', - ), - ), 'indexes' => array( 'tid' => array( 0 => 'tid', @@ -226,14 +193,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -260,14 +219,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -293,7 +244,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array( 'value' => array( 0 => 'value', @@ -332,7 +282,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'computed_field', @@ -367,14 +316,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -400,14 +341,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -434,14 +367,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'fid' => array( - 'columns' => array( - 'fid' => 'fid', - ), - 'table' => 'file_managed', - ), - ), 'indexes' => array( 'fid' => array( 0 => 'fid', @@ -471,14 +396,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'node' => array( - 'columns' => array( - 'target_id' => 'nid', - ), - 'table' => 'node', - ), - ), 'indexes' => array( 'target_id' => array( 0 => 'target_id', @@ -516,14 +433,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_nature_titre', - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -549,7 +458,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array( 'value' => array( 0 => 'value', @@ -584,14 +492,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'tid' => array( - 'columns' => array( - 'tid' => 'tid', - ), - 'table' => 'taxonomy_term_data', - ), - ), 'indexes' => array( 'tid' => array( 0 => 'tid', @@ -625,7 +525,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'addressfield', @@ -647,7 +546,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'email', @@ -669,7 +567,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'cck_phone', @@ -692,7 +589,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array( 'value' => array( 0 => 'value', @@ -731,7 +627,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'link', @@ -766,14 +661,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'tid' => array( - 'columns' => array( - 'tid' => 'tid', - ), - 'table' => 'taxonomy_term_data', - ), - ), 'indexes' => array( 'tid' => array( 0 => 'tid', @@ -806,14 +693,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'tid' => array( - 'columns' => array( - 'tid' => 'tid', - ), - 'table' => 'taxonomy_term_data', - ), - ), 'indexes' => array( 'tid' => array( 0 => 'tid', @@ -854,7 +733,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array( 'value' => array( 0 => 'value', @@ -885,7 +763,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array(), 'indexes' => array( 'height' => array( 0 => 'height', @@ -914,14 +791,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'fid' => array( - 'columns' => array( - 'fid' => 'fid', - ), - 'table' => 'file_managed', - ), - ), 'indexes' => array( 'fid' => array( 0 => 'fid', @@ -951,7 +820,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'link', @@ -986,7 +854,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');', 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'computed_field', @@ -1027,14 +894,6 @@ foreach ($states as $state) { 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'name_field', - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -1060,14 +919,6 @@ foreach ($states as $state) { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc index afc61484..f129fc17 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc @@ -486,6 +486,7 @@ function materio_content_types_field_default_field_instances() { 'label' => 'source', 'required' => 0, 'settings' => array( + 'absolute_url' => 1, 'attributes' => array( 'class' => '', 'configurable_title' => 0, @@ -500,6 +501,7 @@ function materio_content_types_field_default_field_instances() { 'entity_translation_sync' => FALSE, 'rel_remove' => 'default', 'title' => 'none', + 'title_label_use_field_label' => FALSE, 'title_maxlength' => 128, 'title_value' => '', 'url' => 0, @@ -1439,16 +1441,7 @@ function materio_content_types_field_default_field_instances() { // Exported field_instance: 'node-company-field_public_address' $field_instances['node-company-field_public_address'] = array( 'bundle' => 'company', - 'default_value' => array( - 0 => array( - 'element_key' => 'node|company|field_public_address|und|0', - 'thoroughfare' => '', - 'premise' => '', - 'postal_code' => '', - 'locality' => '', - 'country' => 'FR', - ), - ), + 'default_value' => NULL, 'deleted' => 0, 'description' => '', 'display' => array( @@ -1544,6 +1537,7 @@ function materio_content_types_field_default_field_instances() { 'module' => 'addressfield', 'settings' => array( 'available_countries' => array(), + 'default_country' => '', 'format_handlers' => array( 'address' => 'address', 'address-hide-country' => 0, @@ -2108,6 +2102,7 @@ function materio_content_types_field_default_field_instances() { 'label' => 'website', 'required' => 0, 'settings' => array( + 'absolute_url' => 1, 'attributes' => array( 'class' => '', 'configurable_title' => 0, @@ -2122,6 +2117,7 @@ function materio_content_types_field_default_field_instances() { 'entity_translation_sync' => FALSE, 'rel_remove' => 'default', 'title' => 'none', + 'title_label_use_field_label' => FALSE, 'title_maxlength' => 128, 'title_value' => '', 'url' => 0, @@ -3997,7 +3993,8 @@ function materio_content_types_field_default_field_instances() { ), ); - // Exported field_instance: 'taxonomy_term-onthologie-field_used_on_advanced_search' + // Exported field_instance: + // 'taxonomy_term-onthologie-field_used_on_advanced_search' $field_instances['taxonomy_term-onthologie-field_used_on_advanced_search'] = array( 'bundle' => 'onthologie', 'default_value' => array( diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.inc index 4c63f51c..03d6bf24 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.features.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.inc @@ -34,16 +34,8 @@ function materio_content_types_image_default_styles() { // Exported image style: card-big. $styles['card-big'] = array( - 'name' => 'card-big', 'effects' => array( 3 => array( - 'label' => 'Scale and crop', - 'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.', - 'effect callback' => 'image_scale_and_crop_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_resize_form', - 'summary theme' => 'image_resize_summary', - 'module' => 'image', 'name' => 'image_scale_and_crop', 'data' => array( 'width' => 430, @@ -57,16 +49,8 @@ function materio_content_types_image_default_styles() { // Exported image style: card-full. $styles['card-full'] = array( - 'name' => 'card-full', 'effects' => array( 4 => array( - 'label' => 'Scale and crop', - 'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.', - 'effect callback' => 'image_scale_and_crop_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_resize_form', - 'summary theme' => 'image_resize_summary', - 'module' => 'image', 'name' => 'image_scale_and_crop', 'data' => array( 'width' => 425, @@ -80,16 +64,8 @@ function materio_content_types_image_default_styles() { // Exported image style: card-medium. $styles['card-medium'] = array( - 'name' => 'card-medium', 'effects' => array( 6 => array( - 'label' => 'Scale and crop', - 'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.', - 'effect callback' => 'image_scale_and_crop_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_resize_form', - 'summary theme' => 'image_resize_summary', - 'module' => 'image', 'name' => 'image_scale_and_crop', 'data' => array( 'width' => 210, @@ -103,16 +79,8 @@ function materio_content_types_image_default_styles() { // Exported image style: card-small. $styles['card-small'] = array( - 'name' => 'card-small', 'effects' => array( 2 => array( - 'label' => 'Scale and crop', - 'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.', - 'effect callback' => 'image_scale_and_crop_effect', - 'dimensions callback' => 'image_resize_dimensions', - 'form callback' => 'image_resize_form', - 'summary theme' => 'image_resize_summary', - 'module' => 'image', 'name' => 'image_scale_and_crop', 'data' => array( 'width' => 100, @@ -173,5 +141,6 @@ function materio_content_types_node_info() { 'help' => '', ), ); + drupal_alter('node_info', $items); return $items; } diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.info b/sites/all/modules/features/materio_content_types/materio_content_types.info index 4caa479b..1441df7f 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.info +++ b/sites/all/modules/features/materio_content_types/materio_content_types.info @@ -425,5 +425,4 @@ features[variable][] = print_sourceurl_forcenode features[variable][] = print_urls features[variable][] = print_urls_anchors features[views_view][] = entity_reference_materiaux_breves -mtime = 1429535622 project path = sites/all/modules/features diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc b/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc index 52546d18..c8dc66db 100644 --- a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc +++ b/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc @@ -50,7 +50,7 @@ function materio_content_types_views_default_views() { 'title' => 'title', ); $handler->display->display_options['row_options']['hide_empty'] = TRUE; - /* Field: Content: Référence Materio */ + /* Champ: Contenu : Référence Materio */ $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio'; $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio'; $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio'; @@ -58,7 +58,7 @@ function materio_content_types_views_default_views() { $handler->display->display_options['fields']['field_reference_materio']['alter']['text'] = '[field_reference_materio] '; $handler->display->display_options['fields']['field_reference_materio']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['field_reference_materio']['hide_empty'] = TRUE; - /* Field: Content: Title */ + /* Champ: Contenu : Titre */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; @@ -68,19 +68,19 @@ function materio_content_types_views_default_views() { $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['title']['link_to_node'] = FALSE; - /* Sort criterion: Content: Post date */ + /* Critère de tri: Contenu : Date de publication */ $handler->display->display_options['sorts']['created']['id'] = 'created'; $handler->display->display_options['sorts']['created']['table'] = 'node'; $handler->display->display_options['sorts']['created']['field'] = 'created'; $handler->display->display_options['sorts']['created']['order'] = 'DESC'; - /* Filter criterion: Content: Published */ + /* 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'] = 1; $handler->display->display_options['filters']['status']['group'] = 1; $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; - /* Filter criterion: Content: Type */ + /* Critère de filtrage: Contenu : 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'; @@ -130,7 +130,6 @@ function materio_content_types_views_default_views() { t('[field_reference_materio] '), t('[field_reference_materio][title]'), t('Entity Reference'), - t('more'), ); $export['entity_reference_materiaux_breves'] = $view; diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_base.inc b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_base.inc index 4c12c65f..a85f40dd 100644 --- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_base.inc +++ b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.field_base.inc @@ -22,14 +22,6 @@ function materio_subscriptions_field_default_field_bases() { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -55,14 +47,6 @@ function materio_subscriptions_field_default_field_bases() { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -86,14 +70,6 @@ function materio_subscriptions_field_default_field_bases() { 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'taxonomy_catalog', - 'foreign keys' => array( - 'tid' => array( - 'columns' => array( - 'tid' => 'tid', - ), - 'table' => 'taxonomy_term_data', - ), - ), 'indexes' => array( 'tid' => array( 0 => 'tid', @@ -122,14 +98,6 @@ function materio_subscriptions_field_default_field_bases() { 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'uc_catalog_image', - 'foreign keys' => array( - 'fid' => array( - 'columns' => array( - 'fid' => 'fid', - ), - 'table' => 'file_managed', - ), - ), 'indexes' => array( 'fid' => array( 0 => 'fid', @@ -155,14 +123,6 @@ function materio_subscriptions_field_default_field_bases() { 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'uc_product_image', - 'foreign keys' => array( - 'fid' => array( - 'columns' => array( - 'fid' => 'fid', - ), - 'table' => 'file_managed', - ), - ), 'indexes' => array( 'fid' => array( 0 => 'fid', diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.inc b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.inc index 06a8a72c..8885d802 100644 --- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.inc +++ b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.features.inc @@ -34,5 +34,6 @@ function materio_subscriptions_uc_product_default_classes() { 'help' => '', ), ); + drupal_alter('node_info', $items); return $items; } diff --git a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info index 8f7816b1..04ed312d 100644 --- a/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info +++ b/sites/all/modules/features/materio_subscriptions/materio_subscriptions.info @@ -266,5 +266,4 @@ features[variable][] = uc_weight_format_lb features[variable][] = uc_weight_format_oz features[variable][] = uc_weight_unit features_exclude[dependencies][uc_coupon] = uc_coupon -mtime = 1429454534 project path = sites/all/modules/features diff --git a/sites/all/modules/features/materio_user_import/materio_user_import.info b/sites/all/modules/features/materio_user_import/materio_user_import.info index 0de270b2..d579dbd4 100644 --- a/sites/all/modules/features/materio_user_import/materio_user_import.info +++ b/sites/all/modules/features/materio_user_import/materio_user_import.info @@ -3,7 +3,6 @@ core = 7.x package = Materio dependencies[] = features dependencies[] = user_import -dependencies[] = user_import_delete features[features_api][] = api:2 features[user_permission][] = import users project path = sites/all/modules/features diff --git a/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_base.inc b/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_base.inc index 68a7e7ab..498a766c 100644 --- a/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_base.inc +++ b/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_base.inc @@ -20,14 +20,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -54,7 +46,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'email', @@ -76,7 +67,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'addressfield', @@ -108,14 +98,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'tid' => array( - 'columns' => array( - 'tid' => 'tid', - ), - 'table' => 'taxonomy_term_data', - ), - ), 'indexes' => array( 'tid' => array( 0 => 'tid', @@ -157,7 +139,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'number', @@ -189,14 +170,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -233,14 +206,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -266,14 +231,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -310,14 +267,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -354,14 +303,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -398,7 +339,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'email', @@ -417,14 +357,6 @@ function materio_user_profiles_field_default_field_bases() { 'deleted' => 0, 'entity_types' => array(), 'field_name' => 'field_private_name', - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -451,7 +383,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array( 'value' => array( 0 => 'value', @@ -495,7 +426,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'cck_phone', @@ -528,14 +458,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -572,14 +494,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -616,14 +530,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', @@ -660,7 +566,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 2, ), - 'foreign keys' => array(), 'indexes' => array(), 'locked' => 0, 'module' => 'link', @@ -705,14 +610,6 @@ function materio_user_profiles_field_default_field_bases() { 'field_permissions' => array( 'type' => 0, ), - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), 'indexes' => array( 'format' => array( 0 => 'format', diff --git a/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_instance.inc b/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_instance.inc index 92b127fb..140d2323 100644 --- a/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_instance.inc +++ b/sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_instance.inc @@ -82,16 +82,7 @@ function materio_user_profiles_field_default_field_instances() { // Exported field_instance: 'profile2-adherent-field_adresse' $field_instances['profile2-adherent-field_adresse'] = array( 'bundle' => 'adherent', - 'default_value' => array( - 0 => array( - 'element_key' => 'profile2|adherent|field_adresse|und|0', - 'thoroughfare' => '', - 'premise' => '', - 'postal_code' => '', - 'locality' => '', - 'country' => 'FR', - ), - ), + 'default_value' => NULL, 'deleted' => 0, 'description' => '', 'display' => array( @@ -121,6 +112,7 @@ function materio_user_profiles_field_default_field_instances() { 'module' => 'addressfield', 'settings' => array( 'available_countries' => array(), + 'default_country' => '', 'format_handlers' => array( 'address' => 'address', 'address-hide-country' => 0, @@ -749,6 +741,7 @@ function materio_user_profiles_field_default_field_instances() { 'label' => 'Website', 'required' => 0, 'settings' => array( + 'absolute_url' => 1, 'attributes' => array( 'class' => '', 'configurable_title' => 0, @@ -763,6 +756,7 @@ function materio_user_profiles_field_default_field_instances() { 'entity_translation_sync' => FALSE, 'rel_remove' => 'default', 'title' => 'none', + 'title_label_use_field_label' => FALSE, 'title_maxlength' => 128, 'title_value' => 'website', 'url' => 0, @@ -848,7 +842,8 @@ function materio_user_profiles_field_default_field_instances() { ), ); - // Exported field_instance: 'profile2-contact_operationnel-field_private_email' + // Exported field_instance: + // 'profile2-contact_operationnel-field_private_email' $field_instances['profile2-contact_operationnel-field_private_email'] = array( 'bundle' => 'contact_operationnel', 'default_value' => NULL, @@ -917,7 +912,8 @@ function materio_user_profiles_field_default_field_instances() { ), ); - // Exported field_instance: 'profile2-contact_operationnel-field_private_name_title' + // Exported field_instance: + // 'profile2-contact_operationnel-field_private_name_title' $field_instances['profile2-contact_operationnel-field_private_name_title'] = array( 'bundle' => 'contact_operationnel', 'default_value' => NULL, @@ -951,7 +947,8 @@ function materio_user_profiles_field_default_field_instances() { ), ); - // Exported field_instance: 'profile2-contact_operationnel-field_private_phone' + // Exported field_instance: + // 'profile2-contact_operationnel-field_private_phone' $field_instances['profile2-contact_operationnel-field_private_phone'] = array( 'bundle' => 'contact_operationnel', 'deleted' => 0, @@ -1226,7 +1223,8 @@ function materio_user_profiles_field_default_field_instances() { ), ); - // Exported field_instance: 'profile2-contact_operationnel-field_private_quality' + // Exported field_instance: + // 'profile2-contact_operationnel-field_private_quality' $field_instances['profile2-contact_operationnel-field_private_quality'] = array( 'bundle' => 'contact_operationnel', 'default_value' => NULL,