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

app/helpers/application_helper.rb

@@ -494,7 +494,7 @@ module ApplicationHelper
   def principals_check_box_tags_ex(name, principals)
     s = ''
     principals.each do |principal|
-      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal.userInfo }</label>\n"
+      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id)}</label>\n"
     end
     s.html_safe
   end

app/models/mailer.rb

@@ -36,7 +36,7 @@ class Mailer < ActionMailer::Base
     @author = forum.creator
     recipients = forum.creator.mail
     # cc = wiki_content.page.wiki.watcher_recipients - recipients
-
+    @issue_author_url = url_for(user_activities_url(@author))
     @forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
     mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
 
@@ -47,6 +47,8 @@ class Mailer < ActionMailer::Base
     redmine_headers 'Memo' => memo.id
     @forum = memo.forum
     @author = memo.author
+    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
+    @issue_author_url = url_for(user_activities_url(@author))
     recipients ||= []
     mems = memo.self_and_siblings
     mems.each do |mem|
@@ -69,7 +71,7 @@ class Mailer < ActionMailer::Base
     @mail = journals_for_message.at_user if journals_for_message.at_user
     @message = journals_for_message.notes
     @title = "#@user #{t(:label_leave_your_message, :locale => 'zh')}"
-
+    @issue_author_url = url_for(user_activities_url(@user))
     @url = case journals_for_message.jour.class.to_s.to_sym # 判断留言的对象所属类型
              when :Bid
                course_for_bid_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
@@ -289,6 +291,7 @@ class Mailer < ActionMailer::Base
     redmine_headers 'Project' => document.project.identifier
     @author = User.current
     @document = document
+    @issue_author_url = url_for(user_activities_url(@author))
     @document_url = url_for(:controller => 'documents', :action => 'show', :id => document)
     mail :to => document.recipients,
       :subject => "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
@@ -304,6 +307,7 @@ class Mailer < ActionMailer::Base
     added_to = ''
     added_to_url = ''
     @author = attachments.first.author
+    @issue_author_url = url_for(user_activities_url(@author))
     case container.class.name
       when 'Project'
         added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
@@ -356,6 +360,7 @@ class Mailer < ActionMailer::Base
     if news.project
       redmine_headers 'Project' => news.project.identifier
       @author = news.author
+      @issue_author_url = url_for(user_activities_url(@author))
       message_id news
       @news = news
       @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
@@ -364,6 +369,7 @@ class Mailer < ActionMailer::Base
     elsif  news.course
       redmine_headers 'Course' => news.course.id
       @author = news.author
+      @issue_author_url = url_for(user_activities_url(@author))
       message_id news
       @news = news
       recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
@@ -383,6 +389,7 @@ class Mailer < ActionMailer::Base
     if news.project
       redmine_headers 'Project' => news.project.identifier
       @author = comment.author
+      @issue_author_url = url_for(user_activities_url(@author))
       message_id comment
       @news = news
       @comment = comment
@@ -393,6 +400,7 @@ class Mailer < ActionMailer::Base
     elsif news.course
       redmine_headers 'Course' => news.course.id
       @author = comment.author
+      @issue_author_url = url_for(user_activities_url(@author))
       message_id comment
       @news = news
       @comment = comment
@@ -414,6 +422,7 @@ class Mailer < ActionMailer::Base
       redmine_headers 'Project' => message.project.identifier,
                       'Topic-Id' => (message.parent_id || message.id)
       @author = message.author
+      @issue_author_url = url_for(user_activities_url(@author))
       message_id message
       references message.parent unless message.parent.nil?
       recipients = message.recipients
@@ -427,6 +436,7 @@ class Mailer < ActionMailer::Base
       redmine_headers 'Course' => message.course.id,
                       'Topic-Id' => (message.parent_id || message.id)
       @author = message.author
+      @issue_author_url = url_for(user_activities_url(@author))
       message_id message
       references message.parent unless message.parent.nil?
       recipients = message.course.notified_users.select { |user| user.allowed_to?(:view_files, message.course) }.collect { |u| u.mail }

app/views/courses/_course_form.html.erb

@@ -29,7 +29,7 @@
     <%= l(:label_tags_course_name) %>
     <span class="required">*&nbsp;&nbsp;</span>
   </label>
-  <input id="course_name" type="text" value="<%= @course.name %>" style="width:490px;size:60;" name = "course[name]" maxlength="100">
+  <input id="course_name" type="text" value="<%= @course.name %>" style="width:490px; size:60;" name = "course[name]" maxlength="100">
 </p>
 
 <%= f.fields_for @course do |m| %>
@@ -38,7 +38,7 @@
             <table>
               <tr>
                 <td>
