Merge branch 'develop' into rep_quality

Gemfile

@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
-gem "test-unit", "~>3.0" 
+gem "test-unit", "~>3.0"
 
 ### profile
-# gem 'oneapm_rpm'
+gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

app/controllers/admin_controller.rb

@@ -154,6 +154,19 @@ class AdminController < ApplicationController
     end
   end
 
+  # 单位名称列表下的已审批按照名字排序
+  def apply_shcool_sort
+    @order = ""
+    @sort = ""
+    if params[:sort] && (params[:order]  == 'name')
+    #  courses = School.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) #{params[:sort]}, c.id desc")
+      school = School.find_by_sql(" SELECT aas.name FROM apply_add_schools aas where aas.status = '0' ORDER BY CONVERT(aas.name USING gbk) #{params[:sort]}, aas.id asc  ")
+      @order = params[:order]
+      @sort = params[:sort]
+    end
+      redirect_to unapplied_schools_url
+  end
+
   #精品课程下的全部课程
   def excellent_all_courses
     name = params[:name]
@@ -602,8 +615,10 @@ class AdminController < ApplicationController
   # 获取申请的高校列表
   # status: 0 未审批； 1 已批阅；
   def applied_schools
-    @name = params[:name]
-    @apply_status = ApplyAddSchools.where(:status => 0).order('created_at desc')
+    @name = params[:name] || ""
+    condition = "#{@name.strip}".gsub(" ","")
+
+    @apply_status = ApplyAddSchools.where("status = 0 and name like '%#{condition}%'").order('created_at desc')
     @apply_count = @apply_status.count
 
     @apply_pages = Paginator.new @apply_count, 30, params['page'] || 1
@@ -616,8 +631,10 @@ class AdminController < ApplicationController
   end
 
   def has_applied_schools
-    @name = params[:name]
-    @has_apply_status = ApplyAddSchools.where("status = 1 or status = 2").order('created_at desc')
+    @name = params[:name] || ""
+    condition = "#{@name.strip}".gsub(" ","")
+
+    @has_apply_status = ApplyAddSchools.where("(status = 1 or status = 2) and name like '%#{condition}%'").order('created_at desc')
     @has_apply_count = @has_apply_status.count
 
     @has_apply_pages = Paginator.new @has_apply_count, 30, params['page'] || 1
@@ -700,8 +717,10 @@ class AdminController < ApplicationController
       user.update_column("school_id", nil)
     end
     applied_school.school.destroy
-    respond_to do |format|
-      format.html{ redirect_to unapplied_schools_url }
+    if params[:tip] == "unapplied"
+      redirect_to unapplied_schools_url
+    elsif params[:tip] == "applied"
+      redirect_to applied_schools_url
     end
   end
 

app/controllers/applied_project_controller.rb

@@ -59,12 +59,14 @@ class AppliedProjectController < ApplicationController
       @flag = 2
     elsif params[:member].nil?
       @flag = 3
+    elsif !AppliedProject.where(:project_id => @project.id, :user_id => User.current.id).first.nil?
+      @flag = 5
     else
       @flag = 4
-      role = params[:member] == "member_manager" ? 3 : (params[:member] = "member_developer" ? 4 :5)
+      role = params[:member] == "member_manager" ? 3 : (params[:member] == "member_developer" ? 4 :5)
       applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => @project.id, :role => role)
       # 申请成功则给项目管理员发送邮件及发送消息
-      Mailer.run.applied_project(applied_project)
+      # Mailer.run.applied_project(applied_project)
     end
   end
 

app/controllers/projects_controller.rb

@@ -792,6 +792,11 @@ class ProjectsController < ApplicationController
       members = Member.where(:user_id => User.current.id, :project_id=>params[:id]).first
       if  members != nil && members.roles.first.to_s != "Manager"
         members.destroy
+        # 移出的时候删除申请消息,不需要删除消息，所以不必要关联删除
+        applied_projects = AppliedProject.where(:project_id => @project.id, :user_id => members.user_id).first
+        unless applied_projects.nil?
+          applied_projects.delete
+        end
       end
       respond_to do |format|
         format.js

