jro_apps/redmine Commit - r9133:e2bb8721d9e0

Replace tables that were using the 'width' attribute with inline styles (should be replaced with an ID/class)....

Toshi MARUYAMA -

r9133:e2bb8721d9e0

parent child

Context file:

r9133:e2bb8721d9e0

Collapse all files

app/views/gantts/show.html.erb +2 -2

             <% @gantt.view = self %>
             <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
             <% form_tag({:controller => 'gantts', :action => 'show', :project_id => @project, :month => params[:month], :year => params[:year], :months => params[:months]}, :method => :get, :id => 'query_form') do %>
             <%= hidden_field_tag 'set_filter', '1' %>
             <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <p class="contextual">
               <%= gantt_zoom_link(@gantt, :in) %>
               <%= gantt_zoom_link(@gantt, :out) %>
             </p>
             <p class="buttons">
             <%= text_field_tag 'months', @gantt.months, :size => 2 %>
             <%= l(:label_months_from) %>
             <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
             <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
             <%= hidden_field_tag 'zoom', @gantt.zoom %>
             <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
             <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% zoom = 1
             @gantt.zoom.times { zoom = zoom * 2 }
             subject_width = 330
             header_heigth = 18
             headers_height = header_heigth
             show_weeks = false
             show_days = false
             if @gantt.zoom > 1
                 show_weeks = true
                 headers_height = 2 * header_heigth
                 if @gantt.zoom > 2
                     show_days = true
                     headers_height = 3 * header_heigth
                 end
             end
             # Width of the entire chart
             g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
             @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width, :subject_width => subject_width)
             g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
             t_height = g_height + headers_height
             %>
             <% if @gantt.truncated %>
               <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
             <% end %>
-            <table width="100%" style="border:0; border-collapse: collapse;">
+            <table style="width:100%; border:0; border-collapse: collapse;">
             <tr>
             <td style="width:<%= subject_width %>px; padding:0px;">
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
             <div class="gantt_subjects">
             <%= @gantt.subjects.html_safe %>
             </div>
             </div>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
             <div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
             <%
             #
             # Months headers
             #
             month_f = @gantt.date_from
             left = 0
             height = (show_weeks ? header_heigth : header_heigth + g_height)
             @gantt.months.times do
               width = (((month_f >> 1) - month_f) * zoom - 1).to_i
               %>
               <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
               <%= link_to h("#{month_f.year}-#{month_f.month}"), @gantt.params.merge(:year => month_f.year, :month => month_f.month), :title => "#{month_name(month_f.month)} #{month_f.year}"%>
               </div>
               <%
               left = left + width + 1
               month_f = month_f >> 1
             end %>
             <%
             #
             # Weeks headers
             #
             if show_weeks
               left = 0
               height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
               if @gantt.date_from.cwday == 1
                 # @date_from is monday
                 week_f = @gantt.date_from
               else
                 # find next monday after @date_from
                 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
                 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
                 %>
                 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
                 <%
                 left = left + width + 1
               end %>
               <%
               while week_f <= @gantt.date_to
                 width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i
                 %>
                 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
                 <small><%= week_f.cweek if width >= 16 %></small>
                 </div>
                 <%
                 left = left + width + 1
                 week_f = week_f + 7
               end
             end %>
             <%
             #
             # Days headers
             #
             if show_days
               left = 0
               height = g_height + header_heigth - 1
               wday = @gantt.date_from.cwday
               (@gantt.date_to - @gantt.date_from + 1).to_i.times do
               width =  zoom - 1
               %>
               <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
               <%= day_name(wday).first %>
               </div>
               <%
               left = left + width + 1
               wday = wday + 1
               wday = 1 if wday > 7
               end
             end %>
             <%= @gantt.lines.html_safe %>
             <%
             #
             # Today red line (excluded from cache)
             #
             if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
                 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
             <% end %>
             </div>
             </td>
             </tr>
             </table>
-            <table width="100%">
+            <table style="width:100%">
             <tr>
             <td align="left"><%= link_to_content_update("\xc2\xab " + l(:label_previous), params.merge(@gantt.params_previous)) %></td>
             <td align="right"><%= link_to_content_update(l(:label_next) + " \xc2\xbb", params.merge(@gantt.params_next)) %></td>
             </tr>
             </table>
             <% other_formats_links do |f| %>
               <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
               <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
             <% end %>
             <% end # query.valid? %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_gantt)) -%>

