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

app/controllers/issues_controller.rb

@@ -113,12 +113,8 @@ class IssuesController < ApplicationController
 
   def show
     # 当前用户查看指派给他的缺陷消息，则设置消息为已读
-    query = @issue.forge_messages
-    query.each do |m|
-      if m.user_id == User.current.id
-        m.update_attribute(:viewed, true)
-      end
-    end
+    query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
+    query.update_attribute(:viewed, true) unless query.nil?
     # 缺陷状态更新
     query_journals = @issue.journals
       query_journals.each do |query_journal|

app/controllers/projects_controller.rb

@@ -382,7 +382,10 @@ class ProjectsController < ApplicationController
         end
       else
         email = params[:mail]
-        Mailer.send_invite_in_project(email, @project, User.current).deliver
+        first_name = params[:first_name]
+        last_name = params[:last_name]
+        gender = params[:gender]
+        Mailer.send_invite_in_project(email, @project, User.current, first_name, last_name, gender).deliver
         @is_zhuce = false
         flash[:notice] = l(:notice_email_sent, :value => email)
       end
@@ -656,15 +659,11 @@ class ProjectsController < ApplicationController
   # Delete @project
   def destroy
     @project_to_destroy = @project
-    if api_request? || params[:confirm]
     @project_to_destroy.destroy
     respond_to do |format|
       format.html { redirect_to admin_projects_url }
       format.api  { render_api_ok }
     end
-    else
-      render :layout => "base_projects"
-    end
     # hide project in layout
     @project = nil
   end

app/controllers/tags_controller.rb

@@ -244,13 +244,18 @@ class TagsController < ApplicationController
     @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type) unless @taggable_id.blank?
     @obj = get_object(@taggable_id,params[:taggableType]) unless @taggable_id.blank?
     if  @taggable_id.blank? #如果没有传tag_id，那么直接更新tag_name就好了。但是要防止 重命名后的tag存在。
-      #看重命名后的tag是否存在。如果存在的话，只需要更改taggings里边的id,
-      if @rename_tag
-        @taggings = ActsAsTaggableOn::Tagging.where(" `taggings`.`tag_id` = #{ @tag_id} AND `taggings`.`taggable_type` = 'Attachment' ")#find_by_tag_id_and_taggable_type(@tag_id,@taggable_type)
-        @taggings.each { |t| t.update_attributes({:tag_id=> @rename_tag.id}) if t.tag_id != @rename_tag.id }
-        ActsAsTaggableOn::Tag.find(@tag_id).update_attributes(:name=>@rename_tag_name)#并且将该tag改名
-      else #如果不存在，那么就直接更新该tag名称为新的名称
-        (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).update_attributes(:name=>@rename_tag_name)
+      if @course_id
+        course = Course.find @course_id
+        if course
+          course.attachments.each do |attachment|
+            taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,attachment.id,attachment.class)
+            if taggings
+              taggings.delete
+              attachment.tag_list.add(@rename_tag_name.split(","))
+              attachment.save
+            end
+          end
+        end
       end
     else
       if(@rename_tag.nil?) #这次命名的是新的tag

app/controllers/users_controller.rb

@@ -112,7 +112,7 @@ class UsersController < ApplicationController
     case params[:type]
       when nil
         @message_alls = []
-        messages = MessageAll.where("user_id =?" ,@user).order("created_at desc")
+        messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user, "SystemMessage", "SystemMessage").order("created_at desc")
         messages.each do |message_all|
           @message_alls << message_all.message
         end
@@ -187,12 +187,8 @@ class UsersController < ApplicationController
       message_new_time.onclick_time = Time.now
       message_new_time.save
     else
-      # 24小时内显示
-      contrast_time = Time.now - 86400
       message_time.update_attributes(:onclick_time => Time.now)
     end
-    # 24小时内显示系统消息
-    @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc")
   end
 
   # 消息设置为已读

app/models/mailer.rb

@@ -107,7 +107,7 @@ class Mailer < ActionMailer::Base
   # author: alan
   # 邀请未注册用户加入项目
   # 功能： 在加入项目的同时自动注册用户
-  def send_invite_in_project(email, project, invitor)
+  def send_invite_in_project(email, project, invitor, first_name, last_name, gender)
     @email = email
     @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
     @password = newpass(6)
