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

修改首页问题

This commit is contained in:
nwb 2014-07-18 15:00:03 +08:00
parent b655f0c7b0
commit 0443f2085e
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,16 +60,10 @@
<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank" %></span>
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<<<<<<< HEAD
<% projects = find_miracle_project(10, 3) %>
<% projects.map do |project| %>
<li style="position:relative;height:6em;" class='<%= cycle("odd", "even") %>'>
=======
<% #projects = find_miracle_project(10, 3) %>
<% @projects.map do |project| %>
<!--<%# cache cache_key_for_project(project) do %> -->
<li style="overflow:auto;word-break:break-all;height:100%;" class='<%= cycle("odd", "even") %>'>
>>>>>>> remotes/origin/szzh
<div style="float: left;">
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
</div>
@ -115,10 +109,7 @@
:id => "tooltip-#{project.id}" %>
</div>
</li>
<<<<<<< HEAD
=======
<!--<%#end %> -->
>>>>>>> remotes/origin/szzh
<% end; reset_cycle %>
</ul>
</div>
@ -131,10 +122,7 @@
<div class="user-message-box-list" style="margin-top: 10px;">
<%activities = find_all_activities%>
<% activities.each do |event| %>
<<<<<<< HEAD
=======
<!--<%# cache cache_key_for_event(event) do %> -->
>>>>>>> remotes/origin/szzh
<li style="display: block;height:60px; padding-bottom: 4px;">
<div class="inner-right" style="float: left; height: 100%; ">
<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
@ -145,10 +133,7 @@
<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
</div>
</li>
<<<<<<< HEAD
=======
<!--<%#end %> --><!-- cache -->
>>>>>>> remotes/origin/szzh
<% end %>
</div>
</ul>
@ -156,6 +141,7 @@
<div class="right" style="float: right; width: 48%; ">
<ul class="welcome-message-list">
<!--<% cache 'forum_links' do %> -->
<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;">
<h3 style="color: rgb(21, 188, 207);">
<strong>贴吧动态</strong>
@ -163,9 +149,11 @@
<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3>
<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
</div>
<!--<%end %> -->
<div class="welcome-box-list-new memo_activity">
<% topics = find_new_forum_topics(7) %>
<% topics.includes(:forum, :last_reply, :author).each do |topic|%>
<!--<% cache cache_key_for_topic(topic) do %> -->
<li class="message-brief-intro">
<div class='memo_title text_nowrap'>
<%= 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 %>
@ -185,6 +173,7 @@
</span>
</div>
</li>
<!--<%end %> --> <!-- cache -->
<% end %>
</div>
</ul>