hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1752“竞赛通知”，“参加竞赛”时,左侧以及上方布局不同

Browse Source
dev_chuangbin
sw 11 years ago
parent 3545a8b0bc
commit 0bce2ae8f3
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/contests_controller.rb
Unescape View File

@ -134,9 +134,8 @@ class ContestsController < ApplicationController
@state = false @state = false
respond_to do |format| respond_to do |format|
layout_file = 'base_newcontest'
format.html { format.html {
render :layout => layout_file render :layout => 'base_newcontest'
} }
format.api format.api
end end

59
app/views/layouts/base_newcontest.html.erb
Unescape View File

@ -25,7 +25,7 @@
<%=render :partial => 'layouts/base_header'%> <%=render :partial => 'layouts/base_header'%>
<div id="main" class=""> <div id="main" class="">
<div class="top-content"> <div class="top-content">
<table> <table style="font-size: 13px !important;">
<tr> <tr>
<td class="info_font" style="width: 240px; color: #15bccf" rowspan="2"> <td class="info_font" style="width: 240px; color: #15bccf" rowspan="2">
<a href="http://<%= Setting.host_contest%>" style="color: #15bccf;"> <a href="http://<%= Setting.host_contest%>" style="color: #15bccf;">
@ -33,7 +33,9 @@
</a> </a>
</td> </td>
<td style="width: 430px; color: #15bccf"> <td style="width: 430px; color: #15bccf">
<strong><%= l(:label_user_location) %> : </strong> <strong>
<%= l(:label_user_location) %> :
</strong>
</td> </td>
<td rowspan="2" width="250px"> <td rowspan="2" width="250px">
<script type="text/javascript"> <script type="text/javascript">
@ -74,11 +76,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td><%=link_to l(:field_homepage), home_path %> > <td>
<a><%= l(:label_contest_innovate) %></a> > <%=link_to l(:field_homepage), home_path %> >
<span title="<%= @contest.name%>"> <a>
<%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %> <%= l(:label_contest_innovate) %>
</span> </a> >
<span title="<%= @contest.name%>">
<%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %>
</span>
</td> </td>
</tr> </tr>
</table> </table>
@ -89,7 +94,7 @@
<div class="spaceleft"> <div class="spaceleft">
<div class="inf_user_image"> <div class="inf_user_image">
<table> <table>
<tr> <tr style="line-height: normal;">
<td align="left" width="100px"> <td align="left" width="100px">
<%= image_tag(url_to_avatar(@user), :class => "avatar2") %> <%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
</td> </td>
@ -137,7 +142,7 @@
<!-- 参与人和参与项目的数量显示 --> <!-- 参与人和参与项目的数量显示 -->
<div class="user_fans"> <div class="user_fans">
<table width="240" border="0"> <table width="240" border="0">
<tr align="center" width="80px"> <tr align="center" width="80px" style="line-height: normal;">
<!--关注人数--> <!--关注人数-->
<td class="font_index"> <td class="font_index">
<span id="watcher_count_span"> <span id="watcher_count_span">
@ -152,27 +157,27 @@
<%=link_to "#{@contest.contesting_softapplications.count}",show_attendingcontest_contest_path(@contest) %> <%=link_to "#{@contest.contesting_softapplications.count}",show_attendingcontest_contest_path(@contest) %>
<% end %> <% end %>
</td> </td>
</tr>
</tr>
<tr class="font_aram"> <tr class="font_aram">
<td align="center" width="70px"> <%= l(:label_contest_watchers) %></td> <td align="center" width="70px">
<td align="center" width="70px"> <%= l(:label_contest_work) %></td> <%= l(:label_contest_watchers) %>
</td>
<td align="center" width="70px">
<%= l(:label_contest_work) %>
</td>
</tr> </tr>
</table> </table>
<div class="user_underline"></div> <div class="user_underline"></div>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>
<div class="inf_user_context"> <div class="inf_user_context" style="line-height: normal;margin-top: 10px;">
<div class="font_title_left"> <div class="font_title_left">
<%= l(:label_project_overview) %> <%= l(:label_project_overview) %>
</div> </div>
<div style="padding-bottom: 8px"> <div style="padding-bottom: 8px">
<% if @contest.description.size>0 %> <% if @contest.description.size>0 %>
<div class="font_lighter_sidebar"> <div class="font_lighter_sidebar">
<%= textilizable @contest.description %> <%= textilizable @contest.description %>
</div> </div>
<% else %> <% else %>
@ -205,7 +210,9 @@
<div class="user_fans"> <div class="user_fans">
<div class="user_underline"></div> <div class="user_underline"></div>
<div class="font_title_left"> <div class="font_title_left">
<strong><%= l(:label_x_followers, :count => @contest.watcher_users.count) %></strong> <strong>
<%= l(:label_x_followers, :count => @contest.watcher_users.count) %>
</strong>
<% if show_more_fans?(@contest) %> <% if show_more_fans?(@contest) %>
<span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), show_contest_user_contest_path(@contest) %></span> <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), show_contest_user_contest_path(@contest) %></span>
<% end %> <% end %>
@ -234,9 +241,15 @@
<% if display_main_menu?(@contest) %> <% if display_main_menu?(@contest) %>
<div class="tabs_new"> <div class="tabs_new">
<ul> <ul>
<li><%= link_to l(:label_contest_notification), contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %></li> <li>
<li><%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %></li> <%= link_to l(:label_contest_notification), contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %>
<li><%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %></li> </li>
<li>
<%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %>
</li>
<li>
<%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %>
</li>
</ul> </ul>
</div> </div>
<% end %> <% end %>
@ -251,7 +264,9 @@
</div> </div>
<div id="ajax-indicator" style="display:none;"> <div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span> <span>
<%= l(:label_loading) %>
</span>
</div> </div>
<div id="ajax-modal" style="display:none;"></div> <div id="ajax-modal" style="display:none;"></div>

Write Preview
Loading…
Cancel
Save