diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 677416a6d..72e7ce221 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -19,7 +19,7 @@
<%= f.text_area :content, :required => true, :id => 'editor02' %>
-
+
<%= l(:label_attachment_plural) %>
<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index f17c7284a..1b6336985 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -184,8 +184,8 @@
<% find_new_forum_topics(11).each do |topic|%>
-
- <%= 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;" %>
<%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 292e07fbe..329d205af 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -23,17 +23,17 @@
<%= image_tag(@logoLink, size:'75x75') %>
-
+
<% 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'}%>
<% 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'}%>
<% end %>
<% end %>
@@ -144,8 +144,8 @@
<% find_new_forum_topics(10).each do |topic|%>
-
- <%= 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;" %>
<%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 3fdee2a97..0a69b1f78 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -100,7 +100,7 @@
<% find_new_forum_topics(7).each do |topic|%>
- <%= 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 %>
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index cdfacf9ed..f7756e5b8 100644
--- a/public/stylesheets/welcome.css
+++ b/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;
}
- /************************** 贴吧动态 结束 ****************************
\ No newline at end of file
+ /************************** 贴吧动态 结束 ****************************/
+ /************************** 学校课程 开始 ****************************/
+ .course{
+
+ }
+ .course .font_welcome_school{
+ font-family: Tahoma,"Microsoft YaHei";
+ font-weight: bold;
+ font-size: 20px;
+ color:#e8770d;
+}
+/************************** 学校课程 结束 ****************************/
\ No newline at end of file