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

修改了“返回个人主页”和“返回课程”，修改了样式

This commit is contained in:
baiyu 2013-10-16 22:02:05 +08:00
parent 19b030dd23
commit 1be0a7d23f
3 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,11 +21,11 @@
<div id="wrapper3"> <div id="wrapper3">
<% if session[:enterprise_college] == 2 %> <% if session[:enterprise_college] == 2 %>
<%=render :partial => 'layouts/base_enterprise_header'%> <%= render :partial => 'layouts/base_enterprise_header'%>
<% elsif session[:enterprise_college] == 1 %> <% elsif session[:enterprise_college] == 1 %>
<%=render :partial => 'layouts/base_college_header'%> <%= render :partial => 'layouts/base_college_header'%>
<% else %> <% else %>
<%=render :partial => 'layouts/base_header'%> <%= render :partial => 'layouts/base_header'%>
<% end %> <% end %>
<div id="main" class=""> <div id="main" class="">
@ -33,26 +33,35 @@
<div class="main_context"> <div class="main_context">
<div class="spaceleft"> <div class="spaceleft">
<div> <div>
<table style="width: 232px ; height: 80px;"> <!-- modified by bai --> <table style="width: 232px ; height: 80px;">
<!-- modified by bai -->
<!-- <tr>
<td><span style="padding-left: 8px; "><%= l(:label_course_view) %></span>
</td>
</tr> -->
<tr><td style="padding-left: 8px"><%= l(:label_course_view) %></td></tr>
<tr> <tr>
<td style="padding-left: 8px"><%=l(:label_course_view) %></td> <td class="info_font"><span style="color:#ed8924"><%= h @bid.name %></span></td>
</tr> </tr>
<tr> <tr>
<td class="info_font" style=" word-wrap: break-word; word-break: break-all; color: #ed8924 "><%= h @bid.name %></td> <td>
</tr> <span class="bid_course" style="padding-left: 8px"> <% if @user != User.current %>
<tr><td style="padding-left: 8px"><a class="fontcolor"><%=link_to l(:label_course_return), project_path(@bid.courses.first) %></a>
<span style="padding-left: 8px">
<% if @user != User.current %>
<%= watcher_link(@bid, User.current) %> <%= watcher_link(@bid, User.current) %>
<% end %> <% end %> </span></td>
</span></td> </tr>
</tr> <tr><table><tr>
<td align="center"><%= link_to l(:label_course_return), project_path(@bid.courses.first), :class => 'font-user-color' %></td>
<td align="center"><%= link_to "返回个人主页", user_path(User.current), :class => 'font-user-color'%>
</td></tr></table>
</table> </table>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>
<!--count-->
<!-- info -->
<div class="inf_user_image"> <!-- info -->
<div class="inf_user_image">
<table> <table>
<tr> <tr>
<td><%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></td> <td><%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></td>
@ -60,17 +69,19 @@
<tr> <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> <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>
<tr> <tr>
<td><%= l(:label_limit_time) %>： <%= @bid.deadline %></td> <td><%= l(:label_limit_time) %>： <%= @bid.deadline %></td>
</tr> </tr>
<% unless @bid.parent_id.nil?%> <% unless @bid.parent_id.nil?%>
<tr> <tr>
<td><div style=" color: rgb(255, 0, 0); width:200px"> <td>
<div style=" color: rgb(255, 0, 0); width:200px">
<% author=Bid.find(@bid.parent_id).author%> <% author=Bid.find(@bid.parent_id).author%>
作业来源于<%= link_to(author.lastname+author.firstname, user_path(Bid.find(@bid.parent_id).author))%>的需求：<%= link_to(Bid.find(@bid.parent_id).name, respond_path(Bid.find(@bid.parent_id))) %></div></td> 作业来源于<%= link_to(author.lastname+author.firstname, user_path(Bid.find(@bid.parent_id).author))%>的需求：<%= link_to(Bid.find(@bid.parent_id).name, respond_path(Bid.find(@bid.parent_id))) %>
</div></td>
</tr> </tr>
<% end %> <% end %>
</table> </table>
</div> </div>
@ -118,9 +129,7 @@
</div> </div>
</div> </div>
<div class="user_underline"></div> <div class="user_underline"></div>
</div> </div>
</div> </div>
<!-- end --> <!-- end -->
</div> </div>
@ -136,7 +145,7 @@
<%= link_to l(:label_homework_commit), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%> <%= link_to l(:label_homework_commit), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%>
<% else %> <% else %>
<%= link_to l(:label_homework_info), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%> <%= link_to l(:label_homework_info), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%>
<% end %> <% end %>
</li> </li>
<!-- <li><%= link_to l(:label_homework_statistics), { :controller => 'bids', :action => 'homework_statistics' },:class => link_class(:homework_statistics)%></li> --> <!-- <li><%= link_to l(:label_homework_statistics), { :controller => 'bids', :action => 'homework_statistics' },:class => link_class(:homework_statistics)%></li> -->

4
public/stylesheets/application.css
View File

@ -216,7 +216,9 @@ ul.tool li{list-style-type:none;
font-family:微软雅黑; font-family:微软雅黑;
font-weight:bold; font-weight:bold;
font-size:16px; font-size:16px;
color:#4d4d4d; color:#4d4d4d;
word-wrap: break-word;
word-break: break-all;
} }
.font_lighter{ .font_lighter{
font-family:微软雅黑; font-family:微软雅黑;

22
public/themes/redpenny-master/stylesheets/application.css
View File

@ -1781,6 +1781,18 @@ a.bid_user {
color:#acaeb1; color:#acaeb1;
font-size:12px; font-size:12px;
} }
a.bid_course{
vertical-align:middle;
alignment-adjust:middle;
color: #FFFFFF;
/*width: 60px;*/
border-radius: 3px;
background-color: #15bccf;
margin-left: 10px;
font-size: 12px;
}
a.bids_user { a.bids_user {
font-family:微软雅黑; font-family:微软雅黑;
color:#15bccf; color:#15bccf;
@ -1837,4 +1849,12 @@ input[type="submit"] {
box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
cursor: pointer; cursor: pointer;
} }
a.font-user-color{
color: #FFFFFF;
width:113px;
background-color: #3676c8;
padding: 0px;
margin: 0px;
}