Project

General

Profile

« Previous | Next » 

Revision b0aa9a8f

Added by Andreas Kohlbecker almost 7 years ago

upgrading font awesome

View differences:

modules/cdm_dataportal/cdm_dataportal.module
314 314
   *    the markup for the icon in an <i> tag
315 315
   *
316 316
   */
317
  function font_awesome_icon_markup($icon_name, $attributes = array()){
317
  function font_awesome_icon_markup($icon_name = NULL, $attributes = array()){
318 318

  
319 319

  
320 320
    //<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
321 321

  
322
    $font_awesome_css_uri=drupal_get_path('module', 'cdm_dataportal').'/font-awesome/4.2.0/css/font-awesome.min.css';
323
    $font_awesome_css_uri="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css";
322
    $font_awesome_css_uri=drupal_get_path('module', 'cdm_dataportal').'/font-awesome/4.5.0/css/font-awesome.min.css';
323
    $font_awesome_css_uri="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css";
324 324

  
325 325
    drupal_add_html_head_link(
326 326
      array(
......
329 329
      )
330 330
    );
331 331

  
332
    if(!isset($attributes['class'])){
333
      $attributes['class'] = array();
332
    if($icon_name){
333
      if(!isset($attributes['class'])){
334
        $attributes['class'] = array();
335
      }
336
      $attributes['class'][] = 'fa';
337
      $attributes['class'][] = $icon_name;
338

  
339
      return '<i ' . drupal_attributes($attributes) . '></i>';
334 340
    }
335
    $attributes['class'][] = 'fa';
336
    $attributes['class'][] = $icon_name;
337 341

  
338
    return '<i ' . drupal_attributes($attributes) . '></i>';
342
    return '';
339 343
  }
340 344

  
341 345

  

Also available in: Unified diff