Skip to content

Commit

Permalink
Renamed stuff that was missed from previous renamings.
Browse files Browse the repository at this point in the history
  • Loading branch information
heikkikesa committed May 23, 2017
1 parent 405fce1 commit 79451e4
Show file tree
Hide file tree
Showing 27 changed files with 104 additions and 104 deletions.
Expand Up @@ -173,10 +173,10 @@ features[variable][] = scheduler_unpublish_revision_blog_post
features[variable][] = scheduler_use_vertical_tabs_blog
features[variable][] = scheduler_use_vertical_tabs_blog_post
features[views_view][] = blog_posts
features[views_view][] = driveturku_blog_image
features[views_view][] = driveturku_other_blogs
features[views_view][] = driveturku_popular_from_other_blogs
features[views_view][] = driveturku_posts_from_same_blog
features[views_view][] = kada_blog_image
features[views_view][] = kada_other_blogs
features[views_view][] = kada_popular_from_other_blogs
features[views_view][] = kada_posts_from_same_blog
features_exclude[dependencies][context] = context
features_exclude[dependencies][file] = file
features_exclude[dependencies][restrict_node_page_view] = restrict_node_page_view
Expand Down
Expand Up @@ -9,7 +9,7 @@ include_once 'kada_blog_feature.features.inc';
function kada_blog_feature_views_post_execute(&$view) {
$kada_page_classes = &drupal_static('kada_page_classes');

if ($view->name == 'driveturku_blog_image' && $view->current_display == 'blog_image') {
if ($view->name == 'kada_blog_image' && $view->current_display == 'blog_image') {
if (!empty($view->result)) {
$result = reset($view->result);

Expand Down
Expand Up @@ -92,11 +92,11 @@ function kada_blog_feature_views_default_views() {
$export['blog_posts'] = $view;

$view = new view();
$view->name = 'driveturku_blog_image';
$view->name = 'kada_blog_image';
$view->description = '';
$view->tag = 'default';
$view->base_table = 'node';
$view->human_name = 'DriveTurku Blog Image';
$view->human_name = 'KADA Blog Image';
$view->core = 7;
$view->api_version = '3.0';
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
Expand Down Expand Up @@ -204,7 +204,7 @@ function kada_blog_feature_views_default_views() {
/* Display: Blog Image */
$handler = $view->new_display('block', 'Blog Image', 'blog_image');
$handler->display->display_options['display_description'] = 'Display top image from main blog';
$translatables['driveturku_blog_image'] = array(
$translatables['kada_blog_image'] = array(
t('Master'),
t('more'),
t('Apply'),
Expand All @@ -218,14 +218,14 @@ function kada_blog_feature_views_default_views() {
t('Blog Image'),
t('Display top image from main blog'),
);
$export['driveturku_blog_image'] = $view;
$export['kada_blog_image'] = $view;

$view = new view();
$view->name = 'driveturku_other_blogs';
$view->name = 'kada_other_blogs';
$view->description = '';
$view->tag = 'default';
$view->base_table = 'node';
$view->human_name = 'DriveTurku Other Blogs';
$view->human_name = 'KADA Other Blogs';
$view->core = 7;
$view->api_version = '3.0';
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
Expand Down Expand Up @@ -276,7 +276,7 @@ function kada_blog_feature_views_default_views() {

/* Display: Block */
$handler = $view->new_display('block', 'Block', 'block');
$translatables['driveturku_other_blogs'] = array(
$translatables['kada_other_blogs'] = array(
t('Master'),
t('Other Blogs'),
t('more'),
Expand All @@ -287,14 +287,14 @@ function kada_blog_feature_views_default_views() {
t('Desc'),
t('Block'),
);
$export['driveturku_other_blogs'] = $view;
$export['kada_other_blogs'] = $view;

$view = new view();
$view->name = 'driveturku_popular_from_other_blogs';
$view->name = 'kada_popular_from_other_blogs';
$view->description = '';
$view->tag = 'default';
$view->base_table = 'node';
$view->human_name = 'DriveTurku Popular from other blogs';
$view->human_name = 'KADA Popular from other blogs';
$view->core = 7;
$view->api_version = '3.0';
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
Expand Down Expand Up @@ -368,7 +368,7 @@ function kada_blog_feature_views_default_views() {

/* Display: Block */
$handler = $view->new_display('block', 'Block', 'block');
$translatables['driveturku_popular_from_other_blogs'] = array(
$translatables['kada_popular_from_other_blogs'] = array(
t('Master'),
t('Posts from other blogs'),
t('more'),
Expand All @@ -381,14 +381,14 @@ function kada_blog_feature_views_default_views() {
t('All'),
t('Block'),
);
$export['driveturku_popular_from_other_blogs'] = $view;
$export['kada_popular_from_other_blogs'] = $view;

$view = new view();
$view->name = 'driveturku_posts_from_same_blog';
$view->name = 'kada_posts_from_same_blog';
$view->description = '';
$view->tag = 'default';
$view->base_table = 'node';
$view->human_name = 'DriveTurku posts from same blog';
$view->human_name = 'KADA posts from same blog';
$view->core = 7;
$view->api_version = '3.0';
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
Expand Down Expand Up @@ -472,7 +472,7 @@ function kada_blog_feature_views_default_views() {

/* Display: Block */
$handler = $view->new_display('block', 'Block', 'block');
$translatables['driveturku_posts_from_same_blog'] = array(
$translatables['kada_posts_from_same_blog'] = array(
t('Master'),
t('Recent posts from this blog'),
t('more'),
Expand All @@ -486,7 +486,7 @@ function kada_blog_feature_views_default_views() {
t('All'),
t('Block'),
);
$export['driveturku_posts_from_same_blog'] = $view;
$export['kada_posts_from_same_blog'] = $view;

return $export;
}
4 changes: 2 additions & 2 deletions code/modules/features/kada_configuration_feature/README.txt
Expand Up @@ -69,8 +69,8 @@ NOTE: Terms are not translated because it makes it complicated to select correct
All sorts of sitewide variables exported to code. Other features have more variables if they fit better there.

== VIEWS ==
- driveturku_accessibilities: Accessiblities per Place from referenced accessibility field collections.
driveturku_contact_information: Contact information in teaser display mode per content from referenced Place.
- kada_accessibilities: Accessiblities per Place from referenced accessibility field collections.
- kada_contact_information: Contact information in teaser display mode per content from referenced Place.

== WYSIWYG PROFILES ==
Exported WYSIWYG module configuration for wysiwyg and full_html text formats.
Expand Down
Expand Up @@ -135,9 +135,9 @@ function kada_configuration_feature_context_default_contexts() {
$context->reactions = array(
'block' => array(
'blocks' => array(
'views-driveturku_recommended-block' => array(
'views-kada_recommended-block' => array(
'module' => 'views',
'delta' => 'driveturku_recommended-block',
'delta' => 'kada_recommended-block',
'region' => 'header',
'weight' => '-10',
),
Expand Down
Expand Up @@ -699,9 +699,9 @@ features[variable][] = variable_realm_list_language
features[variable][] = views_exposed_filter_any_label
features[variable][] = views_show_additional_queries
features[variable][] = webform_node_webform
features[views_view][] = driveturku_accessibilities
features[views_view][] = driveturku_contact_information
features[views_view][] = driveturku_recommended
features[views_view][] = kada_accessibilities
features[views_view][] = kada_contact_information
features[views_view][] = kada_recommended
features_exclude[dependencies][og] = og
features_exclude[field_base][field_tweet_embed] = field_tweet_embed
features_exclude[field_instance][node-page-field_tweet_embed] = node-page-field_tweet_embed
Expand Up @@ -11,11 +11,11 @@ function kada_configuration_feature_views_default_views() {
$export = array();

$view = new view();
$view->name = 'driveturku_accessibilities';
$view->name = 'kada_accessibilities';
$view->description = '';
$view->tag = 'default';
$view->base_table = 'taxonomy_term_data';
$view->human_name = 'DriveTurku Accessibilities';
$view->human_name = 'KADA Accessibilities';
$view->core = 7;
$view->api_version = '3.0';
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
Expand Down Expand Up @@ -166,7 +166,7 @@ function kada_configuration_feature_views_default_views() {
$handler->display->display_options['arguments']['nid']['summary']['number_of_records'] = '0';
$handler->display->display_options['arguments']['nid']['summary']['format'] = 'default_summary';
$handler->display->display_options['arguments']['nid']['summary_options']['items_per_page'] = '25';
$translatables['driveturku_accessibilities'] = array(
$translatables['kada_accessibilities'] = array(
t('Master'),
t('more'),
t('Käytä'),
Expand All @@ -188,14 +188,14 @@ function kada_configuration_feature_views_default_views() {
t('field_accessibility'),
t('Kaikki'),
);
$export['driveturku_accessibilities'] = $view;
$export['kada_accessibilities'] = $view;

$view = new view();
$view->name = 'driveturku_contact_information';
$view->name = 'kada_contact_information';
$view->description = 'Display contant information from referenced Place';
$view->tag = 'default';
$view->base_table = 'node';
$view->human_name = 'DriveTurku Contact information';
$view->human_name = 'KADA Contact information';
$view->core = 7;
$view->api_version = '3.0';
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
Expand Down Expand Up @@ -293,7 +293,7 @@ function kada_configuration_feature_views_default_views() {
/* Display: Places */
$handler = $view->new_display('block', 'Places', 'contact_info');
$handler->display->display_options['display_description'] = 'Places referenced via contact information field';
$translatables['driveturku_contact_information'] = array(
$translatables['kada_contact_information'] = array(
t('Master'),
t('Yhteystiedot'),
t('more'),
Expand All @@ -307,14 +307,14 @@ function kada_configuration_feature_views_default_views() {
t('Places'),
t('Places referenced via contact information field'),
);
$export['driveturku_contact_information'] = $view;
$export['kada_contact_information'] = $view;

$view = new view();
$view->name = 'driveturku_recommended';
$view->name = 'kada_recommended';
$view->description = '';
$view->tag = 'default';
$view->base_table = 'node';
$view->human_name = 'DriveTurku Recommended';
$view->human_name = 'KADA Recommended';
$view->core = 7;
$view->api_version = '3.0';
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
Expand Down Expand Up @@ -374,7 +374,7 @@ function kada_configuration_feature_views_default_views() {

/* Display: Block */
$handler = $view->new_display('block', 'Block', 'block');
$translatables['driveturku_recommended'] = array(
$translatables['kada_recommended'] = array(
t('Master'),
t('more'),
t('Käytä'),
Expand All @@ -385,7 +385,7 @@ function kada_configuration_feature_views_default_views() {
t('Kaikki'),
t('Block'),
);
$export['driveturku_recommended'] = $view;
$export['kada_recommended'] = $view;

return $export;
}
Expand Up @@ -108,7 +108,7 @@ function kada_domains_feature_context_default_contexts() {
$context->conditions = array(
'context' => array(
'values' => array(
'~turkucalendar' => '~turkucalendar',
'~kadacalendar' => '~kadacalendar',
),
),
'entity_field' => array(
Expand Down Expand Up @@ -139,7 +139,7 @@ function kada_domains_feature_context_default_contexts() {
$context->conditions = array(
'context' => array(
'values' => array(
'~turkucalendar' => '~turkucalendar',
'~kadacalendar' => '~kadacalendar',
),
),
);
Expand Down
Expand Up @@ -49,7 +49,7 @@ function kada_events_base_feature_field_default_field_bases() {
'view' => array(
'args' => array(),
'display_name' => 'entityreference_1',
'view_name' => 'driveturku_eventcalendar_er',
'view_name' => 'kada_eventcalendar_er',
),
),
'target_type' => 'node',
Expand Down
Expand Up @@ -4971,7 +4971,7 @@ You can place multiple single point selections.',
'redirect' => 'default',
'relation' => 'default',
'rules_config' => 'default',
'sarnia_driveturku_sarnia_search' => 'default',
'sarnia_kada_sarnia_search' => 'default',
'scald_atom' => 'default',
'search_api_index' => 'default',
'search_api_server' => 'default',
Expand Down
Expand Up @@ -72,7 +72,7 @@ function kada_events_base_feature_subqueue_page() {
$sub_queue_lang = $value->language;
// Read subqueue label and explode it into array
// These are used to create new link title
// [0] => turkucalendar
// [0] => kadacalendar
// [1] => event or hobby
// [2] => front
// [3] => carousel or mosaic
Expand Down Expand Up @@ -188,7 +188,7 @@ function kada_events_base_feature_views_post_render(&$view, &$output, &$cache) {
function kada_events_base_feature_views_pre_build(&$view) {
// Check if we are in events or hobbies frontpage from context.
$active_contexts = context_active_contexts();
if (isset($active_contexts['turkucalendar_front'])) {
if (isset($active_contexts['kadacalendar_front'])) {
// Get frontpage nid or bail out if not set.
$frontpage = explode('/', variable_get('site_frontpage', 'node'));
if (!isset($frontpage[1])) {
Expand Down Expand Up @@ -380,11 +380,11 @@ function kada_events_base_feature_node_view($node, $view_mode, $langcode) {
$wrapper = entity_metadata_wrapper('node', $node);

// Alter event date display in case of multiday events.
_driveturku_format_long_event_date($node, $node->content['field_event_date'][0]['#markup'], $view_mode);
_kada_format_long_event_date($node, $node->content['field_event_date'][0]['#markup'], $view_mode);

if ($view_mode == 'event_map_item') {
// Event map items also have dates in duplicate title fields.
_driveturku_format_long_event_date($node, $node->content['duplicate_title'][0]['#markup'], $view_mode);
_kada_format_long_event_date($node, $node->content['duplicate_title'][0]['#markup'], $view_mode);
}

if (empty($node->field_date_type) || $wrapper->field_date_type->value() == 'single') {
Expand All @@ -394,7 +394,7 @@ function kada_events_base_feature_node_view($node, $view_mode, $langcode) {

if ($wrapper->field_date_type->value() == 'single') {
$node->original_date = $node->content['field_event_date'][0]['#markup'];
_driveturku_event_date_vignette($node, $node->content['field_event_date'][0]['#markup'], $view_mode, $langcode);
_kada_event_date_vignette($node, $node->content['field_event_date'][0]['#markup'], $view_mode, $langcode);
}
elseif ($wrapper->field_date_type->value() == 'super') {
$node->original_date = $node->content['field_event_date'][0]['#markup'];
Expand Down Expand Up @@ -452,15 +452,15 @@ function kada_events_base_feature_node_view($node, $view_mode, $langcode) {

// If the subevent has a custom vignette, always override using it
$node->original_date = $subevent_date;
_driveturku_event_date_vignette($node, $node->content['field_event_date'][0]['#markup'], $view_mode, $langcode);
_kada_event_date_vignette($node, $node->content['field_event_date'][0]['#markup'], $view_mode, $langcode);
}
}
}

/**
* Replaces a node's field markup with date vignette.
*/
function _driveturku_event_date_vignette(&$node, &$target, $view_mode, $langcode) {
function _kada_event_date_vignette(&$node, &$target, $view_mode, $langcode) {
global $language;
if (!$langcode) {
$langcode = $language->language;
Expand Down Expand Up @@ -500,7 +500,7 @@ function _driveturku_event_date_vignette(&$node, &$target, $view_mode, $langcode
* @param &$node node object
* @param &$target #markup field in render array
*/
function _driveturku_format_long_event_date(&$node, &$target, $view_mode) {
function _kada_format_long_event_date(&$node, &$target, $view_mode) {
// View modes to apply alterations to
$date_view_modes = array(
'full',
Expand Down

0 comments on commit 79451e4

Please sign in to comment.