Show
Ignore:
Timestamp:
12.01.2012 15:52:20 (8 years ago)
Author:
davidb
Message:

More careful recursive traversal to classifier nodes; further developed of CSS to Expeditee attributes (background colour); and slightly less cludgy way to deal with full img URLS

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/html-to-expeditee/trunk/src/perllib/ExpediteeFrameIO.pm

    r24941 r24944  
    7474    my $exp_attr = {}; 
    7575 
    76     if (defined $css_attr->{'background-color'}) { 
    77     $exp_attr->{'e'} = $css_attr->{'background-color'}; 
    78     } 
    79  
    8076    # load up some defaults for font information 
    8177    my $exp_font_family = "s"; # t 
     
    9793 
    9894#    $exp_attr->{'f'} = $exp_font_family.$exp_font_face.$exp_font_size; 
     95 
     96    # background color 
     97 
     98 
     99    if (defined $css_attr->{'background-color'}) { 
     100    my $css_color = $css_attr->{'background-color'}; 
     101 
     102    my $exp_color = CssStyleToExpAttr::convert_color($css_color); 
     103 
     104    $exp_attr->{'e'} = $exp_color; 
     105    } 
    99106 
    100107    return $exp_attr; 
     
    447454 
    448455        my $img_url = $html_node->{'img'}; 
    449         $img_url =~ s/^http:\/\/www\.nzdl\.org\/greenstone3-showcase\///; 
     456        $img_url =~ s/^http:\/\/(.*?)\/greenstone3(.*?)\///; 
    450457        if ($img_url =~ m/^interfaces\//) { 
    451458        $img_url = "images/$img_url";