Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange

app/views/courses/syllabus.html.erb

@@ -58,7 +58,7 @@
                                 '取消大纲',
                                 {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id},
                                 :method => :delete,
-                                :data => {:confirm => l(:text_are_you_sure)},
+                                :data => {:confirm => '确定取消么'},
                                 :class => 'postOptionLink'
                         ) if User.current && User.current.id == @article.author.id %>
                   </li>

app/views/layouts/_new_feedback.html.erb

@@ -25,7 +25,7 @@
           <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
             <%#= l(:label_technical_support) %>
           <!--白&nbsp;&nbsp;&nbsp;羽</a>-->
-          <a target="hiddentab" href="http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad" style="color: #269ac9;">
+          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad" style="color: #269ac9;">
             请加入：师姐答疑群</a>
         </div>
       </div>

app/views/repositories/show.html.erb

@@ -17,7 +17,6 @@
             版本库地址：<%= h @repository.url %>
         <% end %>
         <!-- added by bai -->
-        <div class="fb"><a href="http://<%=Setting.host_name %>/forums/1/memos/1232" class=" c_blue ">点击查看如何提交代码</a></div>
         <div class="cl"></div>
       </div>
   <% else %>