app/controllers/school_controller.rb

@@ -184,6 +184,15 @@ class SchoolController < ApplicationController
         applyschool.user_id = User.current.id
         if applyschool.save
           data[:school_id] = school.id
+          user_extention=  User.current.extensions
+          user_extention.school_id = school.id
+          user_extention.save!
+
+          # status=4 向管理员发送信息
+          users = User.where(:admin => 1)
+          users.each do |user|
+            AppliedMessage.create(:user_id => user.id, :status => 4, :applied_user_id => User.current.id, :viewed => true, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name )
+          end
         else
           data[:result] = 3
         end
@@ -207,4 +216,69 @@ class SchoolController < ApplicationController
 
     render :json =>status
   end
+
+  def edit_apply_name
+    name = params[:name] || ""
+    status = -1
+
+    if name != ""
+      applyschool = ApplyAddSchools.where("id=?",params[:id]).first
+
+      applyschool.name = name.strip
+
+      if applyschool.school
+        applyschool.school.name = name
+        applyschool.school.pinyin = Pinyin.t(name.strip, splitter: '')
+        applyschool.school.save!
+      end
+      applyschool.save!
+      status = 0
+    end
+
+    render :json=>{:status=>status,:id=>params[:id],:name=>name}
+  end
+
+  def edit_apply_address
+    address = params[:address] || ""
+
+    status = -1
+
+    if address != ""
+      applyschool = ApplyAddSchools.where("id=?",params[:id]).first
+      applyschool.address = address
+      applyschool.save!
+      status = 0
+    end
+
+    render :json=>{:status=>status,:id=>params[:id],:address=>address}
+  end
+
+  def edit_apply_province
+    province = params[:province] || ""
+    city = params[:city] || ""
+    status = -1
+
+    if(province != "") &&(city != "")
+      applyschool = ApplyAddSchools.where("id=?",params[:id]).first
+      applyschool.province = province
+      applyschool.city = city
+
+      if applyschool.school
+        applyschool.school.province = province
+        applyschool.school.save!
+      end
+      applyschool.save!
+
+      if applyschool.user_id && applyschool.user_id != 0
+        user = User.find(applyschool.user_id)
+        user_extention=  user.extensions
+        user_extention.location = province
+        user_extention.location_city = city
+        user_extention.save!
+      end
+      status = 0
+    end
+
+    render :json=>{:status=>status,:id=>params[:id],:province=>province,:city=>city}
+  end
 end

app/models/applied_message.rb

@@ -1,6 +1,7 @@
 class AppliedMessage < ActiveRecord::Base
   # status: 0表示未批准； status：1表示已批准； status： 2表示已拒绝
-  attr_accessible :applied_id, :applied_type, :status, :user_id, :viewed, :applied_user_id, :role, :project_id
+
+  attr_accessible :applied_id, :applied_type, :status, :user_id, :viewed, :applied_user_id, :role, :project_id, :name
   belongs_to :applied ,:polymorphic => true
   belongs_to :apply_add_schools
   belongs_to :user

app/models/user.rb

@@ -42,12 +42,12 @@ class User < Principal
   # Different ways of displaying/sorting users
   USER_FORMATS = {
     :firstname_lastname => {
-        :string => '#{firstname} #{lastname}',
+        :string => '#{firstname}#{lastname}',
         :order => %w(firstname lastname id),
         :setting_order => 1
       },
     :firstname_lastinitial => {
-        :string => '#{firstname} #{lastname.to_s.chars.first}.',
+        :string => '#{firstname}#{lastname.to_s.chars.first}.',
         :order => %w(firstname lastname id),
         :setting_order => 2
       },
@@ -57,7 +57,7 @@ class User < Principal
         :setting_order => 3
       },
     :lastname_firstname => {
-        :string => '#{lastname} #{firstname}',
+        :string => '#{lastname}#{firstname}',
         :order => %w(lastname firstname id),
         :setting_order => 4
       },

