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

2015-01-22 16:32:53 +08:00 · 2015-01-22 16:32:53 +08:00 · 24dfeb1614
parent 432e3a05f2 0c0160ac2b
commit 24dfeb1614
27 changed files with 184 additions and 104 deletions
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@ -40,7 +40,7 @@ class PollController < ApplicationController
  def new
    if @course
      option = {
-          :polls_name => l(:label_poll_new),
+          :polls_name => "",
          :polls_type => @course.class.to_s,
          :polls_group_id => @course.id,
          :polls_status => 1,
@ -187,7 +187,13 @@ class PollController < ApplicationController
    @poll.polls_status = 2
    @poll.published_at = Time.now
    if @poll.save
-      redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
+      if params[:is_remote]
+        redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
+      else
+        respond_to do |format|
+          format.js
+        end
+      end
    end
  end

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -558,6 +558,11 @@ class ProjectsController < ApplicationController

  # Show @project
  def show
+    if(@project && !@project.is_public && !User.current.member_of?(@project))
+      render_403
+      return
+    end
+
    @project_type = params[:project_type]
    
    # try to redirect to the requested menu item
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@ -56,7 +56,7 @@
 </script>
 <%= stylesheet_link_tag  'course_group', :media => 'all' %>
 <script type="text/javascript" src="javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js"></script>
-<div class="st_list">
+<div class="st_list" id="member_of_course">
  <div class="st_search" style="margin-left: 14px" >
    <span class="f_l"><%= @subPage_title %></span>
        <span id = "search_members">
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@ -11,7 +11,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ ma
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
+.cl{ clear:both; overflow:hidden; margin-top: 30px;}
 a{ text-decoration:none; }
 a:hover{ text-decoration:underline; }
 .mail_box,ul,li{ list-style-type:none}
@ -35,7 +35,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
 <div class="container">
 	<div class="mail">
    	<div class="mail_head">
-        	<p>亲爱的Trustie用户，您好！</p>
+        	<p><%= l(:mail_issue_greetings)%></p>
        </div><!--mail_head end-->
        <%= yield %>
        <hr />
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@ -2,19 +2,19 @@
 <p>
      <span class="c_blue">
        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     </span>在
-  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span></span><%= l(:mail_issue_title_active)%></p>
 <div class="mail_box">
 <ul>
-	<li style="list-style-type:none"><span style="float: left"><strong>标题：</strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目<%= issue.tracker.name%></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong >内容：</strong></span><span style="float: left; width: 500px">
+	<li style="list-style-type:none"><span style="float: left"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong ><%= l(:mail_issue_content)%></strong></span><span style="float: left; width: 500px">
                    	<%= issue.description %></span>
    </li>
  <li style="list-style-type:none">

    <% unless @issue.attachments.nil? %>
-     <span style="float: left"> <strong>附件：</strong>
+     <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong>
            </span><span style="float: left; width: 500px">
          <% @issue.attachments.each do |attach| %>
          <p><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %></p>
@ -25,7 +25,7 @@
  </li>
 </ul>
  <div class="cl"></div>
-  <label  class="mail_reply"><%= link_to( "我要回复", issue_url,  :class => "mail_reply") %></label>
+  <label  class="mail_reply"><%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply") %></label>
  <div class="cl"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@ -1,13 +1,13 @@

        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     在
- <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！
-标题：<%= link_to(issue.subject, issue_url) %>
-  来源：<%= issue.project.name %>|&nbsp;项目缺陷<
- 内容：
+     <%= l(:mail_issue_title_userin)%>
+ <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>
+<%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>
+<%= l(:mail_issue_sent_from)%>|&nbsp;<%= l(:mail_issue_from_project)%>
+<%= l(:mail_issue_content)%>
     <%= issue.description %>
        <% unless @issue.attachments.nil? %>
- 附件：
+<%= l(:mail_issue_attachments)%>


            <% @issue.attachments.each do |attach| %>
@ -16,4 +16,4 @@
        <% end %>


- <%= link_to( "我要回复", issue_url) %>
+ <%= link_to( l(:mail_issue_reply), issue_url) %>
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@ -5,5 +5,5 @@


 </div>
-<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>

--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@ -1,3 +1,3 @@

 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<%= link_to("退订该邮件？", @user_url)  %>
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@ -1,15 +1,19 @@
-<%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
+<div>
+  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>

-<ul>
-<% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
+  <ul>
+    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
      <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
        <li><%= string %></li>
-  <% end %>
-<% end %>
-</ul>
+      <% end %>
+    <% end %>
+  </ul>
+
+  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
+</div>
+<div class="cl"></div>
+<hr/>

-<span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
-<hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>

--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@ -10,7 +10,7 @@
    <%= l(:field_content)%>：<%= @journal.notes %>

 <% end -%>
----------------------------------------
+--------------------------------------------------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>

-<%= link_to("退订该邮件？", @user_url)  %>
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@ -123,10 +123,10 @@
      <br/>
    </p>

-    <p style="width:400px;padding-left: 50px;">
-      <label style="margin-right: 1px;">
-        <%= l(:label_identity) %><span style="color: #bb0000;"> *</span></label>
-      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: 0px;">
+    <p style="width:400px;padding-left: 53px;">
+      <label for="userIdentity">
+        <%= l(:label_identity) %><span class="required"> *</span></label>
+      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: -4px;">
        <option value="">
          <%= l(:label_account_identity_choose) %>
        </option>
@ -187,19 +187,19 @@
      <!-- added by bai  增加账户里的性别-->
        <span id='gender' style='display:none'>
        <% if @user.user_extensions.nil? %>
-            <p style="width:400px;padding-left: 52px;">
-              <%= l(:label_gender) %>&nbsp;&nbsp;
+            <p style="width:400px;padding-left: 53px;">
+              <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
              <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
            </p>
        <% else %>
            <% if @user.user_extensions.gender == 0 %><!-- label_gender_male -->
-              <p style="width:400px;padding-left: 52px;">
-                <%= l(:label_gender) %>&nbsp;&nbsp;
+              <p style="width:400px;padding-left: 53px;">
+                <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
              </p>
            <% else %>
                <p style="width:400px;padding-left: 54px;">
-                  <%= l(:label_gender) %>&nbsp;&nbsp;
+                  <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                  <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
                </p>
            <% end %>
@ -212,9 +212,9 @@


      <!-- added by Wen -->
-      <p id="occupation_detail" style="padding-left: 24px; display: none">
+      <p id="occupation_detail" style="padding-left: 25px; display: none">

-            <%= l(:field_occupation) %>
+            <label for="occupation_name"><%= l(:field_occupation) %></label>
            <span class="required">&nbsp;</span>
        <% if User.current.user_extensions.nil? %>
            <input id="province" name="province" style="display: none" type="text" value="请单击选择省份及学校" readonly>
@ -318,7 +318,7 @@
          });
      </script>

