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

app/controllers/issues_controller.rb

@@ -83,6 +83,10 @@ class IssuesController < ApplicationController
                               :limit => @limit)
       @issue_count_by_group = @query.issue_count_by_group
 
+
+
+
+
       respond_to do |format|
         format.html { render :template => 'issues/index', :layout =>  @project_base_tag }#by young
         format.api  {

app/controllers/my_controller.rb

@@ -37,14 +37,39 @@ class MyController < ApplicationController
                    }.freeze
 
   def index
+
     page
     render :action => 'page'
-  end
+ end
 
   # Show user's page
   def page
     @user = User.current
+    @Issues= Issue.visible.open.
+        where(:assigned_to_id => ([User.current.id] + User.current.group_ids))
+    @limit = 10
+    @feedback_count = @Issues.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    @curse_attachments = @Issues[@offset, @limit]
+
+    @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
+  end
+
+  def page2
+    @limit = 10
+    @user = User.current
+    @Issues= Issue.visible.open.
+        where(:assigned_to_id => ([User.current.id] + User.current.group_ids))
+    @feedback_count = @Issues.count
+    @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+    @offset ||= @feedback_pages.offset
+    @curse_attachments = @Issues[@offset, @limit]
+    @state = false
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
+    respond_to do |format|
+      format.js
+    end
   end
 
   # Edit user's account

app/views/attachments/file.html.erb

@@ -4,7 +4,13 @@
 <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
    <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
 <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp<span class="size">
+     <%=  link = link_to(l(:button_add), {:controller => 'code_review',
+                                          :action => 'assign', :action_type => 'attachment',
+                                          :id=>@attachment.project,
+                                          :change_id => '', :attachment_id => @attachment.id,
+                                         }, :class => 'icon icon-add') %>
+   </span></p>
 
 </div>
 &nbsp;

app/views/bids/_homework_form.html.erb

@@ -26,9 +26,9 @@
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT  %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
-<!-- <p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
+<!-- <p><%#= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe,
 	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
-	<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
+	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%>
 </p>

app/views/courses/_homework_form.html.erb

@@ -30,7 +30,7 @@
 	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <% time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d') %>
-<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}") %><%= calendar_for('bid_deadline')%>
+<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}",:readonly => "readonly") %><%= calendar_for('bid_deadline')%>
 </p>
 <p><%= f.select :is_evaluation, is_evaluation_option %>
 </p>

app/views/files/_show_all_attachment.html.erb

@@ -3,7 +3,8 @@
 <% attachmenttypes = @project.attachmenttypes %>
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
-<table class="list files" id="ver-zebra">
+<div class="autoscroll">
+<table class="list files" id="ver-zebra"  style="width: 100%;table-layout: fixed">
   <colgroup>
     <col class="vzebra-odd"/>
     <col class="vzebra-even"/>
@@ -40,17 +41,17 @@
           <%next%>
           <%end%>
           <tr class="file <%= cycle("odd", "odd") %>">
-            <td class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
             <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
-            <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-            <td class="attach_type">
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="filesize"><%= number_to_human_size(file.filesize) %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="attach_type">
               <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName %></span>
               <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
                 <%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes, :attachment => file, :contentype => selContentType} %>
               </span>
             </td>
-            <td class="content_type"><%= file.show_suffix_type %></td>
-            <td class="field_file_dense">
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="content_type"><%= file.show_suffix_type %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="field_file_dense">
               <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
               &nbsp;
       <span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
@@ -58,9 +59,9 @@
                                                                       :attachment => file} %>
         </span>
             </td>
