From 73186732c31c2b9d4e970c93460bd0dd35f8cbf1 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Mon, 20 Apr 2015 14:57:52 +0200 Subject: [PATCH] switch from edit menu to admin_menu with admin_menu_source for administrator --- .../admin/admin_menu_source/LICENSE.txt | 339 ++++++++++++++++++ .../admin_menu_source/admin_menu_source.inc | 39 ++ .../admin_menu_source/admin_menu_source.info | 12 + .../admin_menu_source.module | 117 ++++++ ...dministration.features.user_permission.inc | 42 +++ .../materio_administration.info | 19 +- .../materio_administration.strongarm.inc | 82 +++++ .../materio_administration.views_default.inc | 17 +- 8 files changed, 658 insertions(+), 9 deletions(-) create mode 100644 sites/all/modules/contrib/admin/admin_menu_source/LICENSE.txt create mode 100644 sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.inc create mode 100644 sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.info create mode 100644 sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.module create mode 100644 sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc diff --git a/sites/all/modules/contrib/admin/admin_menu_source/LICENSE.txt b/sites/all/modules/contrib/admin/admin_menu_source/LICENSE.txt new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/sites/all/modules/contrib/admin/admin_menu_source/LICENSE.txt @@ -0,0 +1,339 @@ + 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/admin/admin_menu_source/admin_menu_source.inc b/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.inc new file mode 100644 index 00000000..d17c3cfc --- /dev/null +++ b/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.inc @@ -0,0 +1,39 @@ + TRUE, + '#title' => t('Menu source per role'), + ); + + foreach ($roles as $rid => $role) { + $form['admin_menu_source_settings'][$rid]['role'] = array( + '#markup' => $role + ); + $form['admin_menu_source_settings'][$rid]['source'] = array( + '#type' => 'select', + '#options' => array('' => t('Default')) + $menus, + '#default_value' => isset($default_values[$rid]['source']) ? $default_values[$rid]['source'] : '', + ); + } + + //add a custom submit handler + $form['#submit'][] = 'admin_menu_source_settings_submit'; + + return system_settings_form($form); +} + +function admin_menu_source_settings_submit() { + //flush admin_menu's cache + admin_menu_flush_caches(); +} \ No newline at end of file diff --git a/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.info b/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.info new file mode 100644 index 00000000..fbd741e7 --- /dev/null +++ b/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.info @@ -0,0 +1,12 @@ +name = Administration Menu Source +description = Use a different menu as the Administration Menu. +dependencies[] = admin_menu +package = Administration +core = 7.x +configure = admin/config/administration/admin_menu/source +; Information added by drupal.org packaging script on 2012-04-03 +version = "7.x-1.0" +core = "7.x" +project = "admin_menu_source" +datestamp = "1333434040" + diff --git a/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.module b/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.module new file mode 100644 index 00000000..11f211c3 --- /dev/null +++ b/sites/all/modules/contrib/admin/admin_menu_source/admin_menu_source.module @@ -0,0 +1,117 @@ +' . t('Set the source menu for the Administration menu per role.') . '