app/views/queries/_filters.html.erb +1 -1

-            <table width="100%">
+            <table style="width:100%">
             <tr>
             <td>
             <table>
             <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
                 <% field = filter[0]
                    options = filter[1] %>
                 <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
                 <td class="field">
                     <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
                     <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
                 </td>
                 <td class="operator">
                     <%= label_tag "operators_#{field}", l(:description_filter), :class => "hidden-for-sighted" %>
                     <%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]),
                                     query.operator_for(field)), :id => "operators_#{field}",
                                     :onchange => "toggle_operator('#{field}');" %>
                 </td>
                 <td class="values">
                 <div id="div_values_<%= field %>" style="display:none;">
                 <% case options[:type]
                 when :list, :list_optional, :list_status, :list_subprojects %>
                     <span class="span_values_<%= field %>">
                       <%= select_tag "v[#{field}][]", options_for_select(options[:values], query.values_for(field)), :class => "values_#{field}", :id => "values_#{field}_1", :multiple => (query.values_for(field) && query.values_for(field).length > 1) %>
                       <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('values_#{field}_1');" %>
                     </span>
                 <% when :date, :date_past %>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 10, :class => "values_#{field}", :id => "values_#{field}_1" %> <%= calendar_for "values_#{field}_1" %></span>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field, 1), :size => 10, :class => "values_#{field}", :id => "values_#{field}_2" %> <%= calendar_for "values_#{field}_2" %></span>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :size => 3, :class => "values_#{field}" %> <%= l(:label_day_plural) %></span>
                 <% when :string, :text %>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :class => "values_#{field}", :id => "values_#{field}", :size => 30 %></span>
                 <% when :integer, :float %>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field), :class => "values_#{field}", :id => "values_#{field}_1", :size => 6 %></span>
                     <span class="span_values_<%= field %>"><%= text_field_tag "v[#{field}][]", query.value_for(field, 1), :class => "values_#{field}", :id => "values_#{field}_2", :size => 6 %></span>
                 <% end %>
                 </div>
                 <script type="text/javascript">toggle_filter('<%= field %>');</script>
                 </td>
                 </tr>
             <% end %>
             </table>
             </td>
             <td class="add-filter">
             <%= label_tag('add_filter_select', l(:label_filter_add)) %>
             <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact),
                                                 :onchange => "add_filter();",
                                                 :name => nil %>
             </td>
             </tr>
             </table>
             <%= hidden_field_tag 'f[]', '' %>
             <%= javascript_tag 'Event.observe(window,"load",apply_filters_observer);' %>

public/help/wiki_syntax.html +1 -1

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
             <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
             <meta http-equiv="Content-Style-Type" content="text/css" />
             <title>Wiki formatting</title>
             <style type="text/css">
             h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
             body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
             table th { padding-top: 1em; }
             table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
             table td code { font-size: 1.2em; }
             table td h1 { font-size: 1.8em; text-align: left; }
             table td h2 { font-size: 1.4em; text-align: left; }
             table td h3 { font-size: 1.2em; text-align: left; }
             </style>
             </head>
             <body>
             <h1>Wiki Syntax Quick Reference</h1>
-            <table width="100%">
+            <table style="width:100%">
             <tr><th colspan="3">Font Styles</th></tr>
             <tr><th><img src="../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Underline" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
             <tr><th></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>@Inline Code@</td><td><code>Inline Code</code></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>&lt;pre><br />&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
             <pre>
              lines
              of code
             </pre>
             </td></tr>
             <tr><th colspan="3">Lists</th></tr>
             <tr><th><img src="../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
             <tr><th colspan="3">Headings</th></tr>
             <tr><th><img src="../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
             <tr><th><img src="../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
             <tr><th colspan="3">Links</th></tr>
             <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
             <tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
             <tr><th colspan="3">Redmine links</th></tr>
             <tr><th><img src="../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
             <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
             <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
             <tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
             <tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
             <tr><th colspan="3">Inline images</th></tr>
             <tr><th><img src="../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
             <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
             </table>
             <p><a href="wiki_syntax_detailed.html" onclick="window.open('wiki_syntax_detailed.html', '', ''); return false;">More Information</a></p>
             </body>
             </html>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages