From 3ea198dc3da7930514ddb40db42e7bb8b2970730 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 24 Aug 2015 18:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=8F=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 23 +--- app/views/layouts/_logined_header.html.erb | 4 +- app/views/users/user_homeworks.html.erb | 117 +++++++++++++++++++-- public/images/homepage_icon.png | Bin 6191 -> 10318 bytes public/stylesheets/images/icons.png | Bin 2479 -> 5425 bytes public/stylesheets/new_public.css | 57 +++++++++- 6 files changed, 168 insertions(+), 33 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 72027a118..e9b420343 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -302,26 +302,11 @@ class UsersController < ApplicationController end # end - # added by huang + #用户作业列表 def user_homeworks - # @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current)) - # @memberships = [] - # @membership.each do |membership| - # if membership.project.project_type == 1 - # @memberships << membership - # end - # end - # @bid = [] - # @memberships.each do |membership| - # @bid += membership.project.homeworks - # end - # @bid = @bid.group_by {|bid| bid.courses.first.id} - # unless User.current.admin? - # if !@user.active? - # render_404 - # return - # end - # end + respond_to do |format| + format.html {render :layout => 'new_base_user'} + end end diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index ee3f2f0ab..b1483d70c 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -5,12 +5,12 @@