Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

app/helpers/application_helper.rb

@@ -1080,7 +1080,7 @@ module ApplicationHelper
       elsif @user
         title << @user.try(:realname)
       else
-        title << User.current.try(:realname)
+        title << (User.current.id == 2 ? "未登录" : User.current.try(:realname))
       end
       if first_page.nil? || first_page.web_title.nil?
         title << Setting.app_title unless Setting.app_title == title.last

app/views/organizations/courses.js.erb

@@ -1,3 +1,3 @@
 $("#org_container_list").html('<%= escape_javascript( render :partial => 'organizations/org_container', :locals => {:containers => @containers})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_student_search").attr('href','<%= courses_organization_path(@organization, :type =>  @type) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => true, :flag => true %>');
+//$("#org_student_search").attr('href','<%#= courses_organization_path(@organization, :type =>  @type) %>');

app/views/organizations/projects.js.erb

@@ -1,3 +1,2 @@
 $("#org_container_list").html('<%= escape_javascript( render :partial => 'organizations/org_container', :locals => {:containers => @containers})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_student_search").attr('href','<%= projects_organization_path(@organization, :type =>  @type) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @container_count, :per_page_links => false, :remote => true, :flag => true %>');

app/views/organizations/students.js.erb

@@ -1,3 +1,2 @@
 $("#org_students_list").html('<%= escape_javascript( render :partial => 'organizations/org_students_list', :locals => {:org_students => @org_students})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @students_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_student_search").attr('href','<%= students_organization_path(@organization, :type =>  @type) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @students_count, :per_page_links => false, :remote => true, :flag => true %>');

app/views/organizations/teachers.js.erb

@@ -1,3 +1,2 @@
 $("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list', :locals => {:org_teachers => @org_teachers})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#org_teacher_search").attr('href','<%= teachers_organization_path(@organization, :type =>  @type) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => true, :flag => true %>');

app/views/users/_show_unlogged.html.erb

@@ -1 +1,3 @@
-<div class="visitor-box fontGrey2"><a href="javascript:vod(0);" class="linkBlue">登录</a> 后可添加回复</div>
+<div class="visitor-box fontGrey2">
+  <%= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>后可添加回复
+</div>

db/migrate/20160606064856_delete_anonymous_org.rb

@@ -0,0 +1,8 @@
+class DeleteAnonymousOrg < ActiveRecord::Migration
+  def up
+    OrgDocumentComment.where(:organization_id => 23, :creator_id => 2).delete_all
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160601073753) do
+ActiveRecord::Schema.define(:version => 20160606064856) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

public/stylesheets/users.css

@@ -1,4 +1,7 @@
 #RSide{ min-height:1px;}
+
+
+
 /* 左侧信息*/
 .users_info{background:#fff; padding:10px; width:230px;  padding-right:0px; margin-bottom:10px; }
 .pic_head{ width:214px; height:214px; border:1px solid #cbcbcb; padding:2px; position:relative;}