Merge branch '3.4.2'

Author: svenhoutmeyers

culturefeed.info

@@ -1,7 +1,7 @@
 name = CultureFeed
 description = CultureFeed
 package = CultureFeed
-version = "7.x-3.3"
+version = "7.x-3.4"
 core = 7.x
 
 files[] = lib/Drupal/DrupalCultureFeedBase.php

culturefeed_agenda/includes/helpers.inc

@@ -581,7 +581,6 @@ function culturefeed_agenda_parse_weekscheme(CultureFeed_Cdb_Data_Calendar_Weeks
 function culturefeed_agenda_parse_timestamps($timestamps) {
 
   $timestamps_array = array();
-
   $timestamps_count = iterator_count($timestamps);
   $timestamps->rewind();
   $current_timestamp = 0;
@@ -678,12 +677,26 @@ function culturefeed_agenda_parse_calendar($calendar) {
     $calendar_array = array(
       'type' => 'timestamps',
     );
+    $calendar_array['start_date'] = culturefeed_agenda_get_startdate($calendar);
     $calendar_array['timestamps'] = culturefeed_agenda_parse_timestamps($calendar);
     $calendar_array['timestamps'] = culturefeed_agenda_group_timestamps($calendar_array['timestamps']);
   }
   return $calendar_array;
 }
 
+/**
+ * Get the startdate if its a timestamplist
+ */
+function culturefeed_agenda_get_startdate($dates) {
+  $dates->rewind();
+  
+  for ($i = 0; $i < 1; $i++) {
+    $date = $dates->current();
+    $startdate = $date->getDate() . ' ' . $date->getStartTime();
+  }
+  return $startdate;
+}
+
 /**
  * Function to search for 5 actors in the neighbourhood for a given eventtype.
  * @param type $event

culturefeed_social/culturefeed_social.module

@@ -897,7 +897,16 @@ function culturefeed_social_base_report_abuse_form($form, &$form_state, $activit
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit'),
-    '#attributes' => array('class' => array('btn-primary')),
+    '#attributes' => array('style' => array('float:left')),
+  );
+  
+  $destination = drupal_get_destination();
+  
+  $form['cancel'] = array(
+    '#type' => 'link',
+    '#title' => t('Cancel'),
+    '#href' => url($GLOBALS['base_url'] . '/' . $destination['destination']),
+    '#attributes' => array('class' => array('abuse-button-decline')),
   );
 
   $form['#theme'] = 'culturefeed_social_report_abuse_form';

culturefeed_social/includes/pages.inc

@@ -267,7 +267,7 @@ function culturefeed_social_page_activity_delete_confirm_form($form, &$form_stat
   $form['decline'] = array(
     '#type' => 'link',
     '#title' => t('Cancel'),
-    '#href' => url($destination['destination']),
+    '#href' => url($GLOBALS['base_url'] . '/' . $destination['destination']),
     '#attributes' => array('class' => array('button-decline')),
   );
 

culturefeed_ui/culturefeed_ui.blocks.inc

@@ -206,7 +206,6 @@ function culturefeed_ui_block_profile_menu_view() {
   $block['content'] = array(
     '#theme' => 'item_list',
     '#items' => $items,
-    '#attributes' => array('class' => 'dropdown-menu', 'role' => 'menu'),
   );
 
   return $block;