Merge branch 'szzh' into develop

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
       
     

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;}
 </style>
@@ -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%>
                         <span id="<%=bid.id %>_anonymous_comment" class="span_wping">
                           <% case bid.comment_status %>
                           <% when 0 %>

app/views/layouts/base_homework.html.erb

@@ -118,7 +118,7 @@
                         <% if (User.current.admin?||User.current.id==@bid.author_id) %>
                             <tr>
                               <td valign="top" style="padding-left: 8px; font-size: 15px" colspan="2">
-                                <% if @bid.open_anonymous_evaluation == 1%>
+                                <% if @bid.open_anonymous_evaluation == 1  && @bid.homeworks.count >= 2%>
                                  <span id="<%=@bid.id %>_anonymous_comment" class="span_wping">
                                       <% case @bid.comment_status %>
                                       <% when 0 %>

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 %>
     &nbsp;&nbsp;&nbsp;&nbsp;
     <%= link_to l(:label_course_join_student), join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>
     &nbsp;&nbsp;&nbsp;&nbsp;

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"

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;}