Navigation Menu

Skip to content

Commit

Permalink
Merge pull request #21 from heikkikesa/remaining-feature-renames
Browse files Browse the repository at this point in the history
Remaining feature renames
  • Loading branch information
ZeiP committed May 23, 2017
2 parents 0e67bf7 + 01570c9 commit 1f70756
Show file tree
Hide file tree
Showing 158 changed files with 2,038 additions and 2,810 deletions.
6 changes: 6 additions & 0 deletions code/modules/custom/kada_event_ext/kada_event_ext.info
@@ -0,0 +1,6 @@
name = KADA Event Ext
description = KADA event management for external users
core = 7.x
package = KADA

dependencies[] = multiple_entity_form
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* DriveTurku event management for external users.
* KADA event management for external users.
*/

module_load_include('inc', 'node', 'node.pages');
Expand All @@ -12,11 +12,11 @@ module_load_include('inc', 'node', 'node.pages');
*
* @TODO: Figure out correct access restriction.
*/
function tkufi_event_ext_menu() {
function kada_event_ext_menu() {
$items['event/add'] = array(
'title' => 'Create event',
'page callback' => 'drupal_get_form',
'page arguments' => array('tkufi_event_ext_event_translations_form'),
'page arguments' => array('kada_event_ext_event_translations_form'),
'access callback' => TRUE,
);
return $items;
Expand All @@ -25,7 +25,7 @@ function tkufi_event_ext_menu() {
/**
* Implements hook_form_FORM_ID_alter().
*/
function tkufi_event_ext_form_event_node_form_alter(&$form, &$form_state) {
function kada_event_ext_form_event_node_form_alter(&$form, &$form_state) {
// Hide the ext image fields in node form.
$form['field_content_image_ext_rights']['#access'] = FALSE;
$form['field_content_image_ext']['#access'] = FALSE;
Expand All @@ -34,7 +34,7 @@ function tkufi_event_ext_form_event_node_form_alter(&$form, &$form_state) {
/**
* Documentation (@TODO).
*/
function tkufi_event_ext_event_translations_form($form, &$form_state) {
function kada_event_ext_event_translations_form($form, &$form_state) {
// Define an array of data for the entities to show in the form.
$entity_data = array();

Expand Down Expand Up @@ -172,19 +172,19 @@ function tkufi_event_ext_event_translations_form($form, &$form_state) {

// Custom submit function for geocoder button because of our custom form
// structure will not work with the default submit function.
$form['language_tabs']['node:new_0']['field_location']['und'][0]['use_geocoder']['#submit'][0] = 'tkufi_event_ext_use_geocoder_submit';
$form['language_tabs']['node:new_0']['field_location']['und'][0]['use_geocoder']['#submit'][0] = 'kada_event_ext_use_geocoder_submit';

// Custom validate function for date_repeat field.
$form['language_tabs']['node:new_0']['field_date_repeat']['und'][0]['#element_validate'][] = 'tkufi_event_ext_date_repeat_widget_validate';
$form['language_tabs']['node:new_0']['field_date_repeat']['und'][0]['#element_validate'][] = 'kada_event_ext_date_repeat_widget_validate';

$form['#attached']['css'][] = drupal_get_path('module', 'field_group') . '/horizontal-tabs/horizontal-tabs.css';
$form['#attached']['js'][] = drupal_get_path('module', 'field_group') . '/horizontal-tabs/horizontal-tabs.js';

$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Add translated event'),
'#validate' => array('tkufi_event_ext_event_translations_validate'),
'#submit' => array('tkufi_event_ext_event_translations_submit'),
'#validate' => array('kada_event_ext_event_translations_validate'),
'#submit' => array('kada_event_ext_event_translations_submit'),
'#limit_validation_errors' => array(array($form_by_lang['und'])),
'#weight' => 99,
'#prefix' => '<p class="submit__info">' . t('Do not save while filling the form. Fill information to all tabs and save when completed. You cannot edit your event after saving.') . '</p>',
Expand All @@ -193,15 +193,15 @@ function tkufi_event_ext_event_translations_form($form, &$form_state) {
// Add honeypot check to form.
honeypot_add_form_protection($form, $form_state, array('honeypot', 'time_restriction'));

$form['#after_build'][] = 'tkufi_event_ext_after_build';
$form['#after_build'][] = 'kada_event_ext_after_build';

return $form;
}

/**
* Documentation (@TODO).
*/
function tkufi_event_ext_event_translations_validate(&$form, &$form_state) {
function kada_event_ext_event_translations_validate(&$form, &$form_state) {
foreach ($form['language_tabs']['#entity_form_keys'] as $key => $form_key) {
if (!isset($form_state['values'][$form_key]['title_field'])) {
continue;
Expand All @@ -213,9 +213,9 @@ function tkufi_event_ext_event_translations_validate(&$form, &$form_state) {
}
else {
// Clear the validation preventers.
_tkufi_event_ext_clear_key($form['language_tabs'][$form_key], '#limit_validation_errors');
_tkufi_event_ext_clear_key($form_state['triggering_element'], '#limit_validation_errors');
_tkufi_event_ext_clear_key($form['language_tabs'][$form_key], '#validated');
_kada_event_ext_clear_key($form['language_tabs'][$form_key], '#limit_validation_errors');
_kada_event_ext_clear_key($form_state['triggering_element'], '#limit_validation_errors');
_kada_event_ext_clear_key($form['language_tabs'][$form_key], '#validated');
drupal_static_reset('form_set_error');
drupal_static_reset('form_set_error:limit_validation_errors');

Expand All @@ -226,8 +226,8 @@ function tkufi_event_ext_event_translations_validate(&$form, &$form_state) {
// If no languages have been entered,
// throw a validation error on the FI title.
if (count($form['language_tabs']['#entity_form_keys']) <= 1) {
_tkufi_event_ext_clear_key($form['language_tabs']['node:new_1'], '#limit_validation_errors');
_tkufi_event_ext_clear_key($form_state['triggering_element'], '#limit_validation_errors');
_kada_event_ext_clear_key($form['language_tabs']['node:new_1'], '#limit_validation_errors');
_kada_event_ext_clear_key($form_state['triggering_element'], '#limit_validation_errors');
drupal_static_reset('form_set_error:limit_validation_errors');

form_set_error('node:new_1][title_field][fi][0][value', t('At least one language must be submitted!'));
Expand Down Expand Up @@ -267,19 +267,19 @@ function tkufi_event_ext_event_translations_validate(&$form, &$form_state) {
/**
* Documentation (@TODO).
*/
function _tkufi_event_ext_clear_key(&$parent, $key) {
function _kada_event_ext_clear_key(&$parent, $key) {
unset($parent[$key]);
foreach ($parent as $k => &$v) {
if (is_array($v)) {
_tkufi_event_ext_clear_key($v, $key);
_kada_event_ext_clear_key($v, $key);
}
}
}

/**
* Documentation (@TODO).
*/
function tkufi_event_ext_event_translations_submit($form, &$form_state) {
function kada_event_ext_event_translations_submit($form, &$form_state) {
multiple_entity_form_submit($form['language_tabs'], $form_state);

$source_language = '';
Expand Down Expand Up @@ -389,7 +389,7 @@ function tkufi_event_ext_event_translations_submit($form, &$form_state) {
* assumes that the field used for geocoding is always on the form array root
* level, which is not the case in the custom form.
*/
function tkufi_event_ext_use_geocoder_submit($form, &$form_state) {
function kada_event_ext_use_geocoder_submit($form, &$form_state) {
$button = $form_state['triggering_element'];

// Go one level up in the form, to the widgets container.
Expand Down Expand Up @@ -424,7 +424,7 @@ function tkufi_event_ext_use_geocoder_submit($form, &$form_state) {
* date_repeat_field module and patch from issue
* https://www.drupal.org/node/2051033
*/
function tkufi_event_ext_date_repeat_widget_validate($element, &$form_state) {
function kada_event_ext_date_repeat_widget_validate($element, &$form_state) {
$field = field_widget_field($element, $form_state);
if (empty($field['settings']['repeat'])) {
return;
Expand Down Expand Up @@ -461,7 +461,7 @@ function tkufi_event_ext_date_repeat_widget_validate($element, &$form_state) {
: $error_field_base . '][rrule][until_child][datetime';

form_set_error($error_field,
t('You are trying to create too many (!repeats) repeating events.
t('You are trying to create too many (!repeats) repeating events.
The maximum is (!max_repeats).',
array('!repeats' => $date_repeats, '!max_repeats' => $max_repeats),
array('context' => 'Date repeat')));
Expand All @@ -471,7 +471,7 @@ function tkufi_event_ext_date_repeat_widget_validate($element, &$form_state) {
/**
* Custom after build function.
*/
function tkufi_event_ext_after_build($form, &$form_state) {
function kada_event_ext_after_build($form, &$form_state) {
// Hiding additions and exceptions fields because they are not working on
// custom event form.
$form['language_tabs']['node:new_0']['field_date_repeat'][LANGUAGE_NONE][0]['rrule']['show_additions']['#access'] = FALSE;
Expand Down
Expand Up @@ -2,13 +2,13 @@

/**
* @file
* Custom facets for Turku.
* Custom facets for KADA.
*/

/**
* Needs documentation (@TODO).
*/
function tkufi_facets_facetapi_widgets() {
function kada_facets_facetapi_widgets() {
return array(
'facetapi_calendar_links' => array(
'handler' => array(
Expand Down
@@ -1,6 +1,6 @@
name = TKUFI Facets
description = Custom facets for Turku
package = TKUFI
name = KADA Facets
description = Custom facets for KADA
package = KADA
core = 7.x

dependencies[] = facetapi
Expand Down
6 changes: 6 additions & 0 deletions code/modules/custom/kada_facets/kada_facets.module
@@ -0,0 +1,6 @@
<?php

/**
* @file
* Custom facets for KADA.
*/
Expand Up @@ -17,7 +17,7 @@ class FacetapiWidgetCalendarLinks extends FacetapiWidgetLinks {
parent::init();
// We just need our own js to be loaded to handle ui.datepicker stuff.
drupal_add_library('system', 'ui.datepicker');
drupal_add_js(drupal_get_path('module', 'tkufi_facets') . '/plugins/facetapi/widget_facetapi_calendar_links.js');
drupal_add_js(drupal_get_path('module', 'kada_facets') . '/plugins/facetapi/widget_facetapi_calendar_links.js');
}

/**
Expand Down
@@ -1,6 +1,6 @@
name = TKUFI Rules Entity translation
name = KADA Rules Entity translation
description = Entity translation support for Rules module
package = TKUFI
package = KADA
core = 7.x

dependencies[] = rules
Expand Down
6 changes: 6 additions & 0 deletions code/modules/custom/kada_rules_et/kada_rules_et.module
@@ -0,0 +1,6 @@
<?php

/**
* @file
* Code for the KADA Rules Entity translation module.
*/
Expand Up @@ -8,9 +8,9 @@
/**
* Implements hook_rules_action_info().
*/
function tkufi_rules_et_rules_action_info() {
function kada_rules_et_rules_action_info() {
return array(
'tkufi_rules_et_get_translated_field_value' => array(
'kada_rules_et_get_translated_field_value' => array(
'label' => t('Get translated field value'),
'group' => t('Custom'),
'parameter' => array(
Expand All @@ -25,7 +25,7 @@ function tkufi_rules_et_rules_action_info() {
'language_code' => array(
'type' => 'text',
'label' => t('Language'),
'options list' => 'tkufi_rules_et_list_languages',
'options list' => 'kada_rules_et_list_languages',
),
'field_machine_name' => array(
'type' => 'text',
Expand All @@ -39,7 +39,7 @@ function tkufi_rules_et_rules_action_info() {
),
),
),
'tkufi_rules_et_get_translated_formatted_field_value' => array(
'kada_rules_et_get_translated_formatted_field_value' => array(
'label' => t('Get translated formatted field value'),
'group' => t('Custom'),
'parameter' => array(
Expand All @@ -54,7 +54,7 @@ function tkufi_rules_et_rules_action_info() {
'language_code' => array(
'type' => 'text',
'label' => t('Language'),
'options list' => 'tkufi_rules_et_list_languages',
'options list' => 'kada_rules_et_list_languages',
),
'field_machine_name' => array(
'type' => 'text',
Expand All @@ -68,7 +68,7 @@ function tkufi_rules_et_rules_action_info() {
),
),
),
'tkufi_rules_et_set_translated_field_value' => array(
'kada_rules_et_set_translated_field_value' => array(
'label' => t('Set translated field value'),
'group' => t('Custom'),
'parameter' => array(
Expand All @@ -83,7 +83,7 @@ function tkufi_rules_et_rules_action_info() {
'language_code' => array(
'type' => 'text',
'label' => t('Language'),
'options list' => 'tkufi_rules_et_list_languages',
'options list' => 'kada_rules_et_list_languages',
),
'field_machine_name' => array(
'type' => 'text',
Expand All @@ -96,7 +96,7 @@ function tkufi_rules_et_rules_action_info() {
),
),
),
'tkufi_rules_et_set_translated_formatted_field_value' => array(
'kada_rules_et_set_translated_formatted_field_value' => array(
'label' => t('Set translated formatted field value'),
'group' => t('Custom'),
'parameter' => array(
Expand All @@ -111,7 +111,7 @@ function tkufi_rules_et_rules_action_info() {
'language_code' => array(
'type' => 'text',
'label' => t('Language'),
'options list' => 'tkufi_rules_et_list_languages',
'options list' => 'kada_rules_et_list_languages',
),
'field_machine_name' => array(
'type' => 'text',
Expand All @@ -124,7 +124,7 @@ function tkufi_rules_et_rules_action_info() {
),
),
),
'tkufi_rules_et_add_translation' => array(
'kada_rules_et_add_translation' => array(
'label' => t('Add translation to entity'),
'group' => t('Custom'),
'parameter' => array(
Expand All @@ -138,11 +138,11 @@ function tkufi_rules_et_rules_action_info() {
'target_language_code' => array(
'type' => 'text',
'label' => t('Language'),
'options list' => 'tkufi_rules_et_list_languages',
'options list' => 'kada_rules_et_list_languages',
),
),
),
'tkufi_rules_et_get_translation_languages' => array(
'kada_rules_et_get_translation_languages' => array(
'label' => t('Get source language and translated languages'),
'group' => t('Custom'),
'parameter' => array(
Expand Down Expand Up @@ -171,7 +171,7 @@ function tkufi_rules_et_rules_action_info() {
/**
* Return an array of enabled languages.
*/
function tkufi_rules_et_list_languages() {
function kada_rules_et_list_languages() {
return locale_language_list('name');
}

Expand All @@ -181,7 +181,7 @@ function tkufi_rules_et_list_languages() {
* Return the translated value from the given entity's given field in the
* selected language.
*/
function tkufi_rules_et_get_translated_field_value($entity, $language_code, $field_machine_name) {
function kada_rules_et_get_translated_field_value($entity, $language_code, $field_machine_name) {
// If the entity is new, for example imported data, then we cannot use
// Entity Metadata wrapper.
if ($entity->is_new) {
Expand All @@ -206,7 +206,7 @@ function tkufi_rules_et_get_translated_field_value($entity, $language_code, $fie
* Return the translated value from the given entity's given field in the
* selected language.
*/
function tkufi_rules_et_get_translated_formatted_field_value($entity, $language_code, $field_machine_name) {
function kada_rules_et_get_translated_formatted_field_value($entity, $language_code, $field_machine_name) {
// If the entity is new, for example imported data, then we cannot use
// Entity Metadata wrapper.
if ($entity->is_new) {
Expand Down Expand Up @@ -236,7 +236,7 @@ function tkufi_rules_et_get_translated_formatted_field_value($entity, $language_
* Save the translated value to the given entity's given field in the selected
* language.
*/
function tkufi_rules_et_set_translated_field_value($entity, $language_code, $field_machine_name, $translated_value) {
function kada_rules_et_set_translated_field_value($entity, $language_code, $field_machine_name, $translated_value) {
$field_info = field_info_field($field_machine_name);
// Checking if the field is a single value field or not.
if ($field_info['cardinality'] == 1) {
Expand All @@ -253,7 +253,7 @@ function tkufi_rules_et_set_translated_field_value($entity, $language_code, $fie
* Save the translated value to the given entity's given field in the selected
* language.
*/
function tkufi_rules_et_set_translated_formatted_field_value($entity, $language_code, $field_machine_name, $translated_value) {
function kada_rules_et_set_translated_formatted_field_value($entity, $language_code, $field_machine_name, $translated_value) {
$field_info = field_info_field($field_machine_name);
// Checking if the field is a single value field or not.
if ($field_info['cardinality'] == 1) {
Expand All @@ -267,7 +267,7 @@ function tkufi_rules_et_set_translated_formatted_field_value($entity, $language_
/**
* Return an array of enabled languages.
*/
function tkufi_rules_et_add_translation($entity, $target_language_code) {
function kada_rules_et_add_translation($entity, $target_language_code) {
$translation = array(
'translate' => 0,
'status' => 1,
Expand All @@ -292,7 +292,7 @@ function tkufi_rules_et_add_translation($entity, $target_language_code) {
/**
* Return source language and translated languages of given entity.
*/
function tkufi_rules_et_get_translation_languages($entity) {
function kada_rules_et_get_translation_languages($entity) {
$translated_lang_codes = array();
$source_lang_code = '';
if (isset($entity->translations->original)) {
Expand Down
6 changes: 0 additions & 6 deletions code/modules/custom/tkufi_event_ext/tkufi_event_ext.info

This file was deleted.

0 comments on commit 1f70756

Please sign in to comment.