Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/contests/index.html.erb
从远端下载该文件到本地
Signed-off-by: alan <547533434@qq.com>

app/controllers/attachments_controller.rb

@@ -361,7 +361,7 @@ private
 
   def login_without_softapplication
     referer = request.headers['Referer']
-    require_login unless referer =~ /softapplication/ || referer =~ /memos/
+    require_login unless referer =~ /softapplication/ || @attachment.container_type == "Memo"
   end
 
   def  renderTag

app/views/contests/index.html.erb

@@ -1,53 +0,0 @@
-<div class="top-content">
-	<%= form_tag({:controller => 'contests', :action => 'index'}, :method => :get) do %>
-	<table width="940px">
-		<tr>
-			<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_contest_innovate) %></td>
-			<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
-			<td rowspan="2">
-			<% if User.current.logged? %>
-                <% unless User.current.user_extensions.identity == 1 %>
-
-                    <%= link_to(l(:label_newtype_contest),  new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
-                  <% end %>
-			<% end %>
-			</td>
-			<td rowspan="2" >
-			<div class="project-search" style="float: right">
-                <%= text_field_tag 'name', params[:name], :size => 30 %>
-                <%= hidden_field_tag 'project_type', params[:project_type] %>
-                <%= submit_tag l(:label_search),
-                               :class => "enterprise",
-                               :name => "contests_search"
-                %>
-			</div>
-			</td>
-		</tr>
-		<tr>
-			<td style="padding-left: 8px">
-              <a>
-                <%= link_to request.host()+"/contests", contests_path %>
-              </a>
-            </td>
-	        <td >
-              <%=link_to l(:field_homepage), home_path %> >
-              <%=link_to l(:label_contest_innovate), contests_path %>
-              <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
-            </td>
-		</tr>
-	</table>
-	<% end %>
-</div>						
-<% if @contests.size > 0%>
-<%= sort_contest(@s_state)%>
-<div id="bid-show">
-	<%= render :partial => 'contest_list',
-               :locals => {:contests => @contests, :contest_pages => @contest_pages}
-    %>
-</div>
-<% else %>
-    <%= render :partial => "layouts/no_content"%>
-<% end %>
-
-<% html_title l(:label_contest_list)%>
-s

app/views/layouts/_base_header.html.erb

@@ -54,7 +54,7 @@
                     <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
                         <% if !course_endTime_timeout?(course) %>
-                            <li><%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id} %></li>
+                            <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=course.name%>"><%= link_to course.name, {:controller => 'courses',:action => 'show',id:course.id} %></li>
                         <% end %>
                     <% end %>
                   </ul>
@@ -73,7 +73,7 @@
                     <ul class="project_sub_menu" style="top: 0px">
                 <% end %>
                 <% User.current.projects.each do |project| %>
-                      <li><%= link_to project.name.truncate(10, omission: '...'), {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %></li>
+                      <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>"><%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %></li>
                  <% end %>
                  </ul>
               </li>

plugins/redmine_code_review/app/views/code_review/index.html.erb

@@ -51,7 +51,7 @@ function change_option(flag) {
   <% else %>
 
 
-    <table class="list">
+    <table class="list" style="width:100%;table-layout: fixed;">
       <thead>
         <tr>
           <%= sort_header_tag "#{Issue.table_name}.id", :caption => '#'  %>
@@ -70,18 +70,18 @@ function change_option(flag) {
       <tbody>
         <% for review in @reviews %>
           <tr class="<%= cycle 'odd', 'even' %>">
-            <td>
+            <td style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;">
               <%= link_to review.issue.id.to_s, {:controller => 'issues', :action => 'show',
                 :id => review.issue.id}, :title => review.issue.subject %>
             </td>
 
-            <td class="status">
+            <td class="status" style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;" title="<%=h  review.issue.status %>">
               <%=h  review.issue.status %>
             </td>
-            <td class="subject">
+            <td class="subject" style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;" title="<%=h  review.issue.subject %>">
               <%=h  review.issue.subject %>
             </td>
-            <td class="path">
+            <td class="path" style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;">
               <%
               review_path = URI.decode(review.path)
               codepath = review_path
@@ -91,11 +91,11 @@ function change_option(flag) {
               -%>
               <%= link_to(raw(codepath), {:controller => 'code_review', :action => 'show', :id => @project, :review_id => review.id}, :title => review_path) -%>
            </td>
-            <td><%=h review.line %></td>
+            <td style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;" title="<%=h review.line %>"><%=h review.line %></td>
-            <td><%=h review.revision %></td>
+            <td style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;" title="<%=h review.revision %>"><%=h review.revision %></td>
-            <td><%=h review.committer %></td>
+            <td style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;" title="<%=h review.committer %>"><%=h review.committer %></td>
-            <td><%=h review.user.name %></td>
+            <td style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;" title="<%=h review.user.name %>"><%=h review.user.name %></td>
-            <td><%=h format_time(review.created_at) %></td>
+            <td style="text-overflow:ellipsis;white-space:nowrap;overflow:hidden;" title="<%=h format_time(review.created_at) %>"><%=h format_time(review.created_at) %></td>
           </tr>
         <% end %>
       </tbody>