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

Merge branch 'szzh' into develop

This commit is contained in:
yanxd 2014-06-13 08:36:24 +08:00
parent 0536af6625 f8bfa83ae4
commit b58c5685ac
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,7 @@
</div>
</div>
<%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
<br>
<br/>
<% end %>
</div>
</div>

16
app/views/layouts/base_homework.html.erb
View File

@ -74,14 +74,6 @@
</span>
</td>
</tr>
<!-- <tr>
<td></td>
<td align="center">
<span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %>
<%= watcher_link(@bid, User.current) %>
<% end %> </span>
</td>
</tr> -->
</table>
</td>
</tr>
@ -97,7 +89,7 @@
</tr>
<tr>
<td class="font_lighter_sidebar" colspan="2" style="padding-left: 8px;"><%= project.description %></td>
<td class="font_lighter_sidebar" colspan="2" style="padding-left: 8px;"><%= textilizable project.description %></td>
</tr>
<tr>
@ -132,12 +124,6 @@
<div class="inf_user_image">
<table>
<!--
<tr>
<td style="text-align: justify ; text-justify: inter-ideograph; width: 180px"><%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td>
</tr>
-->
<tr>
<td><%= l(:label_limit_time) %>: <%= @bid.deadline %></td>
</tr>

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

@ -53,8 +53,8 @@
<div class="d-p-projectlist-box">
<ul class="d-p-projectlist">
<% projects = find_miracle_project(10, 3) %>
<% cache projects do %>
<% projects.map do |project| %>
<% cache "welcome_index_hotProject_ul_#{project}_li" do %>
<li style="position:relative;height:6em;" class='<%= cycle("odd", "even") %>'>
<div style="float: left;">
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
@ -75,9 +75,9 @@
:id => "tooltip-#{project.id}" %>
</div>
</li>
<% end %>
<% end; reset_cycle %>
</ul>
<% end %>
</div>
</div>
@ -87,8 +87,8 @@
<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'users', :action => 'index'}, :target => "_blank" %></span>
<div class="user-message-box-list" style="margin-top: 10px;">
<%activities = find_all_activities%>
<% cache activities do %>
<% activities.each do |event| %>
<% cache "welcome_index_userActivity_ul_#{event}_li" do %>
<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" %>
@ -99,8 +99,8 @@
<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>
<% end %>
<% end %><!-- cache -->
<% end %>
</div>
</ul>
</div>
@ -118,8 +118,8 @@
<% end %>
<div class="welcome-box-list-new memo_activity">
<% topics = find_new_forum_topics(7) %>
<% cache topics do %>
<% topics.each do |topic|%>
<% cache "welcome_index_memosActivity_ul_#{topic}_li" 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 %>
@ -139,8 +139,8 @@
</span>
</div>
</li>
<% end %>
<% end %> <!-- cache -->
<% end %>
</div>
</ul>
</div>