Skip to content

Instantly share code, notes, and snippets.

@paolomainardi

paolomainardi/gist:d767de9c8464bb7c9ab0

Created September 2, 2014 09:31
Show Gist options
  • Save paolomainardi/d767de9c8464bb7c9ab0 to your computer and use it in GitHub Desktop.
Save paolomainardi/d767de9c8464bb7c9ab0 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.diff
diff --git a/elite.make b/elite.make
index 0a6fdee..75070c9 100644
--- a/elite.make
+++ b/elite.make
@@ -436,6 +436,7 @@ projects[domain_bonus][subdir] = "contrib"
projects[domain_bonus][version] = "1.0-alpha1"
projects[domain_bonus][type] = "module"
projects[domain_bonus][patch][] = "http://files.agavee.com/patches/remove_object_log_dependence.patch"
+projects[domain_bonus][patch][] = "https://drupal.org/files/issues/domain_bonus-UBERNAME_fix-2329747-2.patch"
projects[domain_rules][subdir] = "contrib"
projects[domain_rules][version] = "1.6"
diff --git a/sites/all/modules/custom/elite_fixtures/data/domain_config.csv b/sites/all/modules/custom/elite_fixtures/data/domain_config.csv
index ba51d92..060b442 100644
--- a/sites/all/modules/custom/elite_fixtures/data/domain_config.csv
+++ b/sites/all/modules/custom/elite_fixtures/data/domain_config.csv
@@ -1,4 +1,4 @@
file_id,filename,name,site,sign,domain_id
1,borsa_logo.png,Borsa Italiana,http://www.borsaitaliana.it/,Borsaitaliana - London Stock Exchange Group,1
-2,lseg_logo.png,London Stock Exchange Group,http://www.lseg.com/,London Stock Exchange Group,2
+2,lseg_logo.png,London Stock Exchange Group,http://www.londonstockexchange.com/,London Stock Exchange Group,2
3,borsa_logo_ee.png,Borsa Italiana,http://www.borsaitaliana.it/,Borsaitaliana - London Stock Exchange Group,3
diff --git a/sites/all/modules/features/elite_base/elite_base.install b/sites/all/modules/features/elite_base/elite_base.install
index bfa599b..f37091d 100644
--- a/sites/all/modules/features/elite_base/elite_base.install
+++ b/sites/all/modules/features/elite_base/elite_base.install
@@ -211,3 +211,13 @@ function elite_base_update_7205() {
menu_link_save($item);
}
}
+
+/**
+ * Update domain_config settings for elite-uk.
+ */
+function elite_base_update_7206() {
+ $uk_domain_id = 2;
+ $domain_conf = domain_conf_variable_get($uk_domain_id, 'domain_elite_conf');
+ $domain_conf['site_owner_site'] = 'http://www.londonstockexchange.com/';
+ domain_conf_variable_set($uk_domain_id, 'domain_elite_conf', $domain_conf);
+}
diff --git a/sites/all/modules/features/elite_chat/js/chat.js b/sites/all/modules/features/elite_chat/js/chat.js
index 73c01df..f4071c7 100644
--- a/sites/all/modules/features/elite_chat/js/chat.js
+++ b/sites/all/modules/features/elite_chat/js/chat.js
@@ -1,6 +1,6 @@
/*global window,Drupal,jQuery,converse*/
(function ($) {
- Drupal.behavior.eliteChat = {
+ Drupal.behaviors.eliteChat = {
attach: function (context, settings) {
$(window).on('beforeunload', function () {
converse.disconnectBeforeUnload();
diff --git a/sites/all/modules/features/elite_company/elite_company.install b/sites/all/modules/features/elite_company/elite_company.install
index 899bccc..70deec0 100644
--- a/sites/all/modules/features/elite_company/elite_company.install
+++ b/sites/all/modules/features/elite_company/elite_company.install
@@ -204,3 +204,49 @@ function elite_company_update_7007(&$sandbox) {
}
}
}
+
+/**
+ * Assign 'company member' role to members of a company group of Growth Program.
+ */
+function elite_company_update_7008(&$sandbox) {
+
+ $query = db_select('og_role', 'o');
+ $role_id = $query->fields('o', array('rid'))
+ ->condition('name', 'company member', '=')
+ ->condition('group_bundle', 'elite_company', '=')
+ ->execute()
+ ->fetchAssoc();
+
+ if (isset($role_id['rid'])) {
+ $query = new EntityFieldQuery();
+ $query->entityCondition('entity_type', 'node')
+ ->entityCondition('bundle', 'elite_company')
+ ->entityCondition('domains', array('1', '2'), 'IN')
+ ->addMetaData('account', user_load(1));
+ $result = $query->execute();
+
+ if (is_array($result) && isset($result['node'])) {
+ foreach ($result['node'] as $nid => $value) {
+
+ $company_is_a_group = og_is_group('node', $nid);
+ if ($company_is_a_group) {
+
+ $query = new EntityFieldQuery();
+ $query->entityCondition('entity_type', 'user')
+ ->fieldCondition('og_user_node', 'target_id', $nid, '=');
+
+ $users = $query->execute();
+
+ if (is_array($users) && isset($users['user'])) {
+ foreach ($users['user'] as $uid => $user_obj) {
+ $roles = og_get_user_roles('node', $nid, $uid);
+ if (!in_array('company member', $roles)) {
+ og_role_grant('node', $nid, $uid, $role_id['rid']);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/sites/all/modules/features/elite_company/elite_company.module b/sites/all/modules/features/elite_company/elite_company.module
index a2530b1..cf30393 100644
--- a/sites/all/modules/features/elite_company/elite_company.module
+++ b/sites/all/modules/features/elite_company/elite_company.module
@@ -1531,11 +1531,14 @@ function elite_company_form_alter(&$form, &$form_state, $form_id) {
// Hide field to swich sector if user != PA and != CA.
$user_can_manage_sector_display = FALSE;
if (isset($the_company->nid)) {
- $logged_user_is_a_platform_administrator = in_array('platform administrator', $user->roles);
- $roles = og_get_user_roles('node', $the_company->nid, $user->uid, TRUE);
- $logged_user_is_a_company_administrator_of_company = in_array('company administrator', $roles);
- if ($logged_user_is_a_platform_administrator || $logged_user_is_a_company_administrator_of_company) {
- $user_can_manage_sector_display = TRUE;
+ $company_type = field_get_items('node', $the_company, 'field_cmp_gnr_info_type');
+ if (is_array($company_type) && isset($company_type[0]['value']) && $company_type[0]['value'] === 'elite') {
+ $logged_user_is_a_platform_administrator = in_array('platform administrator', $user->roles);
+ $roles = og_get_user_roles('node', $the_company->nid, $user->uid, TRUE);
+ $logged_user_is_a_company_administrator_of_company = in_array('company administrator', $roles);
+ if ($logged_user_is_a_platform_administrator || $logged_user_is_a_company_administrator_of_company) {
+ $user_can_manage_sector_display = TRUE;
+ }
}
}
$form['field_cmp_gnr_info_show_subsecto']['#access'] = $user_can_manage_sector_display;
diff --git a/sites/all/modules/features/elite_content_page/elite_content_page.context.inc b/sites/all/modules/features/elite_content_page/elite_content_page.context.inc
index f44beeb..3ee2410 100644
--- a/sites/all/modules/features/elite_content_page/elite_content_page.context.inc
+++ b/sites/all/modules/features/elite_content_page/elite_content_page.context.inc
@@ -136,19 +136,19 @@ function elite_content_page_context_default_contexts() {
'module' => 'views',
'delta' => 'news-block_news_front',
'region' => 'sidebar_second',
- 'weight' => '-8',
+ 'weight' => '-9',
),
- 'views-96c8469f8a8d100e7459d895e1a09c2e' => array(
+ 'views-e7c35f6bb7af095ceaf75b0feee18d66' => array(
'module' => 'views',
- 'delta' => '96c8469f8a8d100e7459d895e1a09c2e',
+ 'delta' => 'e7c35f6bb7af095ceaf75b0feee18d66',
'region' => 'sidebar_second',
- 'weight' => '-7',
+ 'weight' => '-8',
),
'boxes-elite_home_en_contact' => array(
'module' => 'boxes',
'delta' => 'elite_home_en_contact',
'region' => 'sidebar_second',
- 'weight' => '-6',
+ 'weight' => '-7',
),
),
),
@@ -288,9 +288,9 @@ function elite_content_page_context_default_contexts() {
'region' => 'sidebar_second',
'weight' => '-9',
),
- 'views-96c8469f8a8d100e7459d895e1a09c2e' => array(
+ 'views-e7c35f6bb7af095ceaf75b0feee18d66' => array(
'module' => 'views',
- 'delta' => '96c8469f8a8d100e7459d895e1a09c2e',
+ 'delta' => 'e7c35f6bb7af095ceaf75b0feee18d66',
'region' => 'sidebar_second',
'weight' => '-8',
),
diff --git a/sites/all/modules/features/elite_event/elite_event.info b/sites/all/modules/features/elite_event/elite_event.info
index 3ef1f7f..02bfb39 100644
--- a/sites/all/modules/features/elite_event/elite_event.info
+++ b/sites/all/modules/features/elite_event/elite_event.info
@@ -19,5 +19,6 @@ features[user_permission][] = delete own elite_event content
features[user_permission][] = edit any elite_event content
features[user_permission][] = edit own elite_event content
features[views_view][] = elite_ee_events_public
+features[views_view][] = elite_event_growth_events
features_exclude[dependencies][ctools] = ctools
files[] = views/elite_event_handler_filter_equality.inc
diff --git a/sites/all/modules/features/elite_event/elite_event.views_default.inc b/sites/all/modules/features/elite_event/elite_event.views_default.inc
index e347100..fd18089 100644
--- a/sites/all/modules/features/elite_event/elite_event.views_default.inc
+++ b/sites/all/modules/features/elite_event/elite_event.views_default.inc
@@ -60,10 +60,10 @@ function elite_event_views_default_views() {
$handler->display->display_options['empty']['area']['table'] = 'views';
$handler->display->display_options['empty']['area']['field'] = 'area';
$handler->display->display_options['empty']['area']['empty'] = TRUE;
- $handler->display->display_options['empty']['area']['content'] = '<div class="result-empty">
-<h2>Nothing found</h2>
-<span>-</span>
-<p> Sorry, no content available in this section. </p>
+ $handler->display->display_options['empty']['area']['content'] = '<div class="result-empty">
+<h2>Nothing found</h2>
+<span>-</span>
+<p> Sorry, no content available in this section. </p>
</div>';
$handler->display->display_options['empty']['area']['format'] = 'unfiltered';
/* Field: Content: Title */
@@ -184,10 +184,10 @@ function elite_event_views_default_views() {
<div class="public-content-subtitle">Lorem ipsum dolor sit amet 2</div>'),
t('Past events'),
t('<a href="/events/past">View past events</a>'),
- t('<div class="result-empty">
-<h2>Nothing found</h2>
-<span>-</span>
-<p> Sorry, no content available in this section. </p>
+ t('<div class="result-empty">
+<h2>Nothing found</h2>
+<span>-</span>
+<p> Sorry, no content available in this section. </p>
</div>'),
t('EE Public Events (next)'),
t('Public events form EE (next)'),
@@ -197,5 +197,220 @@ function elite_event_views_default_views() {
);
$export['elite_ee_events_public'] = $view;
+ $view = new view();
+ $view->name = 'elite_event_growth_events';
+ $view->description = 'ELITE Growth Event pages';
+ $view->tag = 'default';
+ $view->base_table = 'node';
+ $view->human_name = 'ELITE Event ';
+ $view->core = 7;
+ $view->api_version = '3.0';
+ $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+ /* Display: Master */
+ $handler = $view->new_display('default', 'Master', 'default');
+ $handler->display->display_options['title'] = 'Events';
+ $handler->display->display_options['css_class'] = 'content-archive';
+ $handler->display->display_options['use_more'] = TRUE;
+ $handler->display->display_options['use_more_always'] = TRUE;
+ $handler->display->display_options['use_more_text'] = 'Go to Events';
+ $handler->display->display_options['access']['type'] = 'perm';
+ $handler->display->display_options['cache']['type'] = 'none';
+ $handler->display->display_options['query']['type'] = 'views_query';
+ $handler->display->display_options['exposed_form']['type'] = 'basic';
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['pager']['options']['offset'] = '0';
+ $handler->display->display_options['style_plugin'] = 'default';
+ $handler->display->display_options['row_plugin'] = 'node';
+ /* Header: Global: Unfiltered text */
+ $handler->display->display_options['header']['area_text_custom']['id'] = 'area_text_custom';
+ $handler->display->display_options['header']['area_text_custom']['table'] = 'views';
+ $handler->display->display_options['header']['area_text_custom']['field'] = 'area_text_custom';
+ $handler->display->display_options['header']['area_text_custom']['label'] = 'Page title';
+ $handler->display->display_options['header']['area_text_custom']['content'] = 'Future Events';
+ /* Footer: Global: View area */
+ $handler->display->display_options['footer']['view']['id'] = 'view';
+ $handler->display->display_options['footer']['view']['table'] = 'views';
+ $handler->display->display_options['footer']['view']['field'] = 'view';
+ /* Field: Content: Title */
+ $handler->display->display_options['fields']['title']['id'] = 'title';
+ $handler->display->display_options['fields']['title']['table'] = 'node';
+ $handler->display->display_options['fields']['title']['field'] = 'title';
+ $handler->display->display_options['fields']['title']['label'] = '';
+ $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
+ $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
+ /* Sort criterion: Content: Date - start date (field_event_date) */
+ $handler->display->display_options['sorts']['field_event_date_value']['id'] = 'field_event_date_value';
+ $handler->display->display_options['sorts']['field_event_date_value']['table'] = 'field_data_field_event_date';
+ $handler->display->display_options['sorts']['field_event_date_value']['field'] = 'field_event_date_value';
+ /* Contextual filter: Content: Visibility (field_event_visibility) */
+ $handler->display->display_options['arguments']['field_event_visibility_value']['id'] = 'field_event_visibility_value';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['table'] = 'field_data_field_event_visibility';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['field'] = 'field_event_visibility_value';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['default_action'] = 'default';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['default_argument_type'] = 'php';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['default_argument_options']['code'] = 'if (user_is_anonymous()) {
+ return \'public\';
+}
+else {
+ return \'private\';
+}';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['summary']['number_of_records'] = '0';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['summary']['format'] = 'default_summary';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['summary_options']['items_per_page'] = '25';
+ $handler->display->display_options['arguments']['field_event_visibility_value']['limit'] = '0';
+ /* Filter criterion: Content: Published */
+ $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 */
+ $handler->display->display_options['filters']['type']['id'] = 'type';
+ $handler->display->display_options['filters']['type']['table'] = 'node';
+ $handler->display->display_options['filters']['type']['field'] = 'type';
+ $handler->display->display_options['filters']['type']['value'] = array(
+ 'elite_event' => 'elite_event',
+ );
+ /* Filter criterion: Content: Date - start date (field_event_date) */
+ $handler->display->display_options['filters']['field_event_date_value']['id'] = 'field_event_date_value';
+ $handler->display->display_options['filters']['field_event_date_value']['table'] = 'field_data_field_event_date';
+ $handler->display->display_options['filters']['field_event_date_value']['field'] = 'field_event_date_value';
+ $handler->display->display_options['filters']['field_event_date_value']['operator'] = '<';
+ $handler->display->display_options['filters']['field_event_date_value']['default_date'] = 'now';
+
+ /* Display: ELITE Events Archive */
+ $handler = $view->new_display('page', 'ELITE Events Archive', 'page');
+ $handler->display->display_options['defaults']['use_more'] = FALSE;
+ $handler->display->display_options['defaults']['use_more_always'] = FALSE;
+ $handler->display->display_options['defaults']['use_more_always'] = FALSE;
+ $handler->display->display_options['use_more_always'] = TRUE;
+ $handler->display->display_options['defaults']['use_more_text'] = FALSE;
+ $handler->display->display_options['use_more_text'] = 'Go to Events';
+ $handler->display->display_options['defaults']['pager'] = FALSE;
+ $handler->display->display_options['pager']['type'] = 'none';
+ $handler->display->display_options['pager']['options']['offset'] = '0';
+ $handler->display->display_options['defaults']['header'] = FALSE;
+ /* Header: Global: Unfiltered text */
+ $handler->display->display_options['header']['area_text_custom']['id'] = 'area_text_custom';
+ $handler->display->display_options['header']['area_text_custom']['table'] = 'views';
+ $handler->display->display_options['header']['area_text_custom']['field'] = 'area_text_custom';
+ $handler->display->display_options['header']['area_text_custom']['label'] = 'Page title';
+ $handler->display->display_options['header']['area_text_custom']['content'] = 'Future Events';
+ $handler->display->display_options['defaults']['footer'] = FALSE;
+ /* Footer: Global: View area */
+ $handler->display->display_options['footer']['view']['id'] = 'view';
+ $handler->display->display_options['footer']['view']['table'] = 'views';
+ $handler->display->display_options['footer']['view']['field'] = 'view';
+ $handler->display->display_options['footer']['view']['view_to_insert'] = 'elite_event_growth_events:block_past_events';
+ $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+ $handler->display->display_options['defaults']['filters'] = FALSE;
+ /* Filter criterion: Content: Published */
+ $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 */
+ $handler->display->display_options['filters']['type']['id'] = 'type';
+ $handler->display->display_options['filters']['type']['table'] = 'node';
+ $handler->display->display_options['filters']['type']['field'] = 'type';
+ $handler->display->display_options['filters']['type']['value'] = array(
+ 'elite_event' => 'elite_event',
+ );
+ /* Filter criterion: Content: Date - start date (field_event_date) */
+ $handler->display->display_options['filters']['field_event_date_value']['id'] = 'field_event_date_value';
+ $handler->display->display_options['filters']['field_event_date_value']['table'] = 'field_data_field_event_date';
+ $handler->display->display_options['filters']['field_event_date_value']['field'] = 'field_event_date_value';
+ $handler->display->display_options['filters']['field_event_date_value']['operator'] = '>=';
+ $handler->display->display_options['filters']['field_event_date_value']['default_date'] = 'now';
+ $handler->display->display_options['path'] = 'contents/events';
+
+ /* Display: Block */
+ $handler = $view->new_display('block', 'Block', 'block_past_events');
+ $handler->display->display_options['defaults']['use_more'] = FALSE;
+ $handler->display->display_options['defaults']['use_more_always'] = FALSE;
+ $handler->display->display_options['defaults']['use_more_always'] = FALSE;
+ $handler->display->display_options['use_more_always'] = TRUE;
+ $handler->display->display_options['defaults']['use_more_text'] = FALSE;
+ $handler->display->display_options['use_more_text'] = 'Go to Events';
+ $handler->display->display_options['defaults']['pager'] = FALSE;
+ $handler->display->display_options['pager']['type'] = 'full';
+ $handler->display->display_options['pager']['options']['items_per_page'] = '6';
+ $handler->display->display_options['pager']['options']['offset'] = '0';
+ $handler->display->display_options['pager']['options']['id'] = '0';
+ $handler->display->display_options['pager']['options']['quantity'] = '9';
+ $handler->display->display_options['defaults']['header'] = FALSE;
+ /* Header: Global: Unfiltered text */
+ $handler->display->display_options['header']['area_text_custom']['id'] = 'area_text_custom';
+ $handler->display->display_options['header']['area_text_custom']['table'] = 'views';
+ $handler->display->display_options['header']['area_text_custom']['field'] = 'area_text_custom';
+ $handler->display->display_options['header']['area_text_custom']['label'] = 'Page title';
+ $handler->display->display_options['header']['area_text_custom']['content'] = 'Events Archive';
+ $handler->display->display_options['defaults']['filter_groups'] = FALSE;
+ $handler->display->display_options['defaults']['filters'] = FALSE;
+ /* Filter criterion: Content: Published */
+ $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 */
+ $handler->display->display_options['filters']['type']['id'] = 'type';
+ $handler->display->display_options['filters']['type']['table'] = 'node';
+ $handler->display->display_options['filters']['type']['field'] = 'type';
+ $handler->display->display_options['filters']['type']['value'] = array(
+ 'elite_event' => 'elite_event',
+ );
+ /* Filter criterion: Content: Date - start date (field_event_date) */
+ $handler->display->display_options['filters']['field_event_date_value']['id'] = 'field_event_date_value';
+ $handler->display->display_options['filters']['field_event_date_value']['table'] = 'field_data_field_event_date';
+ $handler->display->display_options['filters']['field_event_date_value']['field'] = 'field_event_date_value';
+ $handler->display->display_options['filters']['field_event_date_value']['operator'] = '<';
+ $handler->display->display_options['filters']['field_event_date_value']['default_date'] = 'now';
+ $handler->display->display_options['block_description'] = 'Past Events';
+
+ /* Display: ELITE Event Frontpage */
+ $handler = $view->new_display('block', 'ELITE Event Frontpage', 'block_events_frontpage');
+ $handler->display->display_options['defaults']['css_class'] = FALSE;
+ $handler->display->display_options['css_class'] = 'events-frontpage';
+ $handler->display->display_options['defaults']['pager'] = FALSE;
+ $handler->display->display_options['pager']['type'] = 'some';
+ $handler->display->display_options['pager']['options']['items_per_page'] = '3';
+ $handler->display->display_options['pager']['options']['offset'] = '0';
+ $handler->display->display_options['defaults']['header'] = FALSE;
+ $handler->display->display_options['block_description'] = 'ELITE: Events, homepage';
+ $translatables['elite_event_growth_events'] = array(
+ t('Master'),
+ t('Events'),
+ t('Go to Events'),
+ t('Apply'),
+ t('Reset'),
+ t('Sort by'),
+ t('Asc'),
+ t('Desc'),
+ t('Items per page'),
+ t('- All -'),
+ t('Offset'),
+ t('« first'),
+ t('‹ previous'),
+ t('next ›'),
+ t('last »'),
+ t('Page title'),
+ t('Future Events'),
+ t('All'),
+ t('ELITE Events Archive'),
+ t('Block'),
+ t('Events Archive'),
+ t('Past Events'),
+ t('ELITE Event Frontpage'),
+ t('more'),
+ t('ELITE: Events, homepage'),
+ );
+ $export['elite_event_growth_events'] = $view;
+
return $export;
}
diff --git a/sites/all/modules/features/elite_navigation_menus/elite_navigation_menus.features.exportmenuitems.inc b/sites/all/modules/features/elite_navigation_menus/elite_navigation_menus.features.exportmenuitems.inc
index d81d047..84ea171 100644
--- a/sites/all/modules/features/elite_navigation_menus/elite_navigation_menus.features.exportmenuitems.inc
+++ b/sites/all/modules/features/elite_navigation_menus/elite_navigation_menus.features.exportmenuitems.inc
@@ -34,7 +34,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
$exportmenuitems['01954e5e-6367-41b5-9ca7-6ccc3fe73369'] = array(
'menu_name' => 'menu-logged-in-top-menu',
'link_path' => 'contents/events',
- 'router_path' => '',
+ 'router_path' => 'contents/events',
'link_title' => 'Events',
'options' => array(
'attributes' => array(),
@@ -198,6 +198,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
'link_title' => 'Library',
'options' => array(
'attributes' => array(),
+ 'alter' => TRUE,
),
'module' => 'menu',
'hidden' => 1,
@@ -233,7 +234,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
$exportmenuitems['121d581a-3d52-4e08-9042-ee09d930fdfc'] = array(
'menu_name' => 'menu-anonymous-top-menu',
'link_path' => 'contents/events',
- 'router_path' => '',
+ 'router_path' => 'contents/events',
'link_title' => 'Events',
'options' => array(
'attributes' => array(),
@@ -1006,7 +1007,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
$exportmenuitems['608bc8ba-3ffa-4b23-ae07-1c0b2a99420a'] = array(
'menu_name' => 'uk-menu-anonymous-top-menu',
'link_path' => 'contents/events',
- 'router_path' => '',
+ 'router_path' => 'contents/events',
'link_title' => 'Events',
'options' => array(
'attributes' => array(),
@@ -1183,7 +1184,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
$exportmenuitems['766ec0f3-607c-44b7-80a2-dbb331f0bcbf'] = array(
'menu_name' => 'uk-menu-logged-in-top-menu',
'link_path' => 'contents/events',
- 'router_path' => '',
+ 'router_path' => 'contents/events',
'link_title' => 'Events',
'options' => array(
'attributes' => array(),
@@ -1459,7 +1460,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
$exportmenuitems['9ab3b785-2306-4c77-864a-be1e47d3289b'] = array(
'menu_name' => 'ee-menu-anonymous-top-menu',
'link_path' => 'contents/events',
- 'router_path' => '',
+ 'router_path' => 'contents/events',
'link_title' => 'Events',
'options' => array(
'attributes' => array(),
@@ -1874,6 +1875,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
'link_title' => 'Library',
'options' => array(
'attributes' => array(),
+ 'alter' => TRUE,
),
'module' => 'menu',
'hidden' => 0,
@@ -1947,7 +1949,7 @@ function elite_navigation_menus_menu_default_exportmenuitems() {
$exportmenuitems['cc85668a-fa48-4381-9ccd-ec301d33d281'] = array(
'menu_name' => 'ee-menu-logged-in-top-menu',
'link_path' => 'contents/events',
- 'router_path' => '',
+ 'router_path' => 'contents/events',
'link_title' => 'Events',
'options' => array(
'attributes' => array(),
diff --git a/sites/all/themes/elite/sass/components/_news.scss b/sites/all/themes/elite/sass/components/_news.scss
index 7728246..e19f8e3 100644
--- a/sites/all/themes/elite/sass/components/_news.scss
+++ b/sites/all/themes/elite/sass/components/_news.scss
@@ -7,7 +7,7 @@
@include container;
}
}
-.node-type-elite-highlight .tabs,
+.node-type-elite-highlight .tabs,
.node-type-elite-event .tabs,
.node-type-elite-news .tabs{
display:block;
@@ -116,7 +116,7 @@
text-decoration: none;
color: $text-base;
overflow: hidden;
- font-weight: normal;
+ font-weight: normal;
}
.field--name-field-news-link{
a{
@@ -349,7 +349,8 @@
-#block-views-96c8469f8a8d100e7459d895e1a09c2e { // automatic name for events created by views
+#block-views-bcc3cea58351d4ef90489129690953fc, // automatic name for events created by views
+#block-views-e7c35f6bb7af095ceaf75b0feee18d66 { // automatic name for events created by views
.block__content {
border: 0;
@@ -404,13 +405,14 @@
}
}
-#block-views-96c8469f8a8d100e7459d895e1a09c2e, // automatic name for events created by views
+#block-views-bcc3cea58351d4ef90489129690953fc, // automatic name for events created by views
#block-views-b09e4b2655237634abd082f071fcff40, // automatic name for highlight created by views
#block-views-c77c9c37efed8f8c4f069b2ccea635b1,// automatic name for highlight created by views
+#block-views-e7c35f6bb7af095ceaf75b0feee18d66,// automatic name for highlight created by views
#block-views-news-block-news-front {
-
+
position: relative;
-
+
.block__title{
padding: 15px 0 9px;
margin: 0
@@ -485,7 +487,7 @@
}
}
}
-
+
.node__title {
font-size: 1.2em !important;
float: none !important;
diff --git a/sites/all/themes/elite_ee/sass/ie9.scss b/sites/all/themes/elite_ee/sass/ie9.scss
index da309fd..22003b8 100644
--- a/sites/all/themes/elite_ee/sass/ie9.scss
+++ b/sites/all/themes/elite_ee/sass/ie9.scss
@@ -92,7 +92,7 @@ $grey-ee-80: #454d56;
.separator-top {
padding-top: 1em;
margin-top: 1em;
- border-top: 1px solid $secondary-gray;
+ border-top: 1px solid #ccc;
border-color: #afafad;
margin-top: 0;
}
diff --git a/translations/interface.it.po b/translations/interface.it.po
index 577abfe..0bac961 100644
--- a/translations/interface.it.po
+++ b/translations/interface.it.po
@@ -49304,6 +49304,10 @@ msgstr "Settori di interesse"
msgid "Sectors of Interest"
msgstr "Settori di interesse"
+#: /index.php
+msgid "Sectors of interest"
+msgstr "Settori di interesse"
+
msgid "User without company"
msgstr "Utenti senza società"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment