From 1be0a7d23f0a9a7cfad331c32c4ff955621fbf33 Mon Sep 17 00:00:00 2001 From: baiyu Date: Wed, 16 Oct 2013 22:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E2=80=9C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E2=80=9D=E5=92=8C?= =?UTF-8?q?=E2=80=9C=E8=BF=94=E5=9B=9E=E8=AF=BE=E7=A8=8B=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_homework.html.erb | 59 +++++++++++-------- public/stylesheets/application.css | 4 +- .../stylesheets/application.css | 22 ++++++- 3 files changed, 58 insertions(+), 27 deletions(-) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 0917e9bcf..84fe04b08 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -21,11 +21,11 @@
<% if session[:enterprise_college] == 2 %> - <%=render :partial => 'layouts/base_enterprise_header'%> + <%= render :partial => 'layouts/base_enterprise_header'%> <% elsif session[:enterprise_college] == 1 %> - <%=render :partial => 'layouts/base_college_header'%> + <%= render :partial => 'layouts/base_college_header'%> <% else %> - <%=render :partial => 'layouts/base_header'%> + <%= render :partial => 'layouts/base_header'%> <% end %>
@@ -33,26 +33,35 @@
- +
+ + + - + - - - - + <% end %> + +
<%= 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'%> +
-
-
- - -
+
+
+ + + +
@@ -60,17 +69,19 @@ - + <% unless @bid.parent_id.nil?%> - + 作业来源于<%= 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))) %> + - <% end %> + <% end %>
<%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %>
<%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %>
<%= l(:label_limit_time) %>： <%= @bid.deadline %>
+
+
<% 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))) %>
@@ -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; +}