-      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;"><%= l(:label_location) %></label>
+      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;" for="userProvince"><%= l(:label_location) %></label>
        <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
          <option value="">--请选择省份--</option>
          <option value="北京">北京</option>
@ -382,7 +382,7 @@
      <legend onclick="toggleFieldset(this);">
        <%= l(:field_mail_notification) %>
      </legend>
-      <div style="padding-left: 8px;"> <!-- modified by ming -->
+      <div style="padding-left: 3px;"> <!-- modified by ming -->
        <p style="width:380px;">
          <%= render :partial => 'users/mail_notifications' %>
        </p></div>
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@ -18,7 +18,7 @@
  <div class="ur_editor checkbox">
    <div class="ur_editor_title">
      <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-      <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+      <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多选题标题" value="<%= poll_question.question_title%>"/>
      <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
      <label>必答</label>
    </div>
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@ -3,7 +3,7 @@
    <div class="ur_editor_title">
      <label>问题：&nbsp;&nbsp;</label>
      <input type="hidden" name="question_type" value="2"/>
-      <input maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题标题"/>
+      <input maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题标题"/>
      <input type="checkbox" name="is_necessary" value="true" checked/>
      <label>必答</label>
    </div>
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@ -1,23 +1,44 @@
+<% has_commit = has_commit_poll?(poll.id ,User.current)%>
 <li title="<%= poll.polls_name %>">
  <% if @is_teacher %>
-      <% if has_commit_poll?(poll.id ,User.current) %>
-          <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+      <% if has_commit %>
+          <sapn class="polls_title fl">
+            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
+          </sapn>
      <% else %>
-          <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
      <% end %>
  <% else %>
-      <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
-          <sapn class="polls_title fl" >
-            <%= poll.polls_name %>
+      <% if has_commit && poll.polls_status == 2 %>
+          <sapn class="polls_title fl" style="max-width: 500px;">
+            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %>
          </sapn>
-      <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
-          <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+      <% elsif !has_commit && poll.polls_status == 2 %>
+          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
      <% end %>
  <% end %>
 </li>
