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

app/controllers/poll_controller.rb

@@ -47,6 +47,7 @@ class PollController < ApplicationController
           :user_id => User.current.id,
           :published_at => Time.now,
           :closed_at => Time.now,
+          :show_result => 1,
           :polls_description => ""
       }
       @poll = Poll.create option
@@ -69,8 +70,8 @@ class PollController < ApplicationController
   end
 
   def update
-    @poll.polls_name = params[:polls_name].empty? ? l(:label_poll_title) : params[:polls_name]
+    @poll.polls_name = params[:polls_name]
-    @poll.polls_description = params[:polls_description].empty? ? l(:label_poll_description) : params[:polls_description]
+    @poll.polls_description = params[:polls_description]
     if @poll.save
       respond_to do |format|
         format.js

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/layouts/base_courses.html.erb

@@ -305,7 +305,7 @@
         .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
         .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
         .polls_btn a{ float:left;}
-        .polls_n{float: left;background: #ff5d31;color: #fff;width: 12px;padding-left: 2px;height: 7px;padding-bottom: 5px;padding-top: 3px;margin-top: -4px;margin-left: 3px; }
+        .polls_n{float: left;background: #ff5d31;color: #fff;width: 32px;padding-left: 2px;height: 7px;padding-bottom: 5px;padding-top: 3px;margin-top: -4px;margin-left: 3px; }
         .polls_n p{ margin-top:-4px;}
         .cl{ clear:both; overflow:hidden; }
     </style>
@@ -313,7 +313,7 @@
       <!--<a href="#">问卷调查<span >（12）</span></a>-->
       <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
       <div class="polls_n">
-        <p>N</p>
+        <p>NEW</p>
       </div>
       <div class="cl"></div>
     </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>
-<p>点击链接查看最新回复<%= link_to(@url, @url) %>
+      <span class="c_blue" style="color:#1b55a7;">
-&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%= link_to(l(:lable_not_receive_mail),"http://" + Setting.host_name + "/my/account")%></p>
+
+        <%= 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/poll/_edit_head.html.erb

@@ -7,7 +7,7 @@
         <textarea name="polls_description" maxlength="300" id="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+        <a class="btn_submit" data-button="ok" onclick="pollsSubmit($(this));">确定</a>
         <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">取消</a>
       </div>
       <div class="cl"></div>

app/views/poll/_poll.html.erb

@@ -34,7 +34,7 @@
 <li>
   <%if @is_teacher %>
     <% if poll.polls_status == 1 %>
-      <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>);">发布问卷</a>
+      <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>,<%= poll.polls_name.length %>);">发布问卷</a>
     <% elsif poll.polls_status == 2%>
       <a href="#" class="pollsbtn btn_de fl ml5" onclick="republish_poll(<%= poll.id%>);">取消发布</a>
     <% end%>

app/views/poll/_poll_form.html.erb

