Merge pull request #5461 from DoSomething/dev

dev into global

Author: angaither

lib/modules/dosomething/dosomething_campaign_group/dosomething_campaign_group.info

@@ -5,6 +5,7 @@ package = DoSomething
 version = 7.x-1.0
 dependencies[] = ctools
 dependencies[] = dosomething_campaign
+dependencies[] = dosomething_helpers
 dependencies[] = dosomething_static_content
 dependencies[] = dosomething_taxonomy
 dependencies[] = entityreference

lib/modules/dosomething/dosomething_campaign_group/dosomething_campaign_group.module

@@ -157,7 +157,8 @@ function dosomething_campaign_group_get_child_data($node) {
     'nids' => array(),
   );
   if (!empty($node->field_campaigns)) {
-    foreach ($node->field_campaigns[LANGUAGE_NONE] as $delta => $value) {
+    $clc = dosomething_helpers_get_current_language_code();
+    foreach ($node->field_campaigns[$clc] as $delta => $value) {
       // Add the child nid to nid's array.
       $data['nids'][] = $value['entity']->nid;
       // If the node is published:

lib/modules/dosomething/dosomething_global/dosomething_global.module

@@ -219,7 +219,7 @@ function _dosomething_global_get_regional_roles() {
 }
 
 /**
- * Returns the user's langauge based on the role.
+ * Returns the user's language based on the role.
  *
  * @param Object $user
  *   Optional - A specified user to check
@@ -270,6 +270,19 @@ function dosomething_global_get_user_language($user = NULL) {
    return $countries;
  }
 
+/**
+ * Returns the session's country code, or `global` if it's not
+ * one of our whitelisted global countries.
+ */
+function dosomething_global_get_country() {
+  $country_code = dosomething_settings_get_geo_country_code();
+  if (in_array($country_code, dosomething_global_get_countries())) {
+    return $country_code;
+  }
+
+  return 'global';
+}
+
 /**
  * Gets the country from a given language.
  *

lib/modules/dosomething/dosomething_helpers/dosomething_helpers.module

@@ -598,9 +598,18 @@ function dosomething_helpers_application_path($path = '') {
  */
 function dosomething_helpers_form_node_admin_content_alter(&$form, &$form_state, $form_id) {
   // Remove destination?=admin/content from edit button
-  foreach ($form['admin']['nodes']['#rows'] as $nid => $node) {
-    if (!empty($form['admin']['nodes']['#rows'][$nid]['operations'])) {
-      unset($form['admin']['nodes']['#rows'][$nid]['operations']['data']['#options']['query']['destination']);
+  if (dosomething_user_is_staff()) {
+    foreach ($form['admin']['nodes']['#options'] as $nid => $node) {
+      if (!empty($form['admin']['nodes']['#options'][$nid]['operations'])) {
+        unset($form['admin']['nodes']['#options'][$nid]['operations']['data']['#links']['edit']['query']['destination']);
+      }
+    }
+  }
+  else if (dosomething_global_is_regional_admin()) {
+    foreach ($form['admin']['nodes']['#rows'] as $nid => $node) {
+      if (!empty($form['admin']['nodes']['#rows'][$nid]['operations'])) {
+        unset($form['admin']['nodes']['#rows'][$nid]['operations']['data']['#options']['query']['destination']);
+      }
     }
   }
 }

lib/modules/dosomething/dosomething_user/dosomething_user.module

@@ -289,7 +289,7 @@ function dosomething_user_form_alter(&$form, $form_state, $form_id) {
       }
 
       $form['#after_build'][] = 'dosomething_user_remove_extra_values_from_address_field';
-      if ($is_validate_address_set) {
+      if ($validate_address) {
         $form['#after_build'][] = 'dosomething_user_add_validation_attributes_to_address_fields';
       }
 

lib/themes/dosomething/paraneue_dosomething/includes/preprocess.inc

@@ -181,15 +181,29 @@ function paraneue_dosomething_preprocess_page(&$vars) {
    * Global Page Footer
    */
 
+  $country = dosomething_global_get_country();
   $columns = array('first', 'second', 'third');
   $footer_links = array();
 
   foreach($columns as $column) {
-    $prefix = "footer_links_" . $column . "_column_";
+    $prefix = "footer_links_" . $country . '_' . $column . "_column_";
     $footer_links[$column] = array();
-    $footer_links[$column]['heading'] = theme_get_setting($prefix . "heading");
 
-    $links = explode("\n", trim(theme_get_setting($prefix . "links")));
+    // Get new country code setting if it exists, if not fallback to old setting.
+    // @TODO: Remove this after we've updated theme settings everywhere.
+    $heading_setting = theme_get_setting($prefix . 'heading');
+    if(!$heading_setting === NULL) {
+      $heading_setting = theme_get_setting('footer_links_' . $column . '_column_heading');
+    }
+    $footer_links[$column]['heading'] = $heading_setting;
+
+    // Get new country code setting if it exists, if not fallback to old setting.
+    // @TODO: Remove this after we've updated theme settings everywhere.
+    $links_setting = theme_get_setting($prefix . 'links');
+    if(!$links_setting === NULL) {
+      $links_setting = theme_get_setting('footer_links_' . $column . '_column_links');
+    }
+    $links = explode("\n", trim($links_setting));
     $links = array_filter($links); // Remove empty items
 
     foreach($links as &$link) {

lib/themes/dosomething/paraneue_dosomething/paraneue_dosomething.info

@@ -47,12 +47,10 @@ settings[footer_links_first_column_heading] = 'Help'
 settings[footer_links_first_column_links] = 'Contact Us|node/516
 Hotlines|node/518
 FAQs|node/1052'
-settings[footer_links_first_column_class] = 'help'
 settings[footer_links_second_column_heading] = 'Get to Know Us'
 settings[footer_links_second_column_links] = 'Partners|node/532
 Donate|node/539
 TMI Agency|http://www.tmiagency.org'
-settings[footer_links_second_column_class] = 'knowus'
 settings[footer_links_third_column_heading] = 'About'
 settings[footer_links_third_column_links] = 'What is DoSomething.org?|node/538
 Our Team|node/1044
@@ -61,7 +59,6 @@ Internships|node/940
 Old People|node/329
 Sexy Financials|node/540
 International|node/523'
-settings[footer_links_third_column_class] = 'about'
 
 ; User
 settings[user_validate_js_postcode] = 1

lib/themes/dosomething/paraneue_dosomething/theme-settings.php

@@ -272,46 +272,59 @@ function _paraneue_dosomething_theme_settings_footer(&$form, $form_state) {
   );
 
   $links = &$form['footer']['links'];
-  $columns = array('first', 'second', 'third');
-  foreach ($columns as $column) {
-    $prefix = 'footer_links_' . $column;
 
-    $links[$prefix] = array(
+  // Set up theme settings for each country's footer
+  $countries = dosomething_global_get_countries();
+  foreach($countries as $country) {
+    $links[$country. '_links'] = [
       '#type' => 'fieldset',
-      '#title' => t(ucwords($column) .' column'),
+      '#title' => t('@country Links', ['@country' => $country]),
       '#collapsible' => TRUE,
-      '#collapsed' => TRUE
-    );
-
-    $link_column = &$links[$prefix];
-
-    $link_column[$prefix . '_column_heading'] = array(
-      '#type' => 'textfield',
-      '#title' => t(ucwords($column) . ' Column Heading'),
-      '#default_value' => theme_get_setting('footer_links_' . $column . '_column_heading')
-    );
-
-    $link_column[$prefix . '_column_links'] = array(
-      '#type' => 'textarea',
-      '#title' => t(ucwords($column) . ' Column Links'),
-      '#default_value' => theme_get_setting('footer_links_' . $column . '_column_links')
-    );
-
-    $link_column[$prefix. '_advanced'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Advanced options'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE
-    );
-
-    $link_column[$prefix . '_advanced'][$prefix . '_column_class'] = array(
-      '#type' => 'textfield',
-      '#title' => t(ucwords($column) . ' Column Class'),
-      '#default_value' => theme_get_setting('footer_links_' . $column . '_column_class')
-    );
+      '#collapsed' => TRUE,
+    ];
+
+    // Set up theme settings for each of the three columns
+    $columns = ['first', 'second', 'third'];
+    foreach ($columns as $column) {
+      $prefix = 'footer_links_' . $country . '_' . $column;
+
+      $links[$country. '_links'][$prefix] = [
+        '#type' => 'fieldset',
+        '#title' => t(ucwords($column) .' column'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+      ];
+
+      $link_column = &$links[$country. '_links'][$prefix];
+
+      // Get new country code setting if it exists, if not fallback to old setting.
+      // @TODO: Remove this after we've updated theme settings everywhere.
+      $heading_default = theme_get_setting('footer_links_' . $country . '_' . $column . '_column_heading');
+      if(!$heading_default === NULL) {
+        $heading_default = theme_get_setting('footer_links_' . $column . '_column_heading');
+      }
+
+      $link_column[$prefix . '_column_heading'] = [
+        '#type' => 'textfield',
+        '#title' => t(ucwords($country) . ' ' . ucwords($column) . ' Column Heading'),
+        '#default_value' => $heading_default,
+      ];
+
+      // Get new country code setting if it exists, if not fallback to old setting.
+      // @TODO: Remove this after we've updated theme settings everywhere.
+      $links_default = theme_get_setting('footer_links_' . $country . '_' . $column . '_column_links');
+      if(!$links_default === NULL) {
+        $links_default = theme_get_setting('footer_links_' . $column . '_column_links');
+      }
+
+      $link_column[$prefix . '_column_links'] = [
+        '#type' => 'textarea',
+        '#title' => t(ucwords($country) . ' ' . ucwords($column) . ' Column Links'),
+        '#default_value' => $links_default,
+      ];
+    }
 
   }
-
 }
 
 function _paraneue_dosomething_theme_settings_user(&$form, $form_state) {
@@ -321,7 +334,7 @@ function _paraneue_dosomething_theme_settings_user(&$form, $form_state) {
   );
   $form_user = &$form['user'];
 
-  // Validaions.
+  // Validations.
   $form_user['validations'] = array(
     '#type'        => 'fieldset',
     '#title'       => t('JS Validations'),