@@ -116,7 +116,7 @@ class Mailer < ActionMailer::Base
     login = login.sub(/%40/,'@')
     us = UsersService.new
     # 自动激活用户
-    user = us.register_auto(login, email, @password)
+    user = us.register_auto(login, email, @password, first_name, last_name, gender)
     InviteList.create(:user_id => user.id, :project_id => project.id, :mail =>email)
     User.current = user unless User.current.nil?
     @user = user

app/models/system_message.rb

@@ -5,4 +5,15 @@ class SystemMessage < ActiveRecord::Base
   validates :subject, presence: true
   # validates :description, presence: true
   validates_length_of :description, maximum: 10000
+
+  has_many :message_alls, :class_name => 'MessageAll',:as =>:message,  :dependent => :destroy
+
+  # 系统消息放置总消息列表
+  after_create :add_system_message
+
+  def add_system_message
+    if MessageAll.where("message_type = '#{self.class.to_s}' and message_id = '#{self.id}'").first.nil?
+      self.message_alls << MessageAll.new(:user_id => self.user_id)
+    end
+  end
 end

app/services/users_service.rb

@@ -47,12 +47,16 @@ class UsersService
   end
 
   # 自动注册功能 FOR：邮件邀请
-  def register_auto(login,mail,password)
+  def register_auto(login, mail, password, first_name, last_name, gender)
+    mail_notification = "day"
     @user = User.new
     @user.admin = false
     @user.register
     @user.login = login
     @user.mail = mail
+    @user.firstname = first_name
+    @user.lastname = last_name
+    @user.mail_notification = mail_notification
     password_confirmation = password
     should_confirmation_password = true
     if !password.blank? && !password_confirmation.blank? && should_confirmation_password
@@ -65,6 +69,7 @@ class UsersService
     @user = automatically_register_lock(@user)
     if @user.id != nil
       ue = @user.user_extensions ||= UserExtensions.new
+      ue.gender = gender
       ue.user_id = @user.id
       ue.save
     end

app/views/admin/projects.html.erb

@@ -65,7 +65,7 @@
             <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
             <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
             <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
-            <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
+            <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del', :onClick=>"delcfm()" ) %>
           </td>
         </tr>
     <% end %>
@@ -74,3 +74,11 @@
 </div>
 
 <% html_title(l(:label_project_plural)) -%>
+
+<script>
+    function delcfm() {
+        if (!confirm("删除项目会一并删除项目的关联信息，确认要删除吗？")) {
+            window.event.returnValue = false;
+        }
+    }
+</script>

app/views/files/_course_list.html.erb

@@ -55,6 +55,7 @@
             </div>
             <div class="cl"></div>
             <div class="tag_h">
+              <!-- container_type = 1 代表是课程里的资源 -->
               <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
               <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
             </div>

app/views/files/_project_file_list.html.erb

@@ -44,6 +44,7 @@
         </div>
         <div class="cl"></div>
         <div class="tag_h">
+          <!-- container_type = 2 代表是项目里的资源 -->
           <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
           <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
         </div>

app/views/files/_tag_yun.html.erb

@@ -6,12 +6,12 @@
     <% tag_list.each do |k,v|%>
         <% if tag_name && tag_name == k%>
             <!-- 鼠标不能移动是因为 href="javascript:void(0);"导致的 -->
-            <span>    <a  class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
+            <span>    <a  class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>(<%= v%>)</a></span>
         <% else%>
         <span class="files_tag_icon" >
           <a  title="双击可编辑"
               onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"
-              ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
+              ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>(<%= v%>)</a></span>
         <% end%>
     <% end%>
 <% end%>

app/views/files/index.html.erb

@@ -251,31 +251,58 @@
         $("#renameTagName").focus();
     }
   //监听所有的单击事件
