Merge branch 'szzh' into develop

app/controllers/git_usage_controller.rb

@@ -1,6 +1,6 @@
 #added by baiyu
 class GitUsageController < ApplicationController
-  layout "base_projects"
+  layout "new_base"
   def ch_usage
     
   end

app/helpers/courses_helper.rb

@@ -35,7 +35,7 @@ module CoursesHelper
 
   #生成课程老师成员链接
   def course_teacher_link teacher_num
-    if User.current.member_of_course?(@course)
+    if User.current.member_of_course?(@course) || User.current.admin?
       link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue'
     else
       content_tag 'span',teacher_num, :class => 'info_foot_num c_blue'
@@ -44,7 +44,7 @@ module CoursesHelper
 
   #生成课程学生列表连接
   def course_student_link student_num
-    if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course))
+    if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?
       link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue'
     else
       content_tag 'span',student_num, :class => 'info_foot_num c_blue'

app/views/courses/_history.html.erb

@@ -18,6 +18,7 @@
                   <p>
                     <%= journal.notes.html_safe %>
                   </p>
+                  <div class="cl"></div>
                 </div>
                 <div class="ping_disfoot">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>

app/views/forums/_show_topics.html.erb

@@ -4,36 +4,40 @@
 <% if memos.any? %>
 	<% memos.each do |topic| %>
 	<table class="content-text-list">
-		<tr><td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%></td>
+		<tr>
-		<td>
+          <td colspan="2" valign="top" style="width: 50px;">
-		<table width="630px" border="0">
+            <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
-			<tr>
+          </td>
-				<td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), forum_memo_path(topic.forum, topic) %></td>
+            <td>
-				<td align="right" rowspan="3">
+            <table width="630px" border="0">
-				<table class="borad-count">
+                <tr>
-					<tr>
+                    <td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), forum_memo_path(topic.forum, topic) %></td>
-						<td align="center" class="borad-count-digit"><%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic) %></td>
+                    <td align="right" rowspan="3">
-					</tr>
+                    <table class="borad-count">
-					<tr>
+                        <tr>
-						<td align="center">回答</td>
+                            <td align="center" class="borad-count-digit"><%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic) %></td>
-					</tr>
+                        </tr>
-				</table></td>
+                        <tr>
-			</tr>
+                            <td align="center">回答</td>
-			<tr>
+                        </tr>
-				<td colspan="2" ><span class="font_description">		</span></td>
+                    </table></td>
-			</tr>
+                </tr>
-			<tr>
+                <tr>
-				<td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_at, topic.author %>
+                    <td colspan="2" ><span class="font_description">		</span></td>
-                  <span class="font_description2">
+                </tr>
-                    <% author = topic.last_reply.try(:author)%>
+                <tr>
-                    <% if author%>
+                    <td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_at, topic.author %>
-                        最后回复：<%=link_to_user author %>
+                      <span class="font_description2">
-                    <% end%>
+                        <% author = topic.last_reply.try(:author)%>
-                  </span>
+                        <% if author%>
-					<br />
+                            最后回复：<%=link_to_user author %>
-				</span></td>
+                        <% end%>
-			</tr>
+                      </span>
-		</table></td>
+                        <br />
+                    </span></td>
+                </tr>
+            </table>
+            </td>
 		</tr>
 	</table>
 	<% end %>

app/views/mailer/send_for_user_activities.html.erb

@@ -49,7 +49,7 @@
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:label_project_notice_reply) %></span>
 
-                  <%= link_to truncate(course_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
                   %>
@@ -342,7 +342,7 @@
                               :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
                   <span class="wmail_txt" style="float:left; margin-right:5px;color:#ACAEB1;"><%= l(:lable_project_mail_notice_reply) %></span>
 
-                  <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
+                  <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value),
                               :class => 'wmail_info',
                               :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
                   <span class="wmail_date" style="color:#6e6e6e; float:left;display:block; margin-left:40px;"><%= format_time(project_news_comment.created_on) %></span>

app/views/words/_journal_reply_items.html.erb

@@ -24,6 +24,7 @@
         <p>
           <%= reply.notes.html_safe %>
         </p>
+        <div class="cl"></div>
             <span class="c_grey fl">
               <%= format_time reply.created_on %>
             </span>

config/locales/zh.yml

@@ -784,6 +784,8 @@ zh:
   label_project_newshare: "分享了"
   label_project_notice: "发布了通知："
   label_project_notice_reply: "回复了通知："
+  label_course_notice_point: "通知有了新的回复！"
+  lable_project_notice_point: "新闻有了新的回复！"
   label_project_mail_notice: "发布了新闻："
   lable_project_mail_notice_reply: "回复了新闻："
   label_project_issue: "发布了问题："

public/themes/redpenny-master/stylesheets/application.css

@@ -1635,6 +1635,7 @@ img.avatar {
   display: block;
   width: 38px;
   height: 38px;
+    max-width: none;
 }