app/services/courses_service.rb

@@ -399,6 +399,8 @@ class CoursesService
     if course
       if course_endTime_timeout? course
         @state = 2
+      elsif course[:is_delete] == 1
+        @state = 11
       else
         if current_user.member_of_course?(course) #如果已经是成员
           @state = 3

app/views/admin/_all_schools.html.erb

@@ -1,5 +1,4 @@
 <%= stylesheet_link_tag 'css/common','css/popup' %>
-
 <div class="boxContainer" style="height: auto;">
     <div class="sendText fl mr10" style="width: auto">更改为</div>
     <div class="cl"></div>
@@ -16,7 +15,7 @@
     function school_submit() {
         var checkboxs = $("input[name='school_id[]']:checked");
         if(checkboxs.length == 0) {
-            $("#choose_courses_notice").text("请先选择班级");
+            $("#choose_courses_notice").text("请选择单位");
         } else{
             $("#choose_courses_notice").text("");
             $("#schools_list_form").submit();

app/views/admin/_courselist_detail_tr.html.erb

@@ -7,7 +7,7 @@
             </span>
 </td>
 <td align="center">
-  <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+  <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
 </td>
 <td align="center">
   <%= course.class_period %>

app/views/admin/applied_schools.html.erb

@@ -23,8 +23,11 @@
       <th style="width: 20px;">
         序号
       </th>
-      <th style="width: 85px;">
-        单位名称
+      <th style="width: 85px;" class = "<%= @order == 'name' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '单位名称', apply_shcool_sort_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'name', :tip=>'unapplied') %>
+      </th>
+      <th style="width: 30px;">
+        申请者
       </th>
       <th style="width: 75px;">
         地区
@@ -46,18 +49,66 @@
     <tbody>
     <% @apply_status.each do |apply| %>
     <% if apply.status == 0 %>
-            <tr class="<%= cycle("odd", "even") %>">
+        <tr class="<%= cycle("odd", "even") %>">
           <td style="text-align: center;">
             <%= apply.id %>
           </td>
-          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=apply.name%>' id="apply_title_<%= apply.id %>">
-            <%= apply.name %>
+          <td class="name" title='<%=apply.name%>' >
+            <span id="apply_title_<%= apply.id %>"><%= apply.name %></span>
+            <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"><%= apply.name %></textarea>
+          </td>
+          <td class="center">
+            <% user = User.where("id=?", apply.user_id).first %>
+            <% unless user.nil? %>
+            <%=link_to user.show_name, user_path(user),:target => '_blank' %>
+            <% end %>
           </td>
           <td class="center">
-            <%= apply.province + apply.city %>
+            <span ondblclick = "show_edit_school_province('<%= apply.id %>');" id="apply_province_<%= apply.id %>">
+            <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city)  %>
+            </span>
+            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:50px; height:18px; display: none">
+              <option value="北京">北京</option>
+              <option value="上海">上海</option>
+              <option value="广东">广东</option>
+              <option value="江苏">江苏</option>
+              <option value="浙江">浙江</option>
+              <option value="重庆">重庆</option>
+              <option value="安徽">安徽</option>
+              <option value="福建">福建</option>
+              <option value="甘肃">甘肃</option>
+              <option value="广西">广西</option>
+              <option value="贵州">贵州</option>
+              <option value="海南">海南</option>
+              <option value="河北">河北</option>
+              <option value="黑龙江">黑龙江</option>
+              <option value="河南">河南</option>
+              <option value="湖北">湖北</option>
+              <option value="湖南">湖南</option>
+              <option value="江西">江西</option>
+              <option value="吉林">吉林</option>
+              <option value="辽宁">辽宁</option>
+              <option value="内蒙古">内蒙古</option>
+              <option value="宁夏">宁夏</option>
+              <option value="青海">青海</option>
+              <option value="山东">山东</option>
+              <option value="山西">山西</option>
+              <option value="陕西">陕西</option>
+              <option value="四川">四川</option>
+              <option value="天津">天津</option>
+              <option value="新疆">新疆</option>
+              <option value="西藏">西藏</option>
+              <option value="云南">云南</option>
+              <option value="香港">香港特别行政区</option>
+              <option value="澳门">澳门特别行政区</option>
+              <option value="台湾">台湾</option>
+              <option value="海外">海外</option>
+            </select>
+            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:50px; height:18px; display: none"></select>
           </td>
-          <td align="left"  style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-            <%= apply.address %>
+          <td class="center">
+            <span title="双击可编辑" ondblclick = "show_edit_school_address('<%= apply.id %>');" id="apply_address_<%= apply.id %>"><%= apply.address %></span>
+            <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位地址" id="school_address_edit_<%=apply.id%>" onblur="edit_school_address('<%= edit_apply_address_school_path(apply.id)%>','<%= apply.id %>');"><%= apply.address %></textarea>
           </td>
           <td class="center">
             <% count = UserExtensions.where("school_id = #{apply.school_id}").count %>
@@ -67,13 +118,16 @@
             <%= format_date(apply.created_at) %>
           </td>
           <td class="center">
-            <%= link_to( l(:label_approve), { :controller => 'admin', :action => 'approve_applied_schools', :id => apply.id }, :class => 'icon-del') %>
-            <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id },:method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon-del') %>
-            <%=link_to '更改', admin_all_schools_path(:school_id =>apply.id), :remote => true %>
+            <%= link_to( l(:label_approve), { :controller => 'admin', :action => 'approve_applied_schools', :id => apply.id }, :class => "application-default-link" ) %>
+            <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id, :tip => 'unapplied' },:method => :delete, :confirm => l(:text_are_you_sure), :class => "application-default-link") %>
+            <%=link_to '更改', admin_all_schools_path(:school_id =>apply.id), :remote => true, :class => "application-default-link" %>
 
           </td>
         </tr>
-            <% unless apply.remarks.empty? %>
+        <script>
+            init_province_and_city(document.getElementById('school_province_edit_<%=apply.id%>'), '<%=apply.province%>', document.getElementById('schoolCity_<%=apply.id%>'), '<%=apply.city%>');
+        </script>
+            <% unless apply.remarks.blank? %>
                 <tr class="odd">
                   <td>
 
@@ -87,4 +141,7 @@
     <% end %>
     </tbody>
   </table>
-</div>
+</div>
+<ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+  <%= pagination_links_full @apply_pages, @apply_count ,:per_page_links => true, :remote => false, :flag => true %>
+</ul>

app/views/admin/has_applied_schools.html.erb

@@ -23,10 +23,13 @@
       <th style="width: 20px;">
         序号
       </th>
-      <th style="width: 85px;">
+      <th style="width: 80px;">
         单位名称
       </th>
-      <th style="width: 75px;">
+      <th style="width: 30px;">
+        申请者
+      </th>
+      <th style="width: 95px;">
         地区
       </th>
       <th style="width: 75px;">
@@ -35,7 +38,10 @@
       <th style="width: 85px;">
         原名
       </th>
-      <th style="width: 60px;">
+      <th style="width: 30px;">
+        用户
+      </th>
+      <th style="width: 65px;">
         创建时间
       </th>
       <th style="width: 75px;">
@@ -50,37 +56,88 @@
           <td style="text-align: center;">
             <%= apply.id %>
           </td>
-          <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=apply.name%>' id="apply_title_<%= apply.id %>">
-            <%= (School.find apply.school_id).name %>
+          <td  class="name" title='<%=apply.name%>' >
+            <% unless apply.school_id.nil? %>
+                <% school_name = School.where("id=?", apply.school_id).first %>
+                <span title="双击可编辑" ondblclick = "show_edit_school_name('<%= apply.id %>');" id="apply_title_<%= apply.id %>"><%= school_name %></span>
+                <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位名称" id="school_name_edit_<%=apply.id%>" onblur="edit_school_name('<%= edit_apply_name_school_path(apply.id)%>','<%= apply.id %>');"><%= school_name %></textarea>
+            <% end %>
           </td>
           <td class="center">
-            <%= (School.find apply.school_id).province %>
+            <% user = User.where("id=?", apply.user_id).first%>
+            <% unless user.nil? %>
+                <%=link_to user.show_name, user_path(user), :target => '_blank'%>
+            <% end %>
           </td>
-          <td align="left"  style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-            <%= apply.address %>
+          <td class="center">
+            <span ondblclick = "show_edit_school_province('<%= apply.id %>');" id="apply_province_<%= apply.id %>">
+            <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city)  %>
+            </span>
+            <select onchange="showcity(this.value, document.getElementById('schoolCity_<%=apply.id%>'));edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="province" id="school_province_edit_<%=apply.id%>" class="fl" style="width:50px; height:18px; display: none">
+              <option value="北京">北京</option>
+              <option value="上海">上海</option>
+              <option value="广东">广东</option>
+              <option value="江苏">江苏</option>
+              <option value="浙江">浙江</option>
+              <option value="重庆">重庆</option>
+              <option value="安徽">安徽</option>
+              <option value="福建">福建</option>
+              <option value="甘肃">甘肃</option>
+              <option value="广西">广西</option>
+              <option value="贵州">贵州</option>
+              <option value="海南">海南</option>
+              <option value="河北">河北</option>
+              <option value="黑龙江">黑龙江</option>
+              <option value="河南">河南</option>
+              <option value="湖北">湖北</option>
+              <option value="湖南">湖南</option>
+              <option value="江西">江西</option>
+              <option value="吉林">吉林</option>
+              <option value="辽宁">辽宁</option>
+              <option value="内蒙古">内蒙古</option>
+              <option value="宁夏">宁夏</option>
+              <option value="青海">青海</option>
+              <option value="山东">山东</option>
+              <option value="山西">山西</option>
+              <option value="陕西">陕西</option>
+              <option value="四川">四川</option>
+              <option value="天津">天津</option>
+              <option value="新疆">新疆</option>
+              <option value="西藏">西藏</option>
+              <option value="云南">云南</option>
+              <option value="香港">香港特别行政区</option>
+              <option value="澳门">澳门特别行政区</option>
+              <option value="台湾">台湾</option>
+              <option value="海外">海外</option>
+            </select>
+            <select onchange="edit_school_province('<%= edit_apply_province_school_path(apply.id)%>','<%= apply.id %>');" name="city" id="schoolCity_<%=apply.id%>" class="fl ml5" style="width:50px; height:18px; display: none"></select>
+          </td>
+          <td class="center">
+            <span title="双击可编辑" ondblclick = "show_edit_school_address('<%= apply.id %>');" id="apply_address_<%= apply.id %>"><%= apply.address %></span>
+            <textarea style="display: none; width:100px; height:16px; border:1px solid #ddd; outline:none; padding:0 0 0 5px; resize:none; overflow:hidden;" placeholder="请编辑单位地址" id="school_address_edit_<%=apply.id%>" onblur="edit_school_address('<%= edit_apply_address_school_path(apply.id)%>','<%= apply.id %>');"><%= apply.address %></textarea>
           </td>
           <td class="center">
             <%= apply.name %>
           </td>
+          <td class="center">
+            <% count = UserExtensions.where("school_id = #{apply.school_id}").count %>
+            <%= count %>
+          </td>
           <td class="center">
             <%= format_date(apply.created_at) %>
           </td>
           <td class="center">
-            <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id },:method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon-del') %>
+            <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id, :tip => 'applied' },:method => :delete, :confirm => l(:text_are_you_sure) ) %>
           </td>
         </tr>
-         <% unless apply.remarks.empty? %>
-            <tr class="odd">
-              <td>
-
-              </td>
-              <td style="text-align: left;" colspan="6">
-                <%=  apply.remarks %>
-              </td>
-            </tr>
+        <script>
+            init_province_and_city(document.getElementById('school_province_edit_<%=apply.id%>'), '<%=apply.province%>', document.getElementById('schoolCity_<%=apply.id%>'), '<%=apply.city%>');
+        </script>
         <% end %>
     <% end %>