-   $(document.body).click(function(e){
-       isdb = false; //这是单击
-       node = document.elementFromPoint(e.clientX, e.clientY);
-       if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
-           isdb = true; //为了防止在编辑的时候又去单击其他tag去过滤。导致tag过滤不可用
-           return;
+    $(function(){
+        $("#renameTagName").live("blur",function(){
+            updateTagName();
+        }).live("keypress",function(e){
+            if (e.keyCode == '13') {
+                updateTagName();
             }
-           if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
-               if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
+        });
+    });
+
+    //执行修改TAGName方法
+    function updateTagName(){
+        if(isdb){
+            isdb = false;
+            if($("#renameTagName").val() == tagName){ //如果值一样，则恢复原来的状态
                 ele.parent().css("border","");
                 ele.parent().html(tagNameHtml);
 
-               }else{ //否则就要更新tag名称了
-//                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){  去掉询问
+            }
+            else{
                 $.post(
                         '<%= update_tag_name_path %>',
                         {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
-                          )
-//                   }else{
+                );
+            }
+        }
+    }
+//   $(document.body).click(function(e){
+//       isdb = false; //这是单击
+//       node = document.elementFromPoint(e.clientX, e.clientY);
+//       if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+//           isdb = true; //为了防止在编辑的时候又去单击其他tag去过滤。导致tag过滤不可用
+//           return;
+//       }
+//           if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+//               if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
 //                   ele.parent().css("border","");
 //                   ele.parent().html(tagNameHtml);
+//
+//               }else{ //否则就要更新tag名称了
+////                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){  去掉询问
+//                          $.post(
+//                                    '<%= update_tag_name_path %>',
+//                                    {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
+//                          )
+////                   }else{
+////                       ele.parent().css("border","");
+////                       ele.parent().html(tagNameHtml);
+////                   }
 //               }
-               }
-           }
-   });
+//           }
+//   });
    <%end %>
 
 </script>

app/views/forums/_show_topics.html.erb

@@ -21,6 +21,7 @@
             <div class="postDetailReply">
               <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>
               <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
+              <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10 mt20" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
             </div>
             <div class="cl"></div>
           </div>

app/views/layouts/_logined_header.html.erb

@@ -112,7 +112,7 @@
         $("#navHomepageSearchType").hide();
     });
 
-    $("#user_avatar img").mouseenter(function(){
+    $("#navHomepageProfile").mouseenter(function(){
         $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
         $("#topnav_login_list").show();
     });

app/views/projects/invite_members_by_mail.html.erb

@@ -44,9 +44,39 @@
 
     }
 
+    function verifyLastName() {
+        var last_name = $.trim($('#last_name').val());
+        if(last_name.length > 30)
+        {
+            $("#valid_email").text("用户姓氏过长,最长为30个字符");
+            return false;
+        }
+        else
+        {
+            $("#valid_email").text("");
+            return true;
+        }
+
+    }
+
+    function verifyFirstName() {
+        var first_name = $.trim($('#first_name').val());
+        if(first_name.length > 30)
+        {
+            $("#valid_email").text("用户名字过长,最长为30个字符");
+            return false;
+        }
+        else
+        {
+            $("#valid_email").text("");
+            return true;
+        }
+
+    }
+
     function senderEmail(obj)
     {
-        if(verifyAddress())
+        if(verifyAddress() && verifyFirstName()  && verifyLastName() )
         {
             obj.parent().submit();
         }
@@ -79,6 +109,15 @@
         <li>
           <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "this.value=this.value.replace(' ','')", :style => "ime-mode:disabled;", :onblur => "verifyAddress(this);" %>
         </li>
+        <li>
+          <%= text_field_tag 'last_name',  '', :class => "fb_item_first_name fl", :placeholder => l(:label_input_email_lastname), :onkeyup => "this.value=this.value.replace(' ','')", :onblur => "verifyLastName(this);" %>
+        </li>
+        <li>
+          <%= text_field_tag 'first_name',  '', :class => "fb_item_last_name fl", :placeholder => l(:label_input_email_firstname), :onkeyup => "this.value=this.value.replace(' ','')", :onblur => "verifyFirstName(this);" %>
+        </li>
+        <li>
+          <select class="fb_item_gender fl"  id="gender" name="gender"><option value="">性别</option><option value="0">男</option><option value="1">女</option></select>
+        </li>
       </ul>
       <div class="cl"></div>
       <a href="#" class="btn_free" onclick="senderEmail($(this));">

app/views/projects/settings/_new_members.html.erb

@@ -46,7 +46,7 @@
                     ) do |f| %>
               <% roles.each do |role| %>
                 <ul style="text-align: left;" >
-                  <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
+                  <%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
                  <!--编辑时候显示成员，中英文切换后面需从数据库的角度优化-->
                   <% if User.current.language == "zh" %>
@@ -64,11 +64,11 @@
                 <!--<br/>-->
               <% end %>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
-                    <div>
-                      <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
+                    <div class="pt5">
+                      <a href="javascript:void(0)" class="project_member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
                         <%= l(:button_change)%>
                       </a>
-                      <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)">
+                      <a href="javascript:void(0)" class="project_member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)">
                         <%= l(:button_cancel)%>
                       </a>
                     </div>
