From 8b7a775419073af56c50827d45a7e97f8ae5d9c8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 9 Oct 2014 16:24:12 +0800
Subject: [PATCH] =?UTF-8?q?#1269=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE--?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E8=BE=B9=E6=A1=86=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/calendars/show.html.erb   | 53 +++++++++++-----------
 app/views/common/_calendar.html.erb | 68 ++++++++++++++++-------------
 2 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 9166974fa..65b740203 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -2,38 +2,35 @@
 
 <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
              :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 style="float:right;">
-  <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
-</p>
-
-<p class="buttons">
-<%= label_tag('month', l(:label_month)) %>
-<%= select_month(@month, :prefix => "month", :discard_type => true) %>
-<%= label_tag('year', l(:label_year)) %>
-<%= select_year(@year, :prefix => "year", :discard_type => true) %>
-
-<%= 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>
+    <%= 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 style="float:right;">
+      <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %>
+    </p>
+    <p class="buttons">
+        <%= label_tag('month', l(:label_month)) %>
+        <%= select_month(@month, :prefix => "month", :discard_type => true) %>
+        <%= label_tag('year', l(:label_year)) %>
+        <%= select_year(@year, :prefix => "year", :discard_type => true) %>
+
+        <%= 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? %>
-<%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
-
-<p class="legend cal">
-  <span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
-  <span class="ending"><%= l(:text_tip_issue_end_day) %></span>
-  <span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
-</p>
+    <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
+    <p class="legend cal">
+      <span class="starting"><%= l(:text_tip_issue_begin_day) %></span>
+      <span class="ending"><%= l(:text_tip_issue_end_day) %></span>
+      <span class="starting ending"><%= l(:text_tip_issue_begin_end_day) %></span>
+    </p>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 7951b68ce..83f8e217b 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -1,32 +1,38 @@
-<table class="cal">
-<thead>
-<tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
-</thead>
-<tbody>
-<tr>
-<% day = calendar.startdt
-while day <= calendar.enddt %>
-<%= ("<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>".html_safe) if day.cwday == calendar.first_wday %>
-<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
-<p class="day-num"><%= day.day %></p>
-<% calendar.events_on(day).each do |i| %>
-  <% if i.is_a? Issue %>
-  <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
-  <%= h("#{i.project} -") unless @project && @project == i.project %>
-  <%= link_to_issue i, :truncate => 30 %>
-  <span class="tip"><%= render_issue_tooltip i %></span>
-  </div>
-  <% else %>
-  <span class="icon icon-package">
-    <%= h("#{i.project} -") unless @project && @project == i.project %>
-    <%= link_to_version i%>
-  </span>
-  <% end %>
-<% end %>
-</td>
-<%= '</tr><tr>'.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %>
-<% day = day + 1
-end %>
-</tr>
-</tbody>
+<table class="cal" style="width: 100%;table-layout: fixed;">
+    <thead>
+        <tr>
+          <th scope="col" title="<%= l(:label_week) %>" class="week-number"></th>
+          <% 7.times do |i| %>
+              <th scope="col"  style='white-space: nowrap;overflow: hidden;text-overflow: ellipsis;'><%= day_name( (calendar.first_wday+i)%7 ) %></th>
+          <% end %>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <% day = calendar.startdt
+            while day <= calendar.enddt %>
+                <%= ("<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>".html_safe) if day.cwday == calendar.first_wday %>
+                <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>"
+                    style="word-break: break-all;word-wrap: break-word;">
+                <p class="day-num"><%= day.day %></p>
+                <% calendar.events_on(day).each do |i| %>
+                    <% if i.is_a? Issue %>
+                        <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
+                        <%= h("#{i.project} -") unless @project && @project == i.project %>
+                        <%= link_to_issue i, :truncate => 30 %>
+                        <span class="tip"><%= render_issue_tooltip i %></span>
+                        </div>
+                    <% else %>
+                         <span class="icon icon-package">
+                        <%= h("#{i.project} -") unless @project && @project == i.project %>
+                        <%= link_to_version i%>
+                        </span>
+                    <% end %>
+                <% end %>
+                </td>
+                <%= '</tr><tr>'.html_safe if day.cwday==calendar.last_wday and day!=calendar.enddt %>
+                <% day = day + 1
+            end %>
+        </tr>
+    </tbody>
 </table>