+<% if !@is_teacher && has_commit && poll.polls_status == 2%>
+    <li class="pollsbtn_tip fl ml5">已答</li>
+<% end %>
+
+<%if @is_teacher%>
+    <% if poll.polls_status == 1 %>
+        <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
+    <% elsif poll.polls_status == 2%>
+        <li>
+          <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+        </li>
+    <% end%>
+<% end%>
+
 <li>
-  <%if @is_teacher && poll.polls_status == 2%>
-      <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+  <%if @is_teacher %>
+    <% if poll.polls_status == 1 %>
+      <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>);">发布问卷</a>
+    <% elsif poll.polls_status == 2%>
+      <a href="#" class="pollsbtn btn_de fl ml5" onclick="republish_poll(<%= poll.id%>);">取消发布</a>
+    <% end%>
  <% end%>
 </li>
 <li>
@ -28,18 +49,21 @@
  <% end%>
 </li>
 <li>
-  <% if @is_teacher && poll.polls_status == 1%>
-      <!--新建状态的问卷可编辑-->
-      <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+  <% if @is_teacher%>
+      <% if poll.polls_status == 1 %>
+          <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+      <% elsif poll.polls_status == 2%>
+        <li class="polls_de_grey fr ml20">编辑</li>
+      <% end%>
  <% end%>
 </li>
-<li>
-  <% if @is_teacher && poll.polls_status == 2%>
-    <a class="polls_de fr ml20" onclick="republish_poll(<%= poll.id%>);">
-      取消发布
-    </a>
-  <% end %>
-</li>
-<li class="polls_date fr">
+<!--<li>-->
+  <!--<% if @is_teacher && poll.polls_status == 2%>-->
+    <!--<a class="polls_de fr ml20" onclick="republish_poll(<%= poll.id%>);">-->
+      <!--取消发布-->
+    <!--</a>-->
+  <!--<% end %>-->
+<!--</li>-->
+<li class="polls_date fr mr10">
  <%= format_time poll.created_at%>
 </li>
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@ -57,7 +57,7 @@

      function poll_submit()
      {
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>');
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
          showModal('ajax-modal', '310px');
          $('#ajax-modal').css('height','110px');
          $('#ajax-modal').siblings().remove();
--- a/app/views/poll/_poll_republish.html.erb
+++ b/app/views/poll/_poll_republish.html.erb
@ -2,18 +2,6 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <script type="text/javascript">
-      function clickPublishPoll()
-      {
-          hideModal("#popbox02");
-          $.ajax({
-              type: "GET",
-              url: "<%= publish_poll_poll_path(poll.id)%>",
-              data: 'text',
-              success: function (data) {
-
-              }
-          });
-      }
      function clickCanel(){hideModal("#popbox02");}
  </script>
 </head>
--- a/app/views/poll/_poll_submit.html.erb
+++ b/app/views/poll/_poll_submit.html.erb
@ -2,18 +2,6 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <script type="text/javascript">
-      function clickPublishPoll()
-      {
-          hideModal("#popbox02");
-          $.ajax({
-              type: "GET",
-              url: "<%= publish_poll_poll_path(poll.id)%>",
-              data: 'text',
-              success: function (data) {
-
-              }
-          });
-      }
      function clickCanel(){hideModal("#popbox02");}
  </script>
 </head>
@ -27,16 +15,14 @@
        是否确定发布该问卷？
      </p>
      <div class="polls_btn_box">
-        <%= link_to "确    定",publish_poll_poll_path(poll.id), :class => "upload_btn", :onclick => "clickCanel();" %>
+        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote), :class => "upload_btn", :onclick => "clickCanel();" %>
        <a class="upload_btn upload_btn_grey" onclick="clickCanel();">
          取&nbsp;&nbsp;消
        </a>
      </div>
      <div class="cl"></div>
    </div>
-
  </div>
-
 </div>
 </body>
 </html>
--- a/app/views/poll/_show_head.html.erb
+++ b/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%>
+    <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
  </h1>
  <p class="ur_prefix_content" id="polls_description_p">
    <%= @poll.polls_description%>
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@ -25,6 +25,30 @@
    }

    function clickCanel(){hideModal("#popbox02");}