'; + } +} + +/** + * Implements hook_menu(). + */ +function admin_menu_source_menu() { + $items = array(); + + $items['admin/config/administration/admin_menu/settings'] = array( + 'title' => 'Settings', + 'type' => MENU_DEFAULT_LOCAL_TASK, + ); + + $items['admin/config/administration/admin_menu/source'] = array( + 'title' => 'Source', + 'description' => 'Configure the source for the administration menu.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('admin_menu_source_settings'), + 'access arguments' => array('administer site configuration'), + 'type' => MENU_LOCAL_TASK, + 'file' => 'admin_menu_source.inc', + ); + + return $items; +} + +/** + * Implements hook_theme(). + */ +function admin_menu_source_theme() { + return array( + 'admin_menu_source_settings_form' => array( + 'render element' => 'form', + ), + ); +} + +/** + * Implements hook_admin_menu_output_alter(). + */ +function admin_menu_source_admin_menu_output_alter(&$content) { + global $user; + + $rid = key(array_reverse($user->roles, TRUE)); + $source_menu = _admin_menu_source_get_role_menu($rid); + + if (!empty($source_menu)) { + $content['menu'] = admin_menu_links_menu(admin_menu_tree($source_menu)); + $content['menu']['#theme'] = 'admin_menu_links'; + $content['menu']['#weight'] = 0; + $content['menu']['#sorted'] = TRUE; + } +} + +/** + * Returns HTML for a settings form. + * + * @param $variables + * An associative array containing: + * - form: A render element representing the form. + * + * @ingroup themeable + */ +function theme_admin_menu_source_settings_form($variables) { + $output = ''; + $form = $variables['form']; + + $rows = array(); + if (!empty($form['admin_menu_source_settings'])) { + foreach (element_children($form['admin_menu_source_settings']) as $key) { + $rows[] = array( + drupal_render($form['admin_menu_source_settings'][$key]['role']), + drupal_render($form['admin_menu_source_settings'][$key]['source']), + ); + } + } + $output .= theme('table', array('header' => array(t('Role'), t('Menu')), 'rows' => $rows)); + $output .= drupal_render($form['submit']); + $output .= drupal_render_children($form); + + return $output; +} + +/** + * Helper function to get settings for admin_menu_source + */ +function _admin_menu_source_get_settings() { + return variable_get('admin_menu_source_settings', array()); +} + +/** + * Helper function to get source menu per role + * + * @param $rid + * the user role id + */ +function _admin_menu_source_get_role_menu($rid) { + //load the settings + $settings = _admin_menu_source_get_settings(); + + return isset($settings[$rid]['source']) ? $settings[$rid]['source'] : ''; +} \ No newline at end of file diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc new file mode 100644 index 00000000..89469beb --- /dev/null +++ b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc @@ -0,0 +1,42 @@ + 'access administration menu', + 'roles' => array( + 'administrator' => 'administrator', + 'root' => 'root', + ), + 'module' => 'admin_menu', + ); + + // Exported permission: 'display drupal links'. + $permissions['display drupal links'] = array( + 'name' => 'display drupal links', + 'roles' => array( + 'root' => 'root', + ), + 'module' => 'admin_menu', + ); + + // Exported permission: 'flush caches'. + $permissions['flush caches'] = array( + 'name' => 'flush caches', + 'roles' => array( + 'root' => 'root', + ), + 'module' => 'admin_menu', + ); + + return $permissions; +} diff --git a/sites/all/modules/features/materio_administration/materio_administration.info b/sites/all/modules/features/materio_administration/materio_administration.info index 0ebfe83e..0edd19b0 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.info +++ b/sites/all/modules/features/materio_administration/materio_administration.info @@ -1,9 +1,13 @@ name = Materio Administration core = 7.x package = Materio +dependencies[] = admin +dependencies[] = admin_menu_source +dependencies[] = admin_menu_toolbar dependencies[] = features dependencies[] = menu dependencies[] = strongarm +dependencies[] = views dependencies[] = views_bulk_operations dependencies[] = views_data_export dependencies[] = workflow_actions @@ -13,6 +17,19 @@ features[ctools][] = views:views_default:3.0 features[features_api][] = api:2 features[menu_custom][] = navigation features[menu_links][] = navigation_:materio_search_api_ajax/actuality +features[user_permission][] = access administration menu +features[user_permission][] = display drupal links +features[user_permission][] = flush caches +features[variable][] = admin_menu_cache_client +features[variable][] = admin_menu_devel_modules_enabled +features[variable][] = admin_menu_devel_modules_skip +features[variable][] = admin_menu_display +features[variable][] = admin_menu_margin_top +features[variable][] = admin_menu_position_fixed +features[variable][] = admin_menu_show_all +features[variable][] = admin_menu_tweak_modules +features[variable][] = admin_menu_tweak_permissions +features[variable][] = admin_menu_tweak_tabs features[variable][] = editmenu_cache_menu features[variable][] = editmenu_css_error features[variable][] = editmenu_css_filename @@ -38,5 +55,5 @@ features[views_view][] = admin_content_node features[views_view][] = admin_contents features[views_view][] = admin_peoples features[views_view][] = taxonomy_companies_manager -features_exclude[dependencies][views] = views +mtime = 1429534191 project path = sites/all/modules/features diff --git a/sites/all/modules/features/materio_administration/materio_administration.strongarm.inc b/sites/all/modules/features/materio_administration/materio_administration.strongarm.inc index 8c861211..38ca43ac 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.strongarm.inc +++ b/sites/all/modules/features/materio_administration/materio_administration.strongarm.inc @@ -10,6 +10,88 @@ function materio_administration_strongarm() { $export = array(); + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_cache_client'; + $strongarm->value = 0; + $export['admin_menu_cache_client'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_devel_modules_enabled'; + $strongarm->value = array( + 'field_ui' => 'field_ui', + 'l10n_update' => 'l10n_update', + 'views_ui' => 'views_ui', + 'devel' => 'devel', + ); + $export['admin_menu_devel_modules_enabled'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_devel_modules_skip'; + $strongarm->value = array( + 'admin_devel' => 0, + 'devel' => 0, + 'devel_node_access' => 0, + 'field_ui' => 0, + 'l10n_update' => 0, + 'views_ui' => 0, + ); + $export['admin_menu_devel_modules_skip'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_display'; + $strongarm->value = 'plid'; + $export['admin_menu_display'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_margin_top'; + $strongarm->value = 1; + $export['admin_menu_margin_top'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_position_fixed'; + $strongarm->value = 0; + $export['admin_menu_position_fixed'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_show_all'; + $strongarm->value = 0; + $export['admin_menu_show_all'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_tweak_modules'; + $strongarm->value = 0; + $export['admin_menu_tweak_modules'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_tweak_permissions'; + $strongarm->value = 0; + $export['admin_menu_tweak_permissions'] = $strongarm; + + $strongarm = new stdClass(); + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'admin_menu_tweak_tabs'; + $strongarm->value = 0; + $export['admin_menu_tweak_tabs'] = $strongarm; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; 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 d1f4420a..d8221fe1 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 @@ -1883,6 +1883,7 @@ function materio_administration_views_default_views() { 'field_user_website' => 'field_adresse', 'field_adresse' => 'field_adresse', 'field_private_phone' => 'field_adresse', + 'php_2' => 'php_2', 'field_memo' => 'field_memo', 'created' => 'created', 'access' => 'access', @@ -1891,7 +1892,6 @@ function materio_administration_views_default_views() { 'value' => 'value', 'views_send' => 'views_send', 'php_1' => 'php_1', - 'name' => 'name', ); $handler->display->display_options['style_options']['default'] = 'created'; $handler->display->display_options['style_options']['info'] = array( @@ -1929,7 +1929,7 @@ function materio_administration_views_default_views() { 'empty_column' => 0, ), 'mail' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '
', @@ -1953,7 +1953,7 @@ function materio_administration_views_default_views() { 'empty_column' => 0, ), 'field_company' => array( - 'sortable' => 0, + 'sortable' => 1, 'default_sort_order' => 'asc', 'align' => '', 'separator' => '
', @@ -2015,6 +2015,11 @@ function materio_administration_views_default_views() { 'separator' => '
', 'empty_column' => 0, ), + 'php_2' => array( + 'align' => '', + 'separator' => '', + 'empty_column' => 0, + ), 'field_memo' => array( 'sortable' => 0, 'default_sort_order' => 'asc', @@ -2067,11 +2072,6 @@ function materio_administration_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'name' => array( - 'align' => '', - 'separator' => '', - 'empty_column' => 0, - ), ); /* Entête: Global : Résumé des résultats */ $handler->display->display_options['header']['result']['id'] = 'result'; @@ -2580,6 +2580,7 @@ print user_pass_reset_url($account); $handler = $view->new_display('views_data_export', 'Data export', 'views_data_export_1'); $handler->display->display_options['pager']['type'] = 'some'; $handler->display->display_options['style_plugin'] = 'views_data_export_csv'; + $handler->display->display_options['path'] = 'admin/users/export'; $translatables['admin_peoples'] = array( t('Master'), t('Admin Users'),