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/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/db/schema.rb b/db/schema.rb
index fe23a1caa..2477e5a3b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -755,11 +755,6 @@ ActiveRecord::Schema.define(:version => 20140428013546) do
add_index "time_entries", ["project_id"], :name => "time_entries_project_id"
add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_id"
- create_table "tmp", :force => true do |t|
- t.string "name"
- t.string "part_number"
- end
-
create_table "tokens", :force => true do |t|
t.integer "user_id", :default => 0, :null => false
t.string "action", :limit => 30, :default => "", :null => false
@@ -966,10 +961,4 @@ ActiveRecord::Schema.define(:version => 20140428013546) do
add_index "workflows", ["role_id", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id"
- create_table "yans", :force => true do |t|
- t.string "name"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- end
-
end
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index cdfacf9ed..2533305f7 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;