-                  <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px">
+                  <span class="info" align="right" style="width: 90px; font-weight: bold ; margin-left:19px">
                     <%= l(:label_class_period) %>
                     <span class="required"> *&nbsp;&nbsp;</span>
                   </span>
@@ -118,7 +118,7 @@
         </label>
         <input id="course_course_password" type="text" style="width:488px;margin-left: 10px;" value="<%= @course.password %>" size="60" name="course[password]"/>
       </p>
-      <em class="info" style="margin-left:95px;">
+      <em class="info" style="margin-left:95px; padding-left: 5px;">
         <%= l(:text_command) %>
       </em>
 <% end %>

app/views/courses/new.html.erb

@@ -6,7 +6,7 @@
 <%= labelled_form_for @course do |f| %>
     <div class="box tabular">
      <%= render :partial => 'course_form', :locals => { :f => f } %>
-      <span style="padding-left: 60px">
+      <span style="padding-left: 60px; margin-left: 36px">
         <%= submit_tag l(:button_create), :class => "enterprise"%>
       </span>
       <!-- <%#= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->

app/views/files/_attachement_list.html.erb

@@ -22,7 +22,7 @@
 </span>
 </div>
 
-<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="width:80px; height:26px;">上传文件</button>
+<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="width:20%; height:26%;"><%= l(:label_browse)%></button>
 <%= file_field_tag 'attachments[dummy][file]',
                    :id => '_file',
                    :class => 'file_selector',

app/views/files/_upload_show.html.erb

@@ -1,15 +1,15 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
   <div class="upload_con">
-    <h2>上传资源</h2>
+    <h2><%= l(:label_upload_files)%></h2>
     <div class="upload_box">
       <%= error_messages_for 'attachment' %>
-      <div id="network_issue" style="color: red; display: none;">上传出现错误，请您检查您的网络环境，并刷新页面重新上传。</div>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
       <%= form_tag(course_files_path(course), :multipart => true,:remote => true,:method => :post,:name=>"upload_form") do %>
-          <label style="margin-top:3px;">文件浏览：</label>
+          <label style="margin-top:3px;"><%= l(:label_file_upload)%></label>
           <%= render :partial => 'attachement_list',:locals => {:course => course} %>
           <div class="cl"></div>
-          <a id="submit_resource" href="javascript:void(0);" class="upload_btn" onclick="submit_resource();">确&nbsp;&nbsp;认</a>
-          <a href="javascript:void(0);" class="upload_btn upload_btn_grey" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+          <a id="submit_resource" href="javascript:void(0);" class="upload_btn" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+          <a href="javascript:void(0);" class="upload_btn upload_btn_grey" onclick="closeModal();"><%= l(:button_cancel)%></a>
       <% end %>
     </div>
 

app/views/mailer/forum_add.html.erb

@@ -1,4 +1,29 @@
-<h1><%= link_to(h(@forum.name), @forum_url) %></h1>
-<em><%=h @forum.creator.name %></em>
 
