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 261be3b4..b407b9b9 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 @@ -10,25 +10,6 @@ function materio_administration_menu_default_menu_links() { $menu_links = array(); - // Exported menu link: navigation_:node/% - $menu_links['navigation_:node/%'] = array( - 'menu_name' => 'navigation', - 'link_path' => 'node/%', - 'router_path' => 'node/%', - 'link_title' => '', - 'options' => array( - 'identifier' => 'navigation_:node/%', - ), - 'module' => 'system', - 'hidden' => 0, - 'external' => 0, - 'has_children' => 0, - 'expanded' => 0, - 'weight' => 0, - 'customized' => 0, - 'language' => 'und', - 'menu_links_customized' => 0, - ); // Exported menu link: navigation_add-content:node/add $menu_links['navigation_add-content:node/add'] = array( 'menu_name' => 'navigation', @@ -112,11 +93,11 @@ function materio_administration_menu_default_menu_links() { 'external' => 1, 'has_children' => 0, 'expanded' => 0, - 'weight' => 0, + 'weight' => -50, 'customized' => 1, 'language' => 'und', 'menu_links_customized' => 1, - 'parent_identifier' => 'navigation_taxonomy:admin/structure/taxonomy_manager/voc', + 'parent_identifier' => 'navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres', ); // Exported menu link: navigation_breve:node/add/breve $menu_links['navigation_breve:node/add/breve'] = array( @@ -426,26 +407,6 @@ function materio_administration_menu_default_menu_links() { 'menu_links_customized' => 1, 'parent_identifier' => 'navigation_mon-compte:user', ); - // Exported menu link: navigation_looping-embed-video:node/add/looping-embed-video - $menu_links['navigation_looping-embed-video:node/add/looping-embed-video'] = array( - 'menu_name' => 'navigation', - 'link_path' => 'node/add/looping-embed-video', - 'router_path' => 'node/add/looping-embed-video', - 'link_title' => 'looping embed video', - 'options' => array( - 'identifier' => 'navigation_looping-embed-video:node/add/looping-embed-video', - ), - 'module' => 'system', - 'hidden' => 0, - 'external' => 0, - 'has_children' => 0, - 'expanded' => 0, - 'weight' => 0, - 'customized' => 0, - 'language' => 'und', - 'menu_links_customized' => 0, - 'parent_identifier' => 'navigation_ajouter-du-contenu:node/add', - ); // Exported menu link: navigation_mandrill:admin/reports/mandrill $menu_links['navigation_mandrill:admin/reports/mandrill'] = array( 'menu_name' => 'navigation', @@ -488,26 +449,6 @@ function materio_administration_menu_default_menu_links() { 'menu_links_customized' => 1, 'parent_identifier' => 'navigation_ajouter-du-contenu:node/add', ); - // Exported menu link: navigation_materio-newsletter:node/add/simplenews/6274 - $menu_links['navigation_materio-newsletter:node/add/simplenews/6274'] = array( - 'menu_name' => 'navigation', - 'link_path' => 'node/add/simplenews/6274', - 'router_path' => 'node/add/simplenews/6274', - 'link_title' => 'materiO’ newsletter', - 'options' => array( - 'identifier' => 'navigation_materio-newsletter:node/add/simplenews/6274', - ), - 'module' => 'system', - 'hidden' => 0, - 'external' => 0, - 'has_children' => 0, - 'expanded' => 0, - 'weight' => 0, - 'customized' => 0, - 'language' => 'und', - 'menu_links_customized' => 0, - 'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews', - ); // Exported menu link: navigation_menus:admin/config/regional/translate/table/menu $menu_links['navigation_menus:admin/config/regional/translate/table/menu'] = array( 'menu_name' => 'navigation', @@ -885,7 +826,7 @@ function materio_administration_menu_default_menu_links() { 'module' => 'menu', 'hidden' => 0, 'external' => 0, - 'has_children' => 0, + 'has_children' => 1, 'expanded' => 0, 'weight' => 8, 'customized' => 0, @@ -938,26 +879,6 @@ function materio_administration_menu_default_menu_links() { 'language' => 'und', 'menu_links_customized' => 1, ); - // Exported menu link: navigation_test:node/add/simplenews/6585 - $menu_links['navigation_test:node/add/simplenews/6585'] = array( - 'menu_name' => 'navigation', - 'link_path' => 'node/add/simplenews/6585', - 'router_path' => 'node/add/simplenews/6585', - 'link_title' => 'test', - 'options' => array( - 'identifier' => 'navigation_test:node/add/simplenews/6585', - ), - 'module' => 'system', - 'hidden' => 0, - 'external' => 0, - 'has_children' => 0, - 'expanded' => 0, - 'weight' => 0, - 'customized' => 0, - 'language' => 'und', - 'menu_links_customized' => 0, - 'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews', - ); // Exported menu link: navigation_user-account:user $menu_links['navigation_user-account:user'] = array( 'menu_name' => 'navigation', @@ -1048,26 +969,6 @@ function materio_administration_menu_default_menu_links() { 'menu_links_customized' => 1, 'parent_identifier' => 'navigation_ajouter-du-contenu:node/add', ); - // Exported menu link: navigation_ze-daily-materio039:node/add/simplenews/6374 - $menu_links['navigation_ze-daily-materio039:node/add/simplenews/6374'] = array( - 'menu_name' => 'navigation', - 'link_path' => 'node/add/simplenews/6374', - 'router_path' => 'node/add/simplenews/6374', - 'link_title' => 'Ze Daily materiO'', - 'options' => array( - 'identifier' => 'navigation_ze-daily-materio039:node/add/simplenews/6374', - ), - 'module' => 'system', - 'hidden' => 0, - 'external' => 0, - 'has_children' => 0, - 'expanded' => 0, - 'weight' => 0, - 'customized' => 0, - 'language' => 'und', - 'menu_links_customized' => 0, - 'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews', - ); // Translatables // Included for use with string extractors like potx. t('Add content'); @@ -1109,11 +1010,7 @@ function materio_administration_menu_default_menu_links() { t('User account'); t('Users'); t('Webform'); - t('Ze Daily materiO''); t('customers'); - t('looping embed video'); - t('materiO’ newsletter'); - t('test'); return $menu_links; diff --git a/sites/all/modules/features/materio_administration/materio_administration.info b/sites/all/modules/features/materio_administration/materio_administration.info index 380fbc1a..cf78e458 100644 --- a/sites/all/modules/features/materio_administration/materio_administration.info +++ b/sites/all/modules/features/materio_administration/materio_administration.info @@ -19,7 +19,6 @@ features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 features[features_api][] = api:2 features[menu_custom][] = navigation -features[menu_links][] = navigation_:node/% features[menu_links][] = navigation_add-content:node/add features[menu_links][] = navigation_add-user:admin/people/create features[menu_links][] = navigation_adhsions:node/11186/webform-results @@ -38,10 +37,8 @@ features[menu_links][] = navigation_formulaires-dadhsion:http://www.materio.com/ features[menu_links][] = navigation_frequently-asked-questions:faq-page features[menu_links][] = navigation_ip-address-tracking:admin/reports/ip_tracking features[menu_links][] = navigation_log-out:user/logout -features[menu_links][] = navigation_looping-embed-video:node/add/looping-embed-video features[menu_links][] = navigation_mandrill:admin/reports/mandrill features[menu_links][] = navigation_materiau:node/add/materiau -features[menu_links][] = navigation_materio-newsletter:node/add/simplenews/6274 features[menu_links][] = navigation_menus:admin/config/regional/translate/table/menu features[menu_links][] = navigation_my-sessions:mysessions features[menu_links][] = navigation_newletters:admin/content/simplenews @@ -61,12 +58,10 @@ features[menu_links][] = navigation_subscriptions-newsletter:admin/people/simple features[menu_links][] = navigation_tag-libres:admin/structure/taxonomy_manager/voc/tag_libres features[menu_links][] = navigation_taxonomy:admin/config/regional/translate/table/taxonomy features[menu_links][] = navigation_taxonomy:admin/structure/taxonomy_manager/voc -features[menu_links][] = navigation_test:node/add/simplenews/6585 features[menu_links][] = navigation_user-account:user features[menu_links][] = navigation_users:admin/people features[menu_links][] = navigation_users:admin/users features[menu_links][] = navigation_webform:node/add/webform -features[menu_links][] = navigation_ze-daily-materio039:node/add/simplenews/6374 features[user_permission][] = access administration menu features[user_permission][] = display drupal links features[user_permission][] = flush caches 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 b1c2f041..b4aa3d76 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 @@ -1873,8 +1873,8 @@ function materio_administration_views_default_views() { 'field_name' => 'mail', 'mail' => 'mail', 'edit_node' => 'mail', - 'rid' => 'php', - 'php' => 'php', + 'rid' => 'expiration', + 'expiration' => 'expiration', 'field_company' => 'field_company', 'field_organization' => 'field_company', 'field_service' => 'field_company', @@ -1946,9 +1946,9 @@ function materio_administration_views_default_views() { 'separator' => '
', 'empty_column' => 0, ), - 'php' => array( + 'expiration' => array( 'sortable' => 1, - 'default_sort_order' => 'desc', + 'default_sort_order' => 'asc', 'align' => '', 'separator' => '
', 'empty_column' => 0, @@ -2224,36 +2224,14 @@ function materio_administration_views_default_views() { $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'; - /* 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'; - $handler->display->display_options['fields']['php']['label'] = 'Expiration'; - $handler->display->display_options['fields']['php']['use_php_setup'] = 0; - $handler->display->display_options['fields']['php']['php_value'] = 'if(!isset($row->uid)){ - return false; -} -$query = db_select(\'uc_roles_expirations\', \'e\') - ->fields(\'e\') - ->condition(\'e.uid\', $row->uid); -$result = $query->execute(); - -foreach($result as $r){ - $expiration = $r->expiration; - break; -} -if(isset($expiration)){ - return $expiration; -}else{ - return false; -}'; - $handler->display->display_options['fields']['php']['php_output'] = ''; - $handler->display->display_options['fields']['php']['use_php_click_sortable'] = '4'; - $handler->display->display_options['fields']['php']['php_click_sortable'] = ''; + /* Champ: Utilisateur : Ubercart Role expiration date/time */ + $handler->display->display_options['fields']['expiration']['id'] = 'expiration'; + $handler->display->display_options['fields']['expiration']['table'] = 'uc_roles_expirations'; + $handler->display->display_options['fields']['expiration']['field'] = 'expiration'; + $handler->display->display_options['fields']['expiration']['label'] = 'Expiration'; + $handler->display->display_options['fields']['expiration']['date_format'] = 'custom'; + $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d'; + $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long'; /* 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'; @@ -2399,11 +2377,6 @@ 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'] = ''; - /* 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'; /* Critère de filtrage: Utilisateur : Actif */ $handler->display->display_options['filters']['status']['id'] = 'status'; $handler->display->display_options['filters']['status']['table'] = 'users';