Merge remote-tracking branch 'origin/szzh' into szzh

app/views/forums/show.html.erb

@@ -19,7 +19,7 @@
 		<p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor02' %></p>
 		<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>
 		<br/>
-		<p>             
+		<p>
 			<%= l(:label_attachment_plural) %><br />
 			<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
 		</p>

app/views/welcome/contest.html.erb

@@ -184,8 +184,8 @@
 			<% find_new_forum_topics(11).each do |topic|%>
 			<li class="message-brief-intro" style="min-height: 60px; line-height:2em; ">
 				<div  style="display: inline-block; width: 100%;">
-				  <span style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				  <span class="memo_activity"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				    <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
+                    <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
 				  </span>
 				<br>
 				<span style="margin-left: 24px; color: rgb(172, 174, 177); white-space: nowrap; font-size：　9pt !important;;"><%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前</span>

app/views/welcome/course.html.erb

@@ -23,17 +23,17 @@
 			<%= image_tag(@logoLink, size:'75x75') %>
 
 		</div>
-		<div class="welcome_left" >
+		<div class="course welcome_left" >
 			<br />
 			<span class="font_welcome_school"> <% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
 				<% else%>
 					<% if params[:school_id] == "0" %>
 					<% else %>
 						<% if params[:school_id].nil? %>
-							<%= School.find(User.current.user_extensions.school.id).name %>
+							<%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course',:school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school',:method => 'get'}%>
 							<br />
 						<% else %>
-							<%= School.find(params[:school_id]).name %>
+							<%= link_to School.find(params[:school_id]).name ,options={:action => 'course',:school_id => params[:school_id]}, html_options={:class => 'font_welcome_school',:method => 'get'}%>
 							<br />
 						<% end %>
 					<% end %>
@@ -144,8 +144,8 @@
 			<% find_new_forum_topics(10).each do |topic|%>
 			<li class="message-brief-intro" style="min-height: 65px; line-height:2em; ">
 				<div  style="display: inline-block; width: 100%;">
-				  <span style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				  <span class="memo_activity" style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				    <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
+                    <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
 				  </span>
 				<br>
 				<span style="margin-left: 24px; color: rgb(172, 174, 177); white-space: nowrap; font-size:9pt !important;;"><%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前</span>

app/views/welcome/index.html.erb

@@ -100,7 +100,7 @@
 		<% find_new_forum_topics(7).each do |topic|%>
 			<li class="message-brief-intro">
 				<div class='memo_title'>
-					<%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
+					<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
 				</div>
 				<div class='memo_attr'>
 					<span class='memo_timestamp'>

public/stylesheets/welcome.css

@@ -405,6 +405,16 @@ a.attachments_list_color {
     background: url('../images/list-icon.png') no-repeat scroll left center;
     font-size: 10pt;
 }
+ /*帖子标题前吧名*/
+ .memo_activity .memo_Bar_title{
+     display: inline-block;
+     /*color: #59ceff;*/
+     color: #e8770d;
+     font-weight: bold;
+     margin-bottom: 3px;
+     padding-left: 0px;
+     font-size: 10pt;
+ }
 /*帖子的各种属性*/
 .memo_activity .memo_attr{
     margin-left: 20px;
@@ -442,4 +452,15 @@ a.attachments_list_color {
     font-size: 10pt;
 }
 
- /************************** 贴吧动态 结束 ****************************
+ /************************** 贴吧动态 结束 ****************************/
+ /************************** 学校课程 开始 ****************************/
+     .course{
+
+     }
+    .course .font_welcome_school{
+	font-family: Tahoma,"Microsoft YaHei";
+	font-weight: bold;
+	font-size: 20px;
+	color:#e8770d;
+}
+/************************** 学校课程 结束 ****************************/