diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 2a5792e36..94717a4ce 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -163,7 +163,7 @@ class WelcomeController < ApplicationController return 0 elsif url.include?(Setting.host_user.gsub('/','')) - redirect_to(:controller => "users", :action => "index") + #redirect_to(:controller => "users", :action => "index") end diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index 8a6b276b3..107ee5bba 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -28,7 +28,6 @@ color: #fff; text-align: center; padding: 5px !important; - display: none; } .span_wping a:hover{ background-color:#03a1b3;} @@ -76,7 +75,7 @@ <% end %> <% end %> <% if (User.current.admin?||User.current.id==bid.author_id) %> - <% if bid.open_anonymous_evaluation == 1%> + <% if bid.open_anonymous_evaluation == 1 && bid.homeworks.count >= 2%> <% case bid.comment_status %> <% when 0 %> diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 811540323..c3028c8f1 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -118,7 +118,7 @@ <% if (User.current.admin?||User.current.id==@bid.author_id) %> - <% if @bid.open_anonymous_evaluation == 1%> + <% if @bid.open_anonymous_evaluation == 1 && @bid.homeworks.count >= 2%> <% case @bid.comment_status %> <% when 0 %> diff --git a/app/views/welcome/_more_course.html.erb b/app/views/welcome/_more_course.html.erb index 8d0f1564c..2c8d92719 100644 --- a/app/views/welcome/_more_course.html.erb +++ b/app/views/welcome/_more_course.html.erb @@ -1,8 +1,6 @@ <% if User.current.logged?%> - <% if User.current.user_extensions.identity == 0 %> <%= link_to(l(:label_course_new), {:controller => 'courses', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_course,nil, :global => true) %> - <% end %>      <%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>      diff --git a/db/schema.rb b/db/schema.rb index 2e664eaa7..973e2afbe 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20141119011439) do +ActiveRecord::Schema.define(:version => 20141120091234) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20141119011439) do t.string "disk_directory" t.integer "attachtype", :default => 1 t.integer "is_public", :default => 1 + t.integer "copy_from" end add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 19b68743a..b85b6ae73 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -42,7 +42,7 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;} .dis ul li.wdown a{padding-top:25px; color:#3d7ec2; margin-right:35px;} .wscore{ padding-top:25px; color:#888888; width:96px;} .dis ul li.wping{margin-left:12px; } -.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;} +.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:8px;} .dis ul li.wping a:hover{ background-color:#03a1b3;} ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px;line-height: 1.9; } .wlist span{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;} @@ -84,7 +84,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .ping_star span a:hover{background:url(images/star.png) -24px 0 no-repeat;} .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;} a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px; background:#15bccf; color:#fff; text-align:center;} -a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;} +a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;line-height: 1.9;} a:hover.ping_sub{ background:#14a8b9;} .recall{ border-top:1px solid #CCC; padding:5px 0;} .recall_head{ float:left;}