-    <% end %>
     </tbody>
   </table>
-</div>
+</div>
+<ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+  <%= pagination_links_full @has_apply_pages, @has_apply_count ,:per_page_links => true, :remote => false, :flag => true %>
+</ul>

app/views/admin/non_syllabus_courses.html.erb

@@ -72,7 +72,7 @@
             </span>
           </td>
           <td align="center">
-            <%= link_to(course.teacher.show_name.truncate(6, omission: '...'), user_path(course.teacher)) %>
+            <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
           </td>
           <td align="center">
             <%= course.class_period %>

app/views/admin/syllabuses.html.erb

@@ -52,7 +52,7 @@
           <td class="center">
           </td>
           <td align="center">
-            <%= link_to(syllabus.try(:user).try(:realname).truncate(6, omission: '...'), user_path(syllabus.user)) %>
+            <%= link_to syllabus.user.show_name, user_path(syllabus.user) %>
           </td>
           <td class="center">
             <%= format_date(syllabus.created_at) %>
@@ -70,7 +70,7 @@
                 <%= render :partial => 'admin/rename_course_name', :locals => {:course => course} %>
               </td>
               <td align="center">
-                <%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
+                <%= link_to(course.teacher.show_name, user_path(course.teacher)) %>
               </td>
               <td class="center">
                 <%= format_date(course.created_at) %>

app/views/applied_project/_applied_join_project.html.erb

@@ -19,8 +19,8 @@
           <div class="cl"></div>
         </li>
         <li>
-          <label>&nbsp;</label>
-          <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sy_btn_blue fl" onclick="$('#project_applied_form').submit();hideModal()">确&nbsp;&nbsp;定</a></div>
+          <label class="mr27">&nbsp;</label>
+          <a href="javascript:void(0);" class="sy_btn_blue fl" onclick="$('#project_applied_form').submit();hideModal()">确&nbsp;&nbsp;定</a>
           <a href="javascript:void(0);" class="sy_btn_grey fl ml20" onclick="hideModal()">取&nbsp;&nbsp;消</a>
           <div class="cl"></div>
         </li>

app/views/applied_project/_applied_project_tip.js.erb

@@ -15,6 +15,8 @@
                 <p>请选择一个角色</p>
             <% elsif @flag == 4 %>
                 <p>您的申请已提交，请等待项目管理员审批</p>
+             <% elsif @flag == 5 %>
+                <p>您已经申请加入该项目了，请耐心等待</p>
             <% end %>
             </li>
             <li>

app/views/layouts/_course_base_info.html.erb

@@ -3,8 +3,10 @@
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count %>
 <p class="sy_cgrey mb10">
-  <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey' %>
-  &nbsp;&gt;&nbsp;
+  <% if @course.syllabus %>
+      <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey' %>
+      &nbsp;&gt;&nbsp;
+  <% end %>
   <%=link_to @course.name, course_path(@course), :class => 'sy_cgrey' %>
 </p>
 
@@ -61,9 +63,9 @@
   <% is_TE = get_user_member_roles_course @course, User.current, 9 %>
   <% is_ST = get_user_member_roles_course @course, User.current, 10 %>
   <% if !is_teacher && (is_TA || is_TE)  %>
-      <%= link_to '教师身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TA ? 7 : 9)), :class => "sy_btn_orange mr10 fl" %>
+      <%= link_to '教师身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TA ? 7 : 9)), :class => "sy_btn_orange mr10 fl", :title => "由学生身份切换至教师身份" %>
   <% elsif is_teacher && is_ST %>
-      <%= link_to '学生身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : 9), :tar_role => 10), :class => "sy_btn_orange mr10 fl" %>
+      <%= link_to '学生身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : 9), :tar_role => 10), :class => "sy_btn_orange mr10 fl", :title => "由教师身份切换至学生身份" %>
   <% end %>
   <% unless (is_teacher || is_TA || is_TE) %>
       <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>