-<%= @forum.description.html_safe %>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= link_to(h("#{@forum.creator.login}(#{@forum.creator.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+
+     </span><%= l(:label_forum_new)%>
+  <%= link_to(h(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  </p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span>
+      <span style="float: left; width: 526px">  <%= link_to(h(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @forum.description.html_safe %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @forum_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+
+

app/views/mailer/forum_message_added.html.erb

@@ -1,4 +1,32 @@
-<h1><%= link_to(h(@memo.subject), @memo_url) %></h1>
-<em><%=h @memo.author.name %></em>
 
-<%= @memo.content.html_safe %>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= link_to(h("#{@author.login}(#{@author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue" style="color:#1b55a7;">
+    <%= link_to(h(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+
+  </span><%= l(:mail_issue_title_active)%></p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span>
+      <span style="float: left; width: 526px">  <%= link_to(h(@memo.subject), @memo_url,:style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span>
+      <%= link_to(h(@forum.name), @forum_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+    </li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @memo.content.html_safe %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @memo_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+
+

app/views/mailer/journals_for_message_add.html.erb

@@ -1,5 +1,25 @@
-<em>尊敬的用户，<%= @user %>给你留言了:</em>
-<div><%= @message %></div>
-<p>点击链接查看最新回复<%= link_to(@url, @url) %>
-&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%= link_to(l(:lable_not_receive_mail),"http://" + Setting.host_name + "/my/account")%></p>
+
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+
+        <%= link_to(h("#{@user.login}(#{@user.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+     </span>给你留言了
+  </p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @message %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
 

app/views/mailer/message_posted.html.erb

@@ -1,7 +1,8 @@
 
 <p>
       <span class="c_blue" style="color:#1b55a7;">
-        <%= h @message.author %>(<%= @message.author.show_name %>)
+          <%= link_to(h("#{@message.author.login}(#{@message.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+
      </span><%= l(:mail_issue_title_userin)%>
   <span class="c_blue" style="color:#1b55a7;">
      <% if @message.project %>
@@ -29,7 +30,7 @@
   </ul>
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
   <label  class="mail_reply">
-    <%= link_to(h(:mail_issue_reply), @message_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+    <%= link_to(l(:mail_issue_reply), @message_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
   </label>
   <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
 </div>

app/views/mailer/news_added.html.erb

@@ -1,4 +1,41 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-<em><%=h @news.author.name %></em>
 
-<%= textilizable(@news, :description, :only_path => false) %>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+
+        <%= link_to(h("#{@news.author.login}(#{@news.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue" style="color:#1b55a7;">
+     <% if @news.project %>
+      <%=h @news.project.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  <% elsif @news.course %>
+             <%=h @news.course.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+      <% end %>
+  </span><%= l(:mail_issue_title_active)%></p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span>
+      <span style="float: left; width: 526px">  <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span>
+      <% if @news.project %>
+          <span style="float: left; width: 526px"><%=h @news.project.name %></span>
+      <% elsif @news.course %>
+          <span style="float: left; width: 526px"><%=h @news.course.name %></span>
+      <% end %>
+    </li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @news.description %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @news_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+
+

app/views/mailer/news_comment_added.html.erb

@@ -1,5 +1,40 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
 
-<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
+<p>
+      <span class="c_blue" style="color:#1b55a7;">
+          <%= link_to(h("#{@comment.author.login}(#{@comment.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
+
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue" style="color:#1b55a7;">
+     <% if @news.project %>
+      <%=h @news.project.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+  <% elsif @news.course %>
+             <%=h @news.course.name %> : <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %>
+      <% end %>
+  </span><%= l(:mail_issue_title_active)%></p>
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_subject)%></strong></span>
+      <span style="float: left; width: 526px">  <%= link_to(h(@news.title), @news_url,:style=>'color:#1b55a7; font-weight:bold;') %></span></li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_sent_from)%></strong></span>
+      <% if @news.project %>
+          <span style="float: left; width: 526px"><%=h @news.project.name %></span>
+      <% elsif @news.course %>
+          <span style="float: left; width: 526px"><%=h @news.course.name %></span>
+      <% end %>
+    </li>
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<%= @news.description %>
+        </span>
+    </li>
+
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+    <%= link_to(l(:mail_issue_reply), @news_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  </label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+
 
-<%= textilizable @comment, :comments, :only_path => false %>

app/views/welcome/_search_course.html.erb

@@ -47,7 +47,7 @@ form #search_type{
 <%#完了把上面东西放到 .css 里%>
 </style>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-<div class="project-search" style="float: right; width: 260px">
+<div class="project-search" style="float: right">
 	<div class='search_widget'>
 		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27, style: "float:left"  %>
 		<%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %>

app/views/welcome/_search_project.html.erb

@@ -86,7 +86,7 @@ form #search_by
   }
 </script>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-<div class="project-search" style="float: right; width: 260px">
+<div class="project-search" style="float: right">
 	<div class='search_widget' >
 
 		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', style:"float:left" %>

config/application.rb

@@ -17,9 +17,9 @@ module RedmineApp
     # -- all .rb files in that directory are automatically loaded.
 
     # verifier if email is real
-    #EmailVerifier.config do |config|
-    #  config.verifier_email = "lizanle521@126.com"
-    #end
+    # EmailVerifier.config do |config|
+    #   config.verifier_email = "lizanle521@126.com"
+    # end
 
     config.generators do |g|
          g.test_framework :rspec,

config/locales/en.yml

@@ -249,7 +249,11 @@ en:
   mail_issue_attachments: "Attachments："
   mail_issue_reply: "Want reply"
   #end
-  
+  # modified by meng 
+  label_file_upload: Resource files
+  label_file_upload_error_messages: "Upload error, please check your network environment, and refresh the page to upload."
+  button_confirm: Confirm
+  # end 
   field_name: Name
   field_description: Description
   field_summary: Summary

config/locales/zh.yml

@@ -264,7 +264,11 @@ zh:
   mail_issue_attachments: "附件："
   mail_issue_reply: "我要回复"
   #end
-  
+  # modified by meng 
+  label_file_upload: 资源文件
+  label_file_upload_error_messages: "上传出现错误，请您检查您的网络环境，并刷新页面重新上传。"
+  button_confirm: 确认
+  # end 
   field_name: 名称
   #added by huang
   field_tea_name: 教师