From 718fa65fc4c11bc5b3a9feeea4c935e188973bb5 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Fri, 8 Nov 2013 20:54:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E4=B8=AA=E7=95=8C=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=8D=8F=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/index.html.erb | 2 +- app/views/projects/homework.html.erb | 18 ++++--------- app/views/projects/show.html.erb | 26 ++++++++----------- app/views/users/_course_form.html.erb | 4 ++- app/views/users/_my_course.html.erb | 2 +- app/views/users/_my_joinedcourse.html.erb | 2 +- app/views/users/user_projects.html.erb | 3 ++- public/stylesheets/application.css | 15 ++++++++++- .../stylesheets/application.css | 3 +-- 9 files changed, 39 insertions(+), 36 deletions(-) diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index 9386a664..b4c23fd7 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -46,7 +46,7 @@ <% end %> --> -
+
<% if @newss.empty? %>

<%= l(:label_no_data) %> diff --git a/app/views/projects/homework.html.erb b/app/views/projects/homework.html.erb index 06d25e41..e015e402 100644 --- a/app/views/projects/homework.html.erb +++ b/app/views/projects/homework.html.erb @@ -1,17 +1,9 @@ - -

- - - - -
<%= l(:label_course_homework_list)%><% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%> - - - <%= link_to(l(:label_course_homework_new), {:controller => 'projects', :action => 'new_homework'}, :class => 'icon icon-add') %> - - - <% end %>
+ +
+ <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%> + <%= link_to(l(:label_course_homework_new), {:controller => 'projects', :action => 'new_homework'}, :class => 'icon icon-add') %> + <% end %>
<%= render :partial => 'bids/bid_homework_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 4464f394..836898e2 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,17 +1,15 @@ -

- <% if @events_by_day.size >0 %> -

-

+<% if @events_by_day.size >0 %> +
+

<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>

-
- <% @events_by_day.keys.sort.reverse.each do |day| %> -

+ + <% @events_by_day.keys.sort.reverse.each do |day| %>
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> -
- +
+
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%> @@ -48,11 +46,10 @@
    <%= pagination_links_full @events_pages%>
- - + - <% else %> -

+<% else %> +

@@ -66,6 +63,5 @@
<%= image_tag(url_to_avatar(@user), :class => "avatar") %>
-

+
<% end %> -

\ No newline at end of file diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb index 023b5750..b3cc6752 100644 --- a/app/views/users/_course_form.html.erb +++ b/app/views/users/_course_form.html.erb @@ -1,3 +1,4 @@ +
    <% for membership in @memberships %>
  • @@ -48,5 +49,6 @@ <% end %> -
+ +
<%= call_hook :view_account_left_bottom, :user => @user %> \ No newline at end of file diff --git a/app/views/users/_my_course.html.erb b/app/views/users/_my_course.html.erb index b2c68d3d..0d2dfa50 100644 --- a/app/views/users/_my_course.html.erb +++ b/app/views/users/_my_course.html.erb @@ -1,4 +1,4 @@ -
+
<% if @memberships.empty? %> <% if @user != User.current %>

diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb index fe96bbf1..1471dfd7 100644 --- a/app/views/users/_my_joinedcourse.html.erb +++ b/app/views/users/_my_joinedcourse.html.erb @@ -1,4 +1,4 @@ -

+
<% if @memberships.empty? %> <% if @user != User.current %>

diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 57a42742..ca055f1b 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -1,10 +1,11 @@

温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~

+
<% if @user == User.current %> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> <% end %> +

<%= watch_projects @state%> - <% unless @memberships.empty? %>

    diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c46e73f9..470568e1 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -11,12 +11,25 @@ h4 {border-bottom: 1px dotted #bbb;} /*new by huang*/ /**/ -.content-title-top{ +.underline-evreycontent{ + margin-bottom: 10px; + border-bottom: 1px dashed rgb(204, 204, 204); + width: 660px; +} + +.content-title-top-avtive{ padding-bottom: 15px; padding-left: 5px; + padding-top: 5px; +} + +.content-title-top{ + padding-bottom: 20px; + padding-left: 5px; } .content-text-list{ + margin-bottom: 10px; border-bottom: 1px dashed rgb(204, 204, 204); width: 580px; } diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index f92f1fed..b6da6bc3 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1204,8 +1204,7 @@ a.root { padding-bottom: 10px; margin-bottom: 0px; /*background-color: #f5f5f5;*/ - border-bottom: 1px solid #e3c3ca; - border-bottom: 1px solid #e3c3ca; + border-bottom: 1px dashed rgb(204, 204, 204); /*-webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px;