app/views/layouts/base_admin.html.erb

@@ -62,3 +62,10 @@
 		<%= call_hook :view_layouts_base_body_bottom %>
 	</body>
 </html>
+
+<script>
+  $("#sidebar ul").css({"marginLeft":"40px","marginTop":"1em","padding":"0"});
+  $("#sidebar a").css({"color":"#169","fontSize":"12px","lineHeight":"1.5"});
+  $("#sidebar a").mouseover(function(){$(this).css({"color":"#fff","backgroundColor":"#169"});});
+  $("#sidebar a").mouseout(function(){$(this).css({"color":"#169","backgroundColor":"#fff"});});
+</script>

app/views/my/account.html.erb

@@ -369,7 +369,7 @@
   function apply_add_school(){
       var htmlvalue = "<%= escape_javascript( render :partial => 'my/apply_add_school' )%>";
       pop_up_box(htmlvalue,580,20,48);
-
+      $("#schoolname").val($("input[name='province']").val());
   }
   function add_school(name){
       $.ajax({

app/views/users/_courses_list.html.erb

@@ -13,7 +13,7 @@
               </div>
               <div class="">
                 <p class="fl grayTxt ">更新：<%=format_date Time.at(course.updatetime) %><span class="mr10"></span>学期：<%=current_time_and_term(course) %></p>
-                <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(@course).count %></span><span>资源</span></p>
+                <p class="list-info fr grayTxt"><span><%=studentCount course %></span><span>学生</span><span>|</span><span><%=visable_course_homework course %></span><span>作业</span><span>|</span><span><%=visable_attachemnts_incourse(course).count %></span><span>资源</span></p>
                 <div class="cl"></div>
               </div>
             </div>

app/views/users/_join_course_course_message.html.erb

@@ -5,7 +5,7 @@
 </li>
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContent2' : 'homepageHomeworkContent' %> fl">
   <a href="javascript:void(0);" class="newsGrey">
-    <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content.include?('9') ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
+    <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id),
                 :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
     <!--:onmouseover => "message_titile_show($(this),event)",-->
     <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -18,14 +18,14 @@
   <p>真实姓名：<%= User.find(ma.course_message_id).realname %></p>
   <p>申请课程：<%= Course.find(ma.course_id).name%></p>
   <div class="fl">课程描述：</div>
-  <div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div>  <p>申请职位：<%= ma.content.include?('9')  ? "教师" : "教辅"%></p>
+  <div class="ml60"><%= Course.find(ma.course_id).description.html_safe if Course.find(ma.course_id).description %></div>  <p>申请职位：<%=ma.content && ma.content.include?('9')  ? "教师" : "教辅"%></p>
 </div>
 <li class="<%=(ma.status == 0 || ma.status.nil?) ? 'homepageHomeworkContentWarn2' : 'homepageHomeworkContentWarn' %> fl">
             <span id="deal_info_<%=ma.id%>">
               <% if ma.status == 0 || ma.status.nil?%>
-                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%>
+                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
                   |
-                  <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%>
+                  <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
              <% elsif ma.status == 1%> <!-- 同意 -->
                  您已经同意了该申请
              <% elsif ma.status == 2%> <!-- 拒绝 -->

app/views/users/_user_message_applide_action.html.erb

@@ -1,5 +1,5 @@
 <% if allow_to_show(ma) %>
-    ：<%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
+    <%= link_to "同意", allow_to_join_project_project_memberships_path(:project_id => ma.project_id,  :applied_message_id => ma.id), :remote => true, :method => :post, :class => "link-blue"%> |
     <%= link_to "拒绝", refused_allow_to_join_project_project_memberships_path(:project_id => ma.project_id, :applied_message_id => ma.id), :remote => true, :method => :get, :class => "link-blue" %>
 <% elsif ma.status == 4 %>
     <span class="fontGrey3">被拒绝</span>

app/views/users/_user_message_applied.html.erb

@@ -1,35 +1,51 @@
 <% if ma.class == AppliedMessage %>
     <!--申请加入项目-->
     <% if ma.applied_type == "ApplyAddSchools" %>
+        <% if ma.status == 1 || ma.status == 2 || ma.status == 3 || ma.status == 4 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.user), :width => "30", :height => "30"), user_path(ma.user), :target => '_blank' %></a>
+            <a href="javascript:void(0);">
+              <% if ma.status == 1 || ma.status == 2 || ma.status == 3 %>
+                <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
+              <% elsif ma.status == 4 %>
+                <%= link_to image_tag(url_to_avatar(ma.user), :width => "30", :height => "30"), user_path(ma.user), :target => '_blank' %>
+              <% end %>
+            </a>
           </li>
           <li class="homepageNewsPubType fl">
           <% if ma.status == 1 %>