@@ -138,7 +138,7 @@
               </li>
               <% roles.each do |role| %>
                   <li>
-                    <%= check_box_tag 'membership[role_ids][]', role.id %>
+                    <%= radio_button_tag 'membership[role_ids][]', role.id %>
                     <% if User.current.language == "zh" %>
                         <% if role.id == 3 %>
                             <label >管理人员</label>
@@ -154,7 +154,7 @@
               <% end %>
             </ul>
             <div class="cl mb10"></div>
-            <a href="javascript:void(0)" class="member_btn" onclick="$(this).parent().parent().submit();">
+            <a href="javascript:void(0)" class="project_member_btn_right" onclick="$(this).parent().parent().submit();">
               新增成员
             </a>
           </div>

app/views/tags/_tag_list.html.erb

@@ -2,8 +2,8 @@
 
 <% if @tags.size > 0 %>
     <% @tags.each do |tag| %>
-	<span class="re_tag f_l" style="cursor: pointer" > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
-      <a title="双击可编辑" ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
+	<span class="re_tag f_l" style="cursor:<%= obj.container_type == 'Course' ? 'pointer' :'default' %> " > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
+      <a title="<%= obj.container_type == 'Course' ? '双击可编辑' : '' %> " ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
 	    <% when '10' %>

app/views/users/_project_issue.html.erb

@@ -10,7 +10,7 @@
         <% else %>
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>  TO
-        <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_issues_path(activity.project), :class => "newsBlue ml15"%>
+        <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
       <div class="homepagePostTitle break_word">
         <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>

app/views/users/_user_message_course.html.erb

@@ -191,8 +191,10 @@
           <div style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，作业详情如下：
+              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败，
+              失败原因：提交作品的人数低于2人
             </p>
+            <p>作业详情如下：</p>
             <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
             <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
           </div>

app/views/users/_user_message_system.html.erb

@@ -0,0 +1,30 @@
+<% if ma.class == SystemMessage %>
+    <%# @user_system_messages.each do |usm| %>
+        <ul class="homepageNewsList fl">
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
+          </li>
+          <span style="color: red;float: left">【系统消息】</span>
+          <li class="homepageSystenMessageContent fl">
+
+            <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current),
+                        :id => "content_link_#{ma.id}",
+                        :onmouseover =>"message_titile_show($(this),event);",
+                        :onmouseout => "message_titile_hide($(this));"
+            %>
+          </li>
+          <div style="display:none;" class="message_title_red system_message_style">
+            <% unless ma.subject.blank? %>
+                <p><strong>标题：</strong><%= ma.subject %></p>
+            <% end %>
+            <% if (!ma.description.blank?) || (!ma.content.blank?) %>
+                <div class="fl"><strong>内容：</strong></div><div class="ml36"><%= ma.description.nil? ? ma.content.html_safe : ma.description.html_safe %></div>
+            <% end %>
+          </div>
+          <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <%# end %>
+<% end %>

app/views/users/user_messages.html.erb

@@ -41,40 +41,13 @@
               <% end %>
             </div>
         <% end %>