+
+    function poll_submit(poll_id)
+    {
+        $('#ajax-modal').html("<div id='popbox02'>" +
+            "<div class='upload_con'>" +
+                "<div class='upload_box'>" +
+                    "<p class='polls_box_p'>问卷发布后将不能对问卷进行修改，<br />是否确定发布该问卷？</p>" +
+                    "<div class='polls_btn_box'>" +
+                        "<a href='/poll/"+ poll_id +"/publish_poll' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                        "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                    "</div>" +
+                    "<div class='cl'></div>" +
+                "</div>" +
+            "</div>" +
+        "</div>");
+        showModal('ajax-modal', '310px');
+        $('#ajax-modal').css('height','110px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').parent().removeClass("alert_praise");
+        $('#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">
--- a/app/views/poll/publish_poll.js.erb
+++ b/app/views/poll/publish_poll.js.erb
@ -0,0 +1,2 @@
+$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
+alert("发布成功");
--- a/app/views/poll/republish_poll.js.erb
+++ b/app/views/poll/republish_poll.js.erb
@ -1 +1,2 @@
 $("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
+alert("取消成功");
--- a/app/views/users/_mail_notifications.html.erb
+++ b/app/views/users/_mail_notifications.html.erb
@ -1,5 +1,5 @@
 <p>
-<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" %>
+<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" , :style=> 'margin-right: 5px;'%>
 <%= select_tag(
      'user[mail_notification]',
      options_for_select(
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -236,6 +236,20 @@ en:
  mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
  mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "Dear user , Greetings from Trustie"
+  mail_issue_footer: "Unsubscribe this message?"
+  mail_issue_title_userin: "in"
+  mail_issue_title_active: "has a new activity which relevants to you , please pay more attention to this!"
+  mail_issue_subject: "Title："
+  mail_issue_content: "Content："
+  mail_issue_sent_from: "From："
+  mail_issue_from_project: "project issue"
+  mail_issue_attachments: "Attachments："
+  mail_issue_reply: "Want reply"
+  #end
+  
  field_name: Name
  field_description: Description
  field_summary: Summary
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -250,6 +250,21 @@ zh:
  mail_body_wiki_content_added: "'%{id}' wiki页面已由 %{author} 添加。"
  mail_subject_wiki_content_updated: "'%{id}' wiki页面已更新。"
  mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
+  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "亲爱的Trustie用户，您好！"
+  mail_issue_footer: "退订该邮件！"
+  mail_issue_title_userin: "在"
+  mail_issue_title_active: "中有了一个与您相关的最新活动，请您关注！"
+  mail_issue_subject: "标题："
+  mail_issue_content: "内容："
+  mail_issue_sent_from: "来源："
+  mail_issue_from_project: "项目问题跟踪"
+  mail_issue_attachments: "附件："
+  mail_issue_reply: "我要回复"
+  #end
+  
  field_name: 名称
  #added by huang
  field_tea_name: 教师
--- a/public/stylesheets/course_group.css
+++ b/public/stylesheets/course_group.css
@ -1,4 +1,4 @@
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+#member_of_course{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea,form{ margin:0; padding:0;}
 div,img,tr,td,textarea,form{ border:0;}
 table,tr,td{border:0; cellspacing:0; cellpadding:0;}
--- a/public/stylesheets/images/icons.png
+++ b/public/stylesheets/images/icons.png
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@ -19,15 +19,15 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}

 /*问卷列表*/
-.polls_content{ width:615px;}
+.polls_content{ width:615px;padding-left: 6px;}
 .polls_head{ width:677px; height:48px; background:#eaeaea;}
 .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
 .polls_head span{ font-weight:normal; color:#15bccf;}
 a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
 a:hover.newbtn{ background:#55a1b9; text-decoration:none;}
 .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
-a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
+a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
+.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;}
 a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}
 .polls_date{  color:#666666;}
@ -134,3 +134,14 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .upload_con a:hover{ text-decoration:none;}
 .polls_btn_box{ width:145px; margin:0 auto; padding-left:10px;}
 .polls_btn_box02{ width:80px; margin:0 auto; padding-left:10px;}
+
+/***新增20150120***/
+.pollsbtn_tip{ width:30px; height:17px; display:block;background:url(images/icons.png) 0 -372px  no-repeat;padding-left:7px; color:#fff;}
+a.btn_de{ border:1px solid #ff5d31; color:#ff5d31; }
+a:hover.btn_de{ background:#ff5d31;}
+a.btn_pu{ border:1px solid #3cb761; color:#3cb761; }
+a:hover.btn_pu{ background:#3cb761;}
+.pollsbtn_grey{ border:1px solid #b1b1b1; color:#b1b1b1; padding:0px 9px; }
+.polls_title_w { width:330px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.polls_de_grey{ color:#b1b1b1;}
+.ml5{ margin-left:5px;}