-            <%=link_to ma.user, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
                 <li class="homepageNewsContent fl">
-                  <a class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank'><%= ma.name %>的申请，已通过</a>
+                  <a class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="<%= ma.name %>的申请，已通过">“<%= ma.name %>”的申请，已通过</a>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
           <% elsif ma.status == 2 %>
-                <%=link_to ma.user, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                <span class="newsBlue homepageNewsPublisher">系统提示</span>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
                 <li class="homepageNewsContent fl">
-                  <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank'><%= ma.applied.name %>的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”</a>
+                  <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank' title="<%= ma.applied.name %>的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”"><%= ma.applied.name %>的申请，因名称不合法，系统已将其更改为“<%= ma.name %>”</a>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
           <% elsif ma.status == 3 %>
-             <%=link_to ma.user, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                <span class="newsBlue homepageNewsPublisher">系统提示</span>
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">您添加新的高校（单位）：</span>
                 <li class="homepageNewsContent fl">
-                  <%= link_to ma.name + "的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料",  { :controller=> "my",:action => "account" } %>
+                  <%= link_to "“"+ma.name+"”" + "的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料",  { :controller=> "my",:action => "account" }, :title => "“#{ma.name}”的申请，因名称不合法，已被拒绝，请重新编辑您的基本资料", :target => '_blank'%>
                 </li>
                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-          <% end %>
+           <% elsif ma.status == 4 %>
+                <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+                <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>"> 申请了单位：</span>
+                <li class="homepageNewsContent fl">
+                <a  class ="#{ma.viewed == 0 ? 'newsBlack' : 'newsGrey'}" target = '_blank'>
+                  <%= link_to User.where("id=?", ma.applied_user_id).first.show_name + "提交了申请：添加新的单位“#{ma.name}”", unapplied_schools_path(), :title => "#{User.where("id=?", ma.applied_user_id).first.show_name}提交了申请：添加新的单位“#{ma.name}”" %></a>
+                </li>
+                <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+            <% end %>
           </li>
         </ul>
+        <% end %>
     <% elsif ma && ma.applied_type == "AppliedProject" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">

app/views/words/reply_to_syllabus.js.erb

@@ -1,2 +1,2 @@
 $("#reply_banner_<%=@syllabus.id %>").replaceWith("<%=escape_javascript(render :partial => 'users/reply_banner', :locals => {:count => @count, :activity => @syllabus, :user_activity_id => @syllabus.id}) %>");
-$("#reply_div_<%=@syllabus.id %>").html("<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @comments, :type => 'Syllabus'}) %>");
+$("#reply_div_<%=@syllabus.id %>").html("<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @comments, :type => 'Syllabus', :activity_id => @syllabus.id}) %>");

config/locales/zh.yml

@@ -388,7 +388,7 @@ zh:
   label_organization_name: 组织名称
   label_organization_list: 组织列表
   label_school_plural: 学校列表
-  label_applied_shcools: 单位名称列表
+  label_applied_shcools: 单位审核
   label_organization_new: 新建组织
   label_edit_organization: 编辑组织
   label_organization_edit: 修改组织