-        <%# 系统消息 %>
-        <% if params[:type] != 'system_messages' %>
-            <% @user_system_messages.each do |usm| %>
-                <ul class="homepageNewsList fl">
-                  <li class="homepageNewsPortrait fl">
-                    <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/logo.png", width: "30px", height: "30px", class: "mt3") %></div></a>
-                  </li>
-                  <li class="homepageNewsPubType fl">
-                    <span class="newsBlue homepageNewsPublisher">Trustie平台</span><span class="homepageNewsType fl">发布新消息：</span>
-                  </li>
-                  <span style="color: red;float: left">【系统消息】</span>
-                  <li class="homepageSystenMessageContent fl">
-
-                    <%= link_to usm.subject.blank? ? (usm.content.nil? ? usm.description.html_safe : usm.content.html_safe) : usm.subject, user_system_messages_path(User.current),
-                                :id => "content_link_#{usm.id}",
-                                :onmouseover =>"message_titile_show($(this),event);",
-                                :onmouseout => "message_titile_hide($(this));"
-                    %>
-                  </li>
-                  <div style="display:none;" class="message_title_red system_message_style">
-                    <% unless usm.subject.blank? %>
-                        <p><strong>标题：</strong><%= usm.subject %></p>
-                    <% end %>
-                    <% if (!usm.description.blank?) || (!usm.content.blank?) %>
-                        <div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.nil? ? usm.content.html_safe : usm.description.html_safe %></div>
-                    <% end %>
-                  </div>
-                  <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
-                </ul>
-            <% end %>
-        <% end %>
+
         <!--总消息列表-->
         <% unless @message_alls.nil? %>
             <% @message_alls.each do |ma| %>
+                <%# 系统消息 %>
+                <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
+
                 <%# 课程消息 %>
                 <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
 

config/locales/zh.yml

@@ -2024,7 +2024,11 @@ zh:
 
   label_end_time: 截止时间
   label_send_email: 确定发送
-  label_input_email: 请输入邮箱地址
+  label_input_email: 请输入邮箱地址(必填)
+  label_input_email_firstname: 请输入用户名字(可选)
+  label_input_email_lastname: 请输入用户姓氏(可选)
+  label_input_email_gender: 请输入用户性别
+
   #api end
   project_module_files: 资源库
 

public/stylesheets/new_user.css

@@ -802,7 +802,8 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
-.postDetailReply { margin-top:28px; color:#888888; float:right;}
+.postDetailReply { margin-top:28px; color:#888888; float:right;display: inline}
+.disablePostLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; padding-right: 5px; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a.postReplyIcon {background:url(images/post_image_list.png) -40px 2px no-repeat; width:18px; height:18px; float:left; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no-repeat; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
 .postDetailInput {width:713px; height:28px; border:1px solid #d9d9d9; outline:none !important;}

public/stylesheets/prettify.css

@@ -44,12 +44,12 @@ pre li,ul,ol {
 
 /* Specify class=linenums on a pre to get line numbering */
 ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px;margin-left: 0px !important; } /* IE indents via margin-left */
-.list_style ol li {
-    list-style-type: decimal;
-    margin-left: 10px !important;
-}
+/*.list_style ol li {*/
+    /*list-style-type: decimal;*/
+    /*margin-left: 10px !important;*/
+/*}*/
 .linenums li {
-    margin-left: 0px !important;
+    margin-left: 5px !important;
 }
 li.L0,
 li.L1,

public/stylesheets/project.css

@@ -44,7 +44,10 @@ a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .box_main02{ width:390px; margin:15px auto;}
 .box_h3{ color:#15bccf; font-size:16px;}
 .box_p{ color:#404040; margin-bottom:5px;}
-.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:5px; padding-left:5px; width:290px;}
+.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:5px; padding-left:5px; width:200px;}
+.fb_item_first_name{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:5px; padding-left:5px; width:150px;margin-left: 10px;}
+.fb_item_last_name{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:5px; padding-left:5px; width:150px;margin-left: 10px;}
+.fb_item_gender{ color:#919191; border:1px solid #919191; height:29px; margin-bottom:5px; padding-left:5px; width:58px;margin-left: 10px;}
 a.icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block;  margin:5px 0 0 5px;}
 a:hover.icon_addm{background:url(../images/img_floatbox.png) 0 -61px no-repeat; }
 a.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px  no-repeat;width:16px; height:16px; display:block;  margin:5px 0 0 5px}
@@ -542,6 +545,8 @@ blockquote {
 .member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
 .member_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;}
 a.member_btn{ padding:5px; background:#15bccf; color:#fff;}
+a.project_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
+a.project_member_btn_right{ padding:2px 5px; background:#15bccf; color:#fff;}
 a:hover.member_btn{ background:#329cbd;}
 .pro_table{ text-align:center; color:#333; margin-bottom:20px;}
 .pro_table tr td{ height:30px;}

public/stylesheets/public.css

@@ -114,6 +114,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mb10{ margin-bottom:10px !important;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
+.pt5{ padding-top:5px;}
 .w20{ width:20px;}
 .w40{width: 40px;}
 .w45{ width: 45px;}