@@ -25,6 +25,10 @@
       }
       //问卷头
       function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+      function pollsSubmit(doc){
+          var title = $.trim($("#polls_title").val());
+          if(title.length == 0){alert("问卷标题不能为空");}else{doc.parent().parent().parent().submit();}
+      }
       function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
       //
       function pollQuestionCancel(question_id){
@@ -57,6 +61,12 @@
 
       function poll_submit()
       {
+          var title = $.trim($("#polls_name_h").html());
+          if(title.length == 0)
+          {
+              alert("问卷标题不能为空");
+          }
+          else{
               $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
               showModal('ajax-modal', '310px');
               $('#ajax-modal').css('height','115px');
@@ -67,6 +77,7 @@
               $('#ajax-modal').parent().css("top","").css("left","");
               $('#ajax-modal').parent().addClass("popbox_polls");
           }
+      }
   </script>
 </head>
 

app/views/poll/_show_head.html.erb

@@ -1,7 +1,7 @@
 <div class="ur_page_head ur_editor02"><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
   <h1 class="ur_page_title" id="polls_name_h">
-    <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
+    <%= poll.polls_name%>
   </h1>
   <p class="ur_prefix_content" id="polls_description_p">
     <%= @poll.polls_description%>

app/views/poll/index.html.erb

@@ -26,7 +26,13 @@
 
     function clickCanel(){hideModal("#popbox02");}
 
-    function poll_submit(poll_id)
+    function poll_submit(poll_id,poll_name)
+    {
+        if(poll_name == 0)
+        {
+            alert("问卷标题不能为空");
+        }
+        else
         {
             $('#ajax-modal').html("<div id='popbox02'>" +
                     "<div class='upload_con'>" +
@@ -49,6 +55,7 @@
             $('#ajax-modal').parent().css("top","").css("left","");
             $('#ajax-modal').parent().addClass("popbox_polls");
         }
+    }
 </script>
 <div class="polls_content" id="polls" style="width:677px;">
   <div class="polls_head">

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|
+    # EmailVerifier.config do |config|
-      config.verifier_email = "lizanle521@126.com"
+    #   config.verifier_email = "lizanle521@126.com"
-    end
+    # end
 
     config.generators do |g|
          g.test_framework :rspec,

config/locales/en.yml

@@ -345,7 +345,7 @@ en:
   field_identity_url: OpenID URL
   field_content: Content
   field_group_by: Group results by
-  field_sharing: Sharing
+  field_sharing: Sharinglable_hot_course
   field_parent_issue: Parent task
   field_member_of_group: "Assignee's group"
   field_assigned_to_role: "Assignee's role"
@@ -537,6 +537,70 @@ en:
   project_module_calendar: Calendar
   project_module_gantt: Gantt
   
+  #edit by meng
+  lable_hot_course: Hot projects
+  lable_hot_projects: Active courses
+  lable_user_active: User movements
+  lable_bar_active: Bar posts
+  label_project_score: Score
+  label_course_join_student: Join a course
+  label_join_project: Join a project
+  label_contest_modify_settings: Configuration
+  bale_news_notice: Add a notification
+  label_field_correct: correct input
+  label_work_description_lengthlimit: less than 500 characters
+  label_create_new_projects: Create a project
+  label_work_scores_people: The total number of users given scores
+  label_project_new_description: A project can be used to do anything that requires distributed collaboration
+  label_project_grade: Score
+  label_user_for_project_grade: Score
+  label_relation_files: Select an existing resource
+  
+  label_my_brief_introduction: How are feeling today? Leave your footprints ~
+  label_submit: Submit  
+  
+  label_tags_course_name: Course Title
+  label_new_course_password: Password
+  label_new_course_description: Description
+  field_open_student: Student list is public?
+  label_course_board: Forum
+  label_course_open_student_info: (Tick as "open list of students," if not open, the external person couldn't see the list of students)
+  label_teacher_list: Teacher list
+  label_student_list: Student list
+  label_export_excel: Export list
+  
+  label_course_organizers: Institute
+  label_poll: Questionnaire
+  
+  field_open_anonymous_evaluation: Use anonymous mutual-evaluation
+  field_evaluation_num: Number of anonymous works sent to each student
+  
+  label_edit_homework: Update homework
+  label_homework_list: Work list
+  
+  label_teacher_score: Teacher's score
+  label_time: Commit time
+  label_student_score: Student's score
+  label_without_score:  No evaluated 
+  label_homework_description: Description
+  label_responses: Messages
+  
+  lable_has_commit_homework: You have submitted your work
+  
+  
+  label_user_create_project_homework: created the task
+  label_commit_limit: Expired but can submit your work
+  
+  label_current_group: Current group
+  
+  project_module_dts: DTS Test tool
+  label_module_share: DTS Test tool
+  field_dts_test: DTS Test tool
+  
+  label_technical_support: Support ：
+  label_feedback: Feedback
+  #end
+
   label_user: User
   label_user_plural: Users
   label_user_new: New user
@@ -618,7 +682,7 @@ en:
   label_home: Home
   label_my_page: My page
   label_my_account: My account
-  label_my_message: My messages
+  label_my_message: Msgs
   label_my_projects: My projects
   label_my_page_block: My page block
   label_administration: Administration
@@ -1249,6 +1313,7 @@ en:
 
   #fq
   button_leave_meassge: Submit
+  button_clear_meassge: Reset
   label_leave_message_to: leave %{name} a message
   label_leave_message: Message content
   label_message: message board
@@ -1350,9 +1415,9 @@ en:
   label_leave_others_message: leave message to him/her
   label_leave_a_message: Leave him/her a message：
   label_leave_your_message: Leave a message to you
-  label_new_activities: ' has new activity in' # modified by bai
+  label_new_activities: ' has a new activity in' # modified by bai
-  label_new_activity: ' has new activity in'
+  label_new_activity: ' has a new activity in'
-  label_i_new_activity: ' have new activity in'
+  label_i_new_activity: ' have a new activity in'
   label_create_project: had participated in
   label_praise: praise
   label_cancel_praise: cancel praise
@@ -1631,7 +1696,7 @@ en:
   label_bids_form_contest_new_description: Enterprise or college can release a contest here.
   label_contest_name: Input the name of the contest
   label_contest_description: Content：description your contest
-  label_main_teacher: Main teacher
+  label_main_teacher: Lecturer
   label_main_term: Term
   label_teacher_work_unit: Position
   label_course_overview: Status
@@ -1698,7 +1763,7 @@ en:
   label_reply_empty: Reply Cann't Empty.
   label_setup_time: Start date
   label_endup_time: Over date
-  label_class_period: Class hour
+  label_class_period: Lessons
   label_class_hour: period
   label_activity_time: publish date
 

db/migrate/20150123020615_add_show_result.rb

@@ -0,0 +1,9 @@
+class AddShowResult < ActiveRecord::Migration
+  def up
+    add_column :polls, :show_result, :integer, default: 1
+  end
+
+  def down
+    remove_column :polls, :show_result
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150121030451) do
+ActiveRecord::Schema.define(:version => 20150123020615) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,18 +23,6 @@ ActiveRecord::Schema.define(:version => 20150121030451) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -847,6 +835,7 @@ ActiveRecord::Schema.define(:version => 20150121030451) do
     t.datetime "created_at",                       :null => false
     t.datetime "updated_at",                       :null => false
     t.text     "polls_description"
+    t.integer  "show_result",       :default => 1
   end
 
   create_table "praise_tread_caches", :force => true do |t|