-
+
+
+
+
-
-
-
-
-
@@ -118,9 +129,7 @@
-
-
@@ -136,7 +145,7 @@
<%= link_to l(:label_homework_commit), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%>
<% else %>
<%= link_to l(:label_homework_info), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%>
-
+
<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index bf8d39881..06a574991 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -216,7 +216,9 @@ ul.tool li{list-style-type:none;
font-family:微软雅黑;
font-weight:bold;
font-size:16px;
- color:#4d4d4d;
+ color:#4d4d4d;
+ word-wrap: break-word;
+ word-break: break-all;
}
.font_lighter{
font-family:微软雅黑;
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 92d1e6e6c..29e08fb30 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -1781,6 +1781,18 @@ a.bid_user {
color:#acaeb1;
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 {
font-family:微软雅黑;
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;
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
cursor: pointer;
-}
\ No newline at end of file
+}
+
+a.font-user-color{
+ color: #FFFFFF;
+ width:113px;
+ background-color: #3676c8;
+ padding: 0px;
+ margin: 0px;
+}
<%= l(:label_course_view) %> | |
<%=l(:label_course_view) %> | +<%= h @bid.name %> |
<%= h @bid.name %> | -|
<%=link_to l(:label_course_return), project_path(@bid.courses.first) %> - - <% if @user != User.current %> + | + <% if @user != User.current %> <%= watcher_link(@bid, User.current) %> - <% end %> - | -
<%= link_to l(:label_course_return), project_path(@bid.courses.first), :class => 'font-user-color' %> | +<%= link_to "返回个人主页", user_path(User.current), :class => 'font-user-color'%> + |
+
+
+
+
+
+ <%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %> | @@ -60,17 +69,19 @@|
<%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %> | |
<%= l(:label_limit_time) %>: <%= @bid.deadline %> | |
+
+ |
+ 作业来源于<%= 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))) %>
+
<% 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))) %> |