Changeset 382

Show
Ignore:
Timestamp:
01/08/07 23:11:14 (2 years ago)
Author:
jarmo
Message:
  • Removed some old unused style definitions for the old ODT2HTML system.
  • Moved report style definitions under the other stylesheet links.
  • Added support for style:col-min-height style attribute to the odt to xhtml convertor.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0/app/views/layouts/mainlevel.rhtml

    r359 r382  
    2121    <title><%= @title %> - NorfelloCMMS</title> 
    2222 
     23    <%= stylesheet_link_tag 'mainlevel' %> 
     24    <%= stylesheet_link_tag 'calendar-win2k-1' %> 
     25     
    2326    <!-- report/view --> 
    2427    <%= @content_for_report_style %> 
    25  
    26     <%= stylesheet_link_tag 'mainlevel' %> 
    27     <%= stylesheet_link_tag 'calendar-win2k-1' %> 
    2828 
    2929    <%= javascript_include_tag 'calendar' %> 

  • branches/1.0/public/stylesheets/mainlevel.css

    r357 r382  
    986986 
    987987/* 
    988 --------------------- 
    989 ODT2HTML 
    990 DO NOT TOUCH! 
    991 --------------------- 
    992 */ 
    993  
    994 @page { size: 8.2701in 11.6902in; margin-top: 1in; margin-bottom: 1in; margin-left: 1in; margin-right: 1in; } 
    995 table { border-collapse:collapse; border-spacing:0; empty-cells:show } 
    996 td, th { vertical-align:top; } 
    997 h1, h2, h3, h4, h5, h6 { clear:both } 
    998 /* ol, ul { padding:0; } */ 
    999 /* * { margin:0; } */ 
    1000 *.Heading { font-family:Verdana, sans-serif; font-size:14pt; margin-top:0.1665in; margin-bottom:0.0835in; } 
    1001 *.Heading1 { font-family:Verdana, sans-serif; font-size:115%; margin-top:0.1665in; margin-bottom:0.0835in; font-weight:bold; } 
    1002 *.Heading2 { font-family:Verdana, sans-serif; font-size:14pt; margin-top:0.1665in; margin-bottom:0.0835in; font-style:italic; font-weight:bold; } 
    1003 *.P1 { font-family:Verdana, sans-serif; font-size:16pt; text-align:center ! important; } 
    1004 *.P10 { font-family:Verdana, sans-serif; font-size:10pt; font-weight:normal; } 
    1005 *.P11 { font-family:Verdana, sans-serif; font-size:12pt; font-weight:normal; } 
    1006 *.P12 { font-family:Verdana, sans-serif; font-size:12pt; text-align:justify ! important; font-weight:bold; } 
    1007 *.P13 { font-family:"Courier 10 Pitch", courier, monospace; font-size:10pt; font-weight:bold; } 
    1008 *.P14 { font-family:Verdana, sans-serif; font-size:11pt; } 
    1009 *.P2 { font-family:Verdana, sans-serif; font-size:12pt; text-align:center ! important; font-style:italic; } 
    1010 *.P3 { font-family:Verdana, sans-serif; font-size:12pt; text-align:justify ! important; } 
    1011 *.P4 { font-family:Verdana, sans-serif; font-size:12pt; text-align:left ! important; } 
    1012 *.P5 { font-family:Verdana, sans-serif; font-size:12pt; text-align:left ! important; } 
    1013 *.P6 { font-family:Verdana, sans-serif; font-size:12pt; text-align:left ! important; } 
    1014 *.P7 { font-family:Verdana, sans-serif; font-size:12pt; text-align:justify ! important; } 
    1015 *.P8 { font-family:Verdana, sans-serif; font-size:10pt; text-align:justify ! important; } 
    1016 *.P9 { font-family:"Courier 10 Pitch", courier, sans-serif; font-size:12pt; } 
    1017 *.Standard { font-family:"Times New Roman", times, serif; font-size:12pt; } 
    1018 *.Textbody { font-family:"Times New Roman", times, serif; font-size:12pt; margin-top:0in; margin-bottom:0.0835in; } 
    1019 *.Sect1 { } 
    1020 *.BulletSymbols { font-family:StarSymbol, symbol; font-size:9pt; } 
    1021 *.EndnoteSymbol { } 
    1022 *.FootnoteSymbol { } 
    1023 *.Internetlink { color:#000080; text-decoration:underline; } 
    1024 *.T1 { font-style:italic; font-weight:bold; } 
    1025 *.T2 { font-weight:bold; } 
    1026 *.T3 { font-family:"Courier 10 Pitch", courier, monospace; } 
    1027 *.T4 { font-style:italic; } 
    1028 *.T5 { font-style:normal; } 
    1029 *.T6 { vertical-align:sub; } 
     988-------------------------------------- 
     989ODT TO HTML CONVERSION 
     990 
     991These styles improve the quality of 
     992the conversion. 
     993-------------------------------------- 
     994*/ 
     995 
     996/* These two styles trim some empty spaces 
     997   inside tables. 
     998    
     999   Tested on firefox 1.5  
     1000*/ 
     1001.report_html_view table>tbody>tr>td { 
     1002  padding: 0; 
     1003} 
     1004.report_html_view table>tbody>tr>td>table { 
     1005  padding: 0; 
     1006  margin: 0; 
     1007} 
     1008 

  • branches/1.0/vendor/plugins/odt_to_xhtml/lib/analyze_styles.rb

    r2 r382  
    134134                process_normal_style_attr( selector, "width", value ) 
    135135        end 
     136 
     137  def process_min_row_height(selector, property, value) 
     138    process_normal_style_attr(selector, "height", value) 
     139  end 
    136140         
    137141        #       <tt>style:text-underline-style</tt> becomes <tt>text-decoration</tt> 

  • branches/1.0/vendor/plugins/odt_to_xhtml/lib/odt_to_xhtml.rb

    r2 r382  
    9898        fo:text-indent 
    9999        style:column-width* process_column_width 
     100        style:min-row-height* process_min_row_height 
    100101        style:text-underline-style* process_underline_style 
    101102        style:text-position* process_style_text_position 

© 2004-2007 Norfello Oy All Rights Reserved