jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

主页讨论吧动态前显示吧名

This commit is contained in:
z9hang 2014-05-08 17:37:38 +08:00
parent 3caedbdb85
commit 268dc1acce
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/forums/show.html.erb
View File

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

2
app/views/welcome/index.html.erb
View File

@ -100,7 +100,7 @@
<% find_new_forum_topics(7).each do |topic|%> <% find_new_forum_topics(7).each do |topic|%>
<li class="message-brief-intro"> <li class="message-brief-intro">
<div class='memo_title'> <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>
<div class='memo_attr'> <div class='memo_attr'>
<span class='memo_timestamp'> <span class='memo_timestamp'>

11
db/schema.rb
View File

@ -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", ["project_id"], :name => "time_entries_project_id"
add_index "time_entries", ["user_id"], :name => "index_time_entries_on_user_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| create_table "tokens", :force => true do |t|
t.integer "user_id", :default => 0, :null => false t.integer "user_id", :default => 0, :null => false
t.string "action", :limit => 30, :default => "", :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", "tracker_id", "old_status_id"], :name => "wkfs_role_tracker_old_status"
add_index "workflows", ["role_id"], :name => "index_workflows_on_role_id" 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 end

10
public/stylesheets/welcome.css
View File

@ -405,6 +405,16 @@ a.attachments_list_color {
background: url('../images/list-icon.png') no-repeat scroll left center; background: url('../images/list-icon.png') no-repeat scroll left center;
font-size: 10pt; 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{ .memo_activity .memo_attr{
margin-left: 20px; margin-left: 20px;