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

app/controllers/projects_controller.rb

@@ -418,6 +418,8 @@ class ProjectsController < ApplicationController
     @jour = @jours[@offset, @limit]
     @state = false
     @base_courses_tag = @project.project_type
+
+
     respond_to do |format|
       format.html{render :layout => 'base_courses' if @base_courses_tag==1}
       format.api

app/controllers/words_controller.rb

@@ -89,6 +89,14 @@ class WordsController < ApplicationController
     end
   end
 
+  def destroyJournal
+    @journalP=JournalsForMessage.find(params[:object_id])
+    @journalP.destroy
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def new
     @jour = JournalsForMessage.find(params[:journal_id]) if params[:journal_id]
     if @jour

app/views/layouts/_base_header.html.erb

@@ -44,6 +44,13 @@
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
                  <% hasCourse=true%>
 
+                <% _bool=false %>
+                <% User.current.courses.each do |course| %>
+                    <% if !course_endTime_timeout?(course) %>
+                          <% _bool=true %>
+                    <% end %>
+                <% end %>
+                <% if _bool %>
 				<li  id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
                     <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
@@ -53,11 +60,14 @@
                     <% end %>
                   </ul>
                 </li>
+                <% end %>
 
 				<% end -%>
               <% end %>
-              <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.project_domain} %>
 
+              <% if User.current.projects.count>0 %>
+              <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.project_domain} %>
                 <% if hasCourse %>
                     <ul class="project_sub_menu" style="top: 35px">
                 <% else %>
@@ -65,9 +75,10 @@
                 <% end %>
                 <% User.current.projects.each do |project| %>
                       <li><%= link_to project.name.truncate(10, omission: '...'), {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %></li>
-                  <% end %>
+                 <% end %>
                  </ul>
               </li>
+              <% end %>
 				<li style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
                 </li>
 			</ul>

app/views/projects/feedback.html.erb

@@ -78,6 +78,13 @@ function checkMaxLength() {
 							'#{l(:label_reply_plural)} #{journal.user.name}: ');
 							return false;"} %>
 			<% end %>
+
+              <% if User.current.logged? %>
+                  <% if journal.user_id==User.current.id|| User.current.admin? %>
+                      <%= link_to(l(:button_delete),{:controller => 'words', :action => 'destroyJournal', :object_id => journal.id},
+                                  :remote => true, :title => l(:button_delete)) %>
+                  <% end %>
+              <% end %>
 			</span>
 		</span>
 		<div style="clear: both;"></div>

app/views/welcome/_course_list.html.erb

@@ -6,11 +6,8 @@
       <!-- 上左下右 -->
       <div class='desc_item'>
                     <span class=''>
-                      <% if (course.school == nil) %>
+                      <%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
-                        <% else %>
-                        <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1:'), options={:action => 'course', :school_id => course.school.id}, html_options={:method => 'get'} %>
-                        <% end %>
                     </span>
                     <span class='font_bolder'>
                         <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
@@ -19,7 +16,11 @@
       </div>
       <div class='desc_item text_nowrap'>
         [<%= get_course_term course %>]
-        <%= link_to(course.name.truncate(30, omission: '...'), course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
+        <% if (course.school == nil) %>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <% else %>
+            <%= 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.to_s %>
         (<%= link_to "#{course.attachments.count.to_s}份", course_files_path(course) %>资料)

app/views/words/destroyJournal.js.erb

@@ -0,0 +1,3 @@
+<% if @journalP!=nil %>
+     $(".message-for-user").children("#word_li_<%=@journalP.id%>").remove();
+<% end %>

config/routes.rb

@@ -652,6 +652,7 @@ RedmineApp::Application.routes.draw do
   delete 'words/destroy', :to => 'words#destroy'
   get 'words/more', :to => 'words#more'
   get 'words/back', :to=> 'words#back'
+  get 'words/destroyJournal', :to => 'words#destroyJournal'
   ############## fq
   post 'calls/create', :to => 'bids#create'
   delete 'calls/destroy', :to => 'bids#destroy'
@@ -746,6 +747,7 @@ RedmineApp::Application.routes.draw do
 
   match 'words/add_brief_introdution', :controller => 'words', :action => 'add_brief_introdution'
 
+
   Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
     file = File.join(plugin_dir, "config/routes.rb")
     if File.exists?(file)