Merge remote-tracking branch 'origin/7.x-1.x' into 7.x-1.x

link.module

@@ -46,6 +46,7 @@ function link_field_info() {
         'url' => 0,
         'title' => 'optional',
         'title_value' => '',
+        'title_label_use_field_label' => FALSE,
         'title_maxlength' => 128,
         'enable_tokens' => 1,
         'display' => array(
@@ -107,6 +108,13 @@ function link_field_instance_settings_form($field, $instance) {
     '#description' => t('This title will always be used if “Static Title” is selected above.'),
   );
 
+  $form['title_label_use_field_label'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use field label as the label for the title field'),
+    '#default_value' => isset($instance['settings']['title_label_use_field_label']) ? $instance['settings']['title_label_use_field_label'] : FALSE,
+    '#description' => t('If this is checked the field label will be hidden.'),
+  );
+
   $form['title_maxlength'] = array(
     '#type' => 'textfield',
     '#title' => t('Max length of title field'),
@@ -183,6 +191,11 @@ function link_field_instance_settings_form($field, $instance) {
     '#description' => t('Turn on/off if rel attribute should be removed automatically, if user given link is internal/external'),
     '#options' => $rel_remove_options,
   );
+  $form['attributes']['configurable_class'] = array(
+    '#title' => t("Allow the user to enter a custom link class per link"),
+    '#type' => 'checkbox',
+    '#default_value' => empty($instance['settings']['attributes']['configurable_class']) ? '' : $instance['settings']['attributes']['configurable_class'],
+  );
   $form['attributes']['class'] = array(
     '#type' => 'textfield',
     '#title' => t('Additional CSS Class'),
@@ -584,6 +597,16 @@ function _link_sanitize(&$item, $delta, &$field, $instance, &$entity) {
     $item['attributes']['title'] = token_replace($item['attributes']['title'], array($entity_token_type => $entity_loaded));
     $item['attributes']['title'] = filter_xss($item['attributes']['title'], array('b', 'br', 'code', 'em', 'i', 'img', 'span', 'strong', 'sub', 'sup', 'tt', 'u'));
   }
+  // Handle classes
+  if (!empty($item['attributes']['class'])){
+    $classes = explode(' ', $item['attributes']['class']);
+    foreach ($classes as &$class) {
+      $class = drupal_html_class($class);
+    }
+    $item['attributes']['class'] = implode(' ', $classes);
+  }
+  unset($item['attributes']['configurable_class']);
+
   // Remove title attribute if it's equal to link text.
   if (isset($item['attributes']['title']) && $item['attributes']['title'] == $item['title']) {
     unset($item['attributes']['title']);
@@ -715,6 +738,9 @@ function theme_link_field($vars) {
   if (!empty($element['attributes']['title'])) {
     $output .= '<div class="link-attributes">' . drupal_render($element['attributes']['title']) . '</div>';
   }
+  if (!empty($element['attributes']['class'])) {
+    $output .= '<div class="link-attributes">'. drupal_render($element['attributes']['class']) .'</div>';
+  }
   $output .= drupal_render_children($element);
   return $output;
 }
@@ -763,10 +789,21 @@ function link_field_process($element, $form_state, $complete_form) {
     '#default_value' => isset($element['#value']['url']) ? $element['#value']['url'] : NULL,
   );
   if ($settings['title'] !== 'none' && $settings['title'] !== 'value') {
+    // Figure out the label of the title field.
+    if (!empty($settings['title_label_use_field_label'])) {
+      // Use the element label as the title field label.
+      $title_label = $element['#title'];
+      // Hide the field label because there is no need for the duplicate labels.
+      $element['#title_display'] = 'invisible';
+    }
+    else {
+      $title_label = t('Title');
+    }
+
     $element['title'] = array(
       '#type' => 'textfield',
       '#maxlength' => $settings['title_maxlength'],
-      '#title' => t('Title'),
+      '#title' => $title_label,
       '#description' => t('The link title is limited to @maxlength characters maximum.', array('@maxlength' => $settings['title_maxlength'])),
       '#required' => ($settings['title'] == 'required' && (($element['#delta'] == 0 && $element['#required']) || !empty($element['#value']['url']))) ? TRUE : FALSE,
       '#default_value' => isset($element['#value']['title']) ? $element['#value']['title'] : NULL,
@@ -797,6 +834,15 @@ function link_field_process($element, $form_state, $complete_form) {
       '#field_suffix' => '"',
     );
   }
+  if (!empty($settings['attributes']['configurable_class']) && $settings['attributes']['configurable_class'] == 1) {
+    $element['attributes']['class'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Custom link class'),
+      '#default_value' => isset($attributes['class']) ? $attributes['class'] : '',
+      '#field_prefix' => 'class = "',
+      '#field_suffix' => '"',
+    );
+  }
 
   // If the title field is avaliable or there are field accepts multiple values
   // then allow the individual field items display the required asterisk if needed.