-            <td class="downloads"><%= file.downloads %></td>
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="downloads"><%= file.downloads %></td>
             <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-            <td align="center">
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center">
               <%= link_to(image_tag('delete.png'), attachment_path(file),
                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
             </td>
@@ -83,7 +84,7 @@
 
   </tbody>
 </table>
-
+ </div>
 <!--分页-->
 <div class="pagination" style="float:left;">
   <ul>

app/views/memos/_form.html.erb

@@ -2,12 +2,12 @@
 <!--[form:project]-->
 <p><%= l(:label_homeworks_form_new_description) %></p>
     <!-- % unless @memo.parent_id %>
-      <% if @memo.safe_attribute? 'sticky' %>
-       <%= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
-      <% end %>
-      <% if @memo.safe_attribute? 'locked' %>
-       <%= f.check_box :locked %> <%= label_tag 'memo_locked', l(:label_board_locked) %>
-      <% end %>
-    <% end % -->
+      <%# if @memo.safe_attribute? 'sticky' %>
+       <%#= f.check_box :sticky %> <lable><%= l(:label_board_sticky) %></lable>
+      <%# end %>
+      <%# if @memo.safe_attribute? 'locked' %>
+       <%#= f.check_box :locked %> <%#= label_tag 'memo_locked', l(:label_board_locked) %>
+      <%# end %>
+    <%# end %> -->
 <p><%= f.text_field :content, :required => true, :size => 60, :style => "width:150px;" %></p>
 <p><%= hidden_field_tag 'subject', ||=@memo.subject %>

app/views/my/blocks/_assiagn_issue.html.erb

@@ -0,0 +1,26 @@
+<% assigned_issues = issuesassignedtome_items %>
+<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
+<% if assigned_issues.length > 0 %>
+    <!--分页-->
+    <!--
+    <div class="pagination" style="float:left;">
+      <ul>
+        <%#= pagination_links_full(@feedback_pages,@feedback_count, :per_page_links => false){|text, parameters, options|
+          link_to text, my_page2_path(parameters.merge(:q => params[:q])) }%>
+        <%#= pagination_links_full @feedback_pages %>
+      </ul>
+    </div>
+     -->
+<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+                                                       :action => 'index',
+                                                       :set_filter => 1,
+                                                       :assigned_to_id => 'me',
+                                                       :sort => 'priority:desc,updated_on:desc' %></p>
+<% end %>
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom,
+                            {:controller => 'issues', :action => 'index', :set_filter => 1,
+                             :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key},
+                            {:title => l(:label_assigned_to_me_issues)}) %>
+
+<% end %>

app/views/my/blocks/_issuesassignedtome.html.erb

@@ -1,18 +1,4 @@
 <h3><%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => ([User.current.id] + User.current.group_ids)})%>)</h3>
-
-<% assigned_issues = issuesassignedtome_items %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
-<% if assigned_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
-                                                       :action => 'index',
-                                                       :set_filter => 1,
-                                                       :assigned_to_id => 'me',
-                                                       :sort => 'priority:desc,updated_on:desc' %></p>
-<% end %>
-
-<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom,
-                            {:controller => 'issues', :action => 'index', :set_filter => 1,
-                             :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key},
-                            {:title => l(:label_assigned_to_me_issues)}) %>
-<% end %>
+   <div id="asdsadwsc">
+     <%= render :partial => "my/blocks/assiagn_issue" %>
+    </div>

app/views/my/page.js.erb

@@ -0,0 +1 @@
+$("#asdsadwsc").html("<%= escape_javascript(render :partial => 'my/blocks/assiagn_issue') %>");

app/views/my/page2.js.erb

@@ -0,0 +1 @@
+$("#asdsadwsc").html("<%= escape_javascript(render :partial => 'my/blocks/assiagn_issue') %>");

app/views/news/_course_show.html.erb

@@ -69,9 +69,9 @@
                             :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
           <%= render :partial => 'course_form', :locals => { :f => f, :is_new => false } %>
           <%#= submit_tag l(:button_save) %>
-          <%= link_to l(:button_save), "#", :onclick => 'submitNews();' %>
-          <%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => ''} %> |
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+          <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:class => 'whiteButton m3p10' %>
+          <%= preview_link preview_news_path(:course_id => @course, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> |
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>

config/locales/zh.yml

@@ -1641,7 +1641,7 @@ zh:
   label_call_bonus: 奖金
   label_bids_form_new_description: 企业可以在此发布一个软件开发任务或者一个技术方案需求：（1）获得价廉物美的解决方案；（2）发现对此项任务有贡献的大学生，获得可以招聘的人才。
   label_bids_form_contest_new_description: 企业或者高校可以在此发布一个竞赛。
-  label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式，在作业类型里面设置。
+  label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式。
   label_fork_form_new_description: 该需求将作为某课程的作业被发布，作业提交方式可以使附件或者项目形式，在作业类型里面设置。
   label_bids_new_money: 输入奖励金额，如 500,2.5等
   label_bids_new_credit: 输入该作业对应课程的学分，如 3,2.5等

config/routes.rb

@@ -275,6 +275,8 @@ RedmineApp::Application.routes.draw do
   match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
   match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
 
+  get 'my/page2', :to => 'my#page2',  :as => "my_page2"
+
   resources :users
   match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => :put, :as => 'user_membership'
   match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete