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

Conflicts:
	app/views/layouts/_user_project_list.html.erb

Signed-off-by: alan <547533434@qq.com>

app/api/mobile/apis/comments.rb

@@ -91,6 +91,7 @@ module Mobile
         desc '课程留言列表'
         params do
           optional :token, type: String
+          optional :page,type:Integer,desc:'页数'
         end
         get ':id/course_message' do
           cs = CommentService.new

app/controllers/projects_controller.rb

@@ -243,14 +243,7 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-    # params[:login]为邮箱邀请用户加入，主要功能：
+
-    # 1、自动注册
-    # 2、加入项目、创建角色
-    # 3、用户得分
-    if params[:mail]
-      Member.create(:role_ids => [4], :user_id => params[:user],:project_id => params[:id])
-      UserGrade.create(:user_id =>params[:user], :project_id => params[:id])
-    end
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -399,6 +392,26 @@ class ProjectsController < ApplicationController
   # by young
   # include CoursesHelper
   def member
+    # params[:login]为邮箱邀请用户加入，主要功能：
+    # 1、自动注册
+    # 2、加入项目、创建角色
+    # 3、用户得分
+    if params[:mail]
+      user = User.find(params[:user_id])
+      user.activate!
+      Member.create(:role_ids => [4], :user_id => params[:user_id],:project_id => params[:id])
+      UserGrade.create(:user_id => params[:user_id], :project_id => params[:id])
+      token = Token.get_token_from_user(user, 'autologin')
+      #user = User.try_to_autologin(token.value)
+      if user
+        start_user_session(user)
+        user.save
+        redirect_to project_member_path(params[:id])
+        return
+        # account_ project_member_path(params[:id])
+        flash[:notice] = l(:label_mail_invite_success)
+      end
+    end
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'project_member_list'
     # 判断是否课程

app/controllers/welcome_controller.rb

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
+  # layout "base_welcome"
   include ApplicationHelper
   include WelcomeHelper
   helper :project_score

app/models/invite_list.rb

@@ -0,0 +1,5 @@
+class InviteList < ActiveRecord::Base
+  attr_accessible :project_id, :user_id
+  # belongs_to :user
+  # belongs_to :project
+end

app/models/mailer.rb

@@ -60,8 +60,8 @@ class Mailer < ActionMailer::Base
     user = us.register_auto(login, @email, @password)
     User.current = user unless User.current.nil?
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
+
-    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
+    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true)
     mail :to => email, :subject => @subject
   end
 
@@ -72,8 +72,9 @@ class Mailer < ActionMailer::Base
     @invitor_name = "#{invitor.name}"
     @project_name = "#{project.name}"
     @user = user
+    @project = project
     @token = Token.get_token_from_user(user, 'autologin')
-    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, :user => user.id, :mail => true, :token => @token.value)
+    @project_url = url_for(:controller => 'projects', :action => 'member', :id => project.id, :user_id => user.id, :mail => true, :token => @token.value)
     mail :to => email, :subject => @subject
   end
 

app/models/project.rb

@@ -67,7 +67,7 @@ class Project < ActiveRecord::Base
   has_many :student, :through => :students_for_courses, :source => :user
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
   has_many :applied_projects
-
+  # has_many :invite_lists
 
   # end
   #ADDED BY NIE

app/models/user.rb

@@ -125,6 +125,10 @@ class User < Principal
   has_many :documents # 项目中关联的文档再次与人关联
 # end
 
+  # 邮件邀请状态
+  # has_many :invite_lists
+  # end
+
 ######added by nie
   has_many :project_infos, :dependent => :destroy
   has_one :user_status, :dependent => :destroy

app/services/comment_service.rb

@@ -94,7 +94,7 @@ class CommentService
   def course_messages params,current_user
     @course = ::Course.find(params[:id])
     if (current_user.admin? || @course.is_public == 1 || (@course.is_public == 0 && current_user.member_of_course?(@course)))
-      @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+      @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC').page(params[:page] ||= 1).per(10)
     else
       raise '403'
     end

app/services/users_service.rb

@@ -62,7 +62,7 @@ class UsersService
     else
       @user.password = ""
     end
-    @user = automatically_register(@user)
+    @user = automatically_register_lock(@user)
     if @user.id != nil
       ue = @user.user_extensions ||= UserExtensions.new
       ue.user_id = @user.id
@@ -292,6 +292,7 @@ class UsersService
     jours
   end
 
+  # 所有的与我相关
   def reply_my_messages params,current_user
     jours = my_personal_messages params,current_user
     jours1 = my_course_messages params,current_user

app/views/boards/_course_new.html.erb

@@ -1,9 +1,10 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
 
     <%= render :partial => 'form_course', :locals => {:f => f,  :topic => @message} %>
     <li>
-      <a href="javascript:void(0);"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
+      <div class="ml55 fl" nhname="toolbar_container"></div>
-      <a href="javascript:void(0);" name="submitbtn" class="blue_btn fr " style="margin-left: 55px">
+      <a href="javascript:void(0);"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
+      <a href="javascript:void(0);" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px">
         <%= l(:button_submit)%>
       </a>
       <div class="cl"></div>

app/views/boards/_edit.html.erb

@@ -12,6 +12,7 @@
                            } do |f| %>
             <%= render :partial => 'form_project',
                      :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
+            <div class="ml55 fl" nhname="toolbar_container"></div>
             <a href="javascript:void(0)" nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
             <a href="javascript:void(0)" nhname='submitbtn' class="blue_btn fr c_white" ><%= l(:button_submit)%></a>
           <%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white"  %>
@@ -31,6 +32,7 @@
                                } do |f| %>
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
+              <div class="ml55 fl" nhname="toolbar_container"></div>
               <a href="javascript:void(0)"  nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
               <a href="javascript:void(0)"  nhname='submitbtn' class="blue_btn fr c_white"><%= l(:button_submit)%></a>
 

app/views/boards/_form_course.html.erb

@@ -5,19 +5,19 @@
     <li style="display: none">
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
 
 
-      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
+      <p nhname="subjectmsg" class="ml55"></p>
     </li>
 <% else %>
     <li >
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
 
-      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585", :aa=>"subject" }.merge(extra_option) %>
+      <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}", onkeyup: "regexSubject('#{f.object.id}');",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
 
-      <p id="subject_span<%= f.object.id%>" class="ml55"></p>
+      <p nhname="subjectmsg" class="ml55"></p>
     </li>
 <% end %>
 <li class="ml60 mb5">
@@ -34,11 +34,11 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <div nhname="quote_show" id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
   <% unless replying %>
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
-  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
   <div class="content">
     <% if replying%>
 
@@ -46,13 +46,14 @@
                         :width => '89%',
                         :height => 300,
                         :id => "message_content#{f.object.id}",
-                        :aa => 'content',
+                        :nhname => 'textarea',
                         :onkeyup => "regexContent('#{f.object.id}');",
                         :class => 'talk_text fl',
                         :placeholder => "最多3000个汉字(或6000个英文字符)",
                         :maxlength => 5000 %>
 
     <% else %>
+        <input nhname="init_content_val" value="<%=topic.content%>" type="hidden"/>
         <%= f.text_area :content,
                         :width => '90%',
                         :height => 300,
@@ -61,14 +62,14 @@
                         :id => "message_content#{f.object.id}",
                         :onkeyup => "regexContent('#{f.object.id}');",
                         :class => 'talk_text fl',
-                        :aa => 'content',
+                        :nhname => 'textarea',
                         :placeholder => "最多3000个汉字(或6000个英文字符)",
                         :maxlength => 5000 %>
 
     <% end %>
   </div>
   <div class="cl"></div>
-  <p id="message_content_span<%= f.object.id%>"  aa="message_show"  class="ml55"></p>
+  <p id="message_content_span<%= f.object.id%>"  nhname="contentmsg" class="ml55"></p>
 </li>
 <div class="cl"></div>
 <li>

app/views/boards/_form_project.html.erb

@@ -1,4 +1,3 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 <style>
     .comment{
         position: relative;
@@ -15,7 +14,7 @@
 <% replying ||= false %>
 <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
 <% if replying %>
-<li style="display: none">
+<li style="display: none;">
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
       <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
@@ -47,12 +46,13 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <div nhname="quote_show" id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
   <% unless replying %>
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
-  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
-  <div class="content">
+
+  <div class="content <%= replying ? '':'ml55' %>">
   <% if replying%>
 
       <%= f.text_area :content,
@@ -66,6 +66,7 @@
                                         :maxlength => 5000 %>
 
   <% else %>
+      <input nhname="init_content_val" value="<%=topic.content%>" type="hidden"/>
       <%= f.text_area :content,
                        :width => '90%',
                        :height => 300,
@@ -81,7 +82,11 @@
   <% end %>
   </div>
   <div class="cl"></div>
-  <p nhname="contentmsg" class="ml55"></p>
+  <% if replying%>
+      <p nhname="contentmsg"></p>
+  <% else %>
+      <p nhname="contentmsg" class="ml55"></p>
+  <%end %>
 </li>
 <div class="cl"></div>
 <li>

app/views/boards/_project_new_topic.html.erb

@@ -1,7 +1,8 @@
-<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},:nhname=>'form', :html => {:multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},:html => {:nhname=>'form', :multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %>
 
     <%= render :partial => 'form_project', :locals => {:f => f,  :topic => @message} %>
     <li>
+      <div class="ml55 fl" nhname="toolbar_container"></div>
       <a href="javascript:void(0)"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
 
       <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>

app/views/boards/show.html.erb

@@ -1,3 +1,13 @@
+<style>
+    .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    .ke-toolbar-icon-url{background-image:url( '/images/public_icon.png' )}
+    .ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    .ke-toolbar .ke-outline{border:none;}
+    .break_word {width:100%;}
+</style>
 <script type="text/javascript">
     //头部导航
     var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
@@ -21,55 +31,182 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+
+<% if @project %>
+    <%= render :partial => 'project_show', locals: {project: @project} %>
+<% elsif @course %>
+    <%= render :partial => 'course_show', locals: {course: @course} %>
+<% end %>
+
 
 <script type="text/javascript">//侧导航
 
-window.onload = function () {
+//window.onload = function () {
-    var topic_id = getParam('topic_id');
+//    var topic_id = getParam('topic_id');
-    document.getElementById(topic_id).focus();
+//    document.getElementById(topic_id).focus();
-}
+//}
+//
+//var getParam = function(name){
+//    var search = document.location.search;
+//    var pattern = new RegExp("[?&]"+name+"\=([^&]+)", "g");
+//    var matcher = pattern.exec(search);
+//    var items = null;
+//    if(null != matcher){
+//        try{
+//            items = decodeURIComponent(decodeURIComponent(matcher[1]));
+//        }catch(e){
+//            try{
+//                items = decodeURIComponent(matcher[1]);
+//            }catch(e){
+//                items = matcher[1];
+//            }
+//        }
+//    }
+//    return items;
+//};
+//
+//function show_newtalk()
+//{
+//    $("#about_newtalk").toggle();
+//
+//
+//
+//}
+//
+//function show_newtalk1(id)
+//{
+//    $(id).toggle();
+//    $(id).focus();
+//
+//
+//}
 
-var getParam = function(name){
+function nh_check_field(params){
-    var search = document.location.search;
+    var result=true;
-    var pattern = new RegExp("[?&]"+name+"\=([^&]+)", "g");
+    if(params.subject!=undefined){
-    var matcher = pattern.exec(search);
+        if($.trim(params.subject.val()) == ""){
-    var items = null;
+            params.subjectmsg.html('主题不能为空');
-    if(null != matcher){
+            params.subjectmsg.css({color:'#ff0000'});
-        try{
+            result=false;
-            items = decodeURIComponent(decodeURIComponent(matcher[1]));
+        }else{
-        }catch(e){
+            params.subjectmsg.html('填写正确');
-            try{
+            params.subjectmsg.css({color:'#008000'});
-                items = decodeURIComponent(matcher[1]);
-            }catch(e){
-                items = matcher[1];
-            }
         }
+        params.subjectmsg.show();
     }
-    return items;
-};
-
-function show_newtalk()
-{
-    $("#about_newtalk").toggle();
-
 
+    if(params.content!=undefined){
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            if(params.content.isEmpty()){
+                params.contentmsg.html('内容不能为空');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('填写正确');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
+    }
 
+    return result;
 }
+function nh_init_board(params){
+    //发帖/编辑/回复按钮的click
+    params.showbtn.click(function(){
+        if(params.textarea.data('init') == undefined){
+            //初始化编辑器
+            var editor = params.kindutil.create(params.textarea, {
+                resizeType : 1,
+                allowPreviewEmoticons : false,
+                allowImageUpload : false,
+                minWidth:"1px",
+                width:"565px",
+                items : ['emoticons'],
+                afterChange:function(){//按键事件
+                    nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+                },
+                afterCreate:function(){
+                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
+                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+                    params.toolbar_container.append(toolbar);
+                }
+            });
 
-function show_newtalk1(id)
+            //主题输入框按键事件
-{
+            params.inputsubject.keyup(function(){
-    $(id).toggle();
+                nh_check_field({subject:params.inputsubject,subjectmsg:params.subjectmsg});
-    $(id).focus();
+            })
-
+            //表单提交
-
+            params.form.submit(function(){
+                var is_checked = nh_check_field({
+                    issubmit:true,
+                    subject:params.inputsubject,
+                    subjectmsg:params.subjectmsg,
+                    content:editor,
+                    contentmsg:params.contentmsg,
+                    textarea:params.textarea
+                });
+                if(is_checked){
+                    //return true 居然不提交 fuck your sister
+                    $(this)[0].submit();
+//                    return true;
+                }
+                return false;
+            });
+            //提交按钮click
+            params.submitbtn.click(function(){
+                params.form.submit();
+            });
+            //取消按钮click
+            params.cancelbtn.click(function(){
+                params.about_talk.toggle();//显示/隐藏编辑区
+                if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
+                    params.form[0].reset();
+                    if(params.type=='reply'){
+                        params.textarea.empty();
+                    }else{
+                        params.textarea.html(params.init_content_val.val());
+                    }
+                    var str = params.textarea.html();
+                    str=str.replace(new RegExp(/&lt;/g),'<');
+                    str=str.replace(new RegExp(/&gt;/g),'>');
+                    editor.html(str);
+                    params.subjectmsg.hide();
+                    params.contentmsg.hide();
+                    if(params.quote_show!=undefined)params.quote_show.empty();
+                    if(params.quote_input!=undefined)params.quote_input.empty();
+                }else{
+                    if(params.type=='reply'){
+                        params.jumphref.attr('href','#'+params.form.attr('id'));
+                        params.jumphref[0].click();
+                    }else params.inputsubject.focus();
+                }
+            });
+            params.textarea.data('init','1');//标记为已经初始化
+        }
+        params.cancelbtn.click();//显示/隐藏编辑区
+    });
+    if(params.type == 'reply'){
+        params.showbtn_child.click(function(){
+            if(params.textarea.data('init') == undefined){
+                params.showbtn.click();
+            }else{
+                params.cancelbtn.click();
+                if(params.about_talk.is(':hidden')){
+                    params.cancelbtn.click();
+                }
+            }
+            var ref_str = params.get_ref_str_call($(this));
+            params.quote_show.html(ref_str);
+            params.quote_input.html(ref_str);
+        });
+    }
 }
 
 
-
+</script>
-</script>
-
-<% if @project %>
-    <%= render :partial => 'project_show', locals: {project: @project} %>
-<% elsif @course %>
-    <%= render :partial => 'course_show', locals: {course: @course} %>
-<% end %>

app/views/courses/homework.html.erb

@@ -31,7 +31,7 @@
         <% end %>
         <div class="cl"></div>
         <script>
-            $(function(){if($("#bid_description_<%= bid.id%>_content").height()>38){$("#bid_show_more_des_button<%= bid.id%>").show();}});
+            $(function(){if($("#bid_description_<%= bid.id%>_content").height()>360){$("#bid_show_more_des_button<%= bid.id%>").show();}});
         </script>
         <div  id="bid_description_<%= bid.id%>" class="news_description mt5">
           <div id="bid_description_<%= bid.id%>_content" class="upload_img">

app/views/layouts/_user_project_list.html.erb

@@ -2,13 +2,11 @@
     <li id="project_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name} %>
       <ul class="project_sub_menu" style="top:<%= hasCourse ? 35 : 0 %>px;">
-
         <% User.current.projects.each do |project| %>
             <li style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="<%=project.name%>">
               <%= link_to project.name, {:controller => 'projects', :action => 'show',id: project.id, host: Setting.host_name } %>
             </li>
         <% end %>
-
       </ul>
     </li>
-<% end %>
+<% end %>

app/views/layouts/base.html.erb

@@ -12,7 +12,7 @@
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "jquery.leanModal.min" %>
-<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%> 
+<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
@@ -31,7 +31,7 @@
         <div style="clear:both;"></div>
         <%=render :partial => 'layouts/base_footer'%>
     </div>
-    
+
 </div>
 </div>
 

app/views/layouts/base_welcome.html.erb

@@ -5,10 +5,9 @@
   <title><%=h html_title %></title>
   <meta name="description" content="<%= Redmine::Info.app_name %>" />
   <meta name="keywords" content="issue,bug,tracker" />
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
+  <%= stylesheet_link_tag 'public', 'pleft', 'project', :media => 'all' %>
-  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+
   <%= javascript_include_tag "jquery.leanModal.min" %>
-  <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
 
   <%= csrf_meta_tag %>
   <%= favicon %>
@@ -18,32 +17,26 @@
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 </head>
-<body class="<%=h body_css_classes %>">
+<body id="Container">
-<div id="wrapper">
+<div id="Container">
-  <div id="wrapper2">
+  <%= render :partial => 'layouts/new_header' %>
-    <div id="wrapper3">
+  <div class="cl"></div>
-      <%=render :partial => 'layouts/base_header'%>
       <div id="main" class="nosidebar">
         <div id="content_">
           <%= render_flash_messages %>
           <%= yield %>
           <%= call_hook :view_layouts_base_content %>
           <div style="clear:both;"></div>
-          <%=render :partial => 'layouts/base_footer'%>
+          <%=render :partial => 'layouts/new_footer'%>
         </div>
 
       </div>
     </div>
     <div id="ajax-indicator" style="display:none;">
-              <span>
+      <span><%= l(:label_loading) %></span>
-                <%= l(:label_loading) %>
-              </span>
     </div>
     <div id="ajax-modal" style="display:none;"></div>
 
-
-  </div>
-</div>
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>

app/views/stores/index.html.erb

@@ -3,10 +3,10 @@
 <% end %>
 
 <div class="resource_sum" id="IE_resource_sum_css">
-<% @attach_array.each do |k|%>
+<% @attach_array.each_with_index do |k, index|%>
 	<div class="line_block" >
 		<p>
-			<%= @str_arr.shift %>
+			<%= @str_arr[index] %>
 		</p>
 
 		<div class="table1">
@@ -24,7 +24,7 @@
 		</div>
 
 		<div class="table1">
-          <% if @str_arr.shift == @str_arr[2]%>
+          <% if index == 2%>
 		<% k.each do |c1|%>
 			<div class="table_row1 <%= cycle 'odd', 'even' %>">
 				<div class="filename table_cell1 filename1" >
@@ -94,4 +94,4 @@
         }
 	});
 </script>
-<% html_title(l(:label_stores_index)) -%>
+<% html_title(l(:label_stores_index)) -%>

app/views/welcome/_course_list.html.erb

@@ -25,7 +25,7 @@
             <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
         <% end %>
         (<%= course.members.count %>人)
-        <% files_count = course.attachments.count %>
+        <% files_count = visable_attachemnts_incourse(course).count %>
         <% if files_count > 0%>
             (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>公开资料)
         <% end %>

config/locales/projects/zh.yml

@@ -342,6 +342,7 @@ zh:
   label_invite_trustie_user_tips: "输入姓名、邮箱、昵称"
   label_user_role_null: 用户和角色不能留空！
   label_invite_project: 邀请您加入项目
+  label_mail_invite_success: 您已成功加入项目！
   label_invite_success: 邀请成功
   label_invite_members: 邀请用户  
   #   

db/migrate/20150528024616_create_invite_lists.rb

@@ -0,0 +1,10 @@
+class CreateInviteLists < ActiveRecord::Migration
+  def change
+    create_table :invite_lists do |t|
+      t.integer :project_id
+      t.integer :user_id
+
+      t.timestamps
+    end
+  end
+end