From 52af5e43033df2c5a101ea13f2cfd74c7088e7f2 Mon Sep 17 00:00:00 2001
From: linchun <sxszwlc@sina.cn>
Date: Thu, 17 Mar 2016 15:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=95=8C=E9=9D=A2=E5=A4=9A=E4=B8=AA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E9=A2=98=E7=9B=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb            | 4 ++--
 app/views/admin/course_resource_list.html.erb  | 4 +++-
 app/views/admin/excellent_courses.html.erb     | 4 +++-
 app/views/admin/latest_login_teachers.html.erb | 2 ++
 app/views/admin/organization.html.erb          | 2 +-
 app/views/admin/project_resource_list.html.erb | 4 +++-
 config/locales/en.yml                          | 3 +++
 config/locales/zh.yml                          | 1 +
 8 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 66c35ed6b..416088e9a 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -390,8 +390,8 @@ class AdminController < ApplicationController
 
   #组织
   def organization
-    #@organizations = Organization.find_by_sql("SELECT * FROM organizations ORDER BY created_at DESC")
-    @organizations = Organization.all.order("created_at desc")
+    @organizations = Organization.find_by_sql("SELECT * FROM organizations ORDER BY created_at DESC")
+    #@organizations = Organization.all.order("created_at desc")
     respond_to do |format|
       format.html
     end
diff --git a/app/views/admin/course_resource_list.html.erb b/app/views/admin/course_resource_list.html.erb
index fdca986c9..2e83a96aa 100644
--- a/app/views/admin/course_resource_list.html.erb
+++ b/app/views/admin/course_resource_list.html.erb
@@ -61,4 +61,6 @@
 
 <div class="pagination">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-</div>
\ No newline at end of file
+</div>
+
+<% html_title(l(:label_course_resource_list)) -%>
\ No newline at end of file
diff --git a/app/views/admin/excellent_courses.html.erb b/app/views/admin/excellent_courses.html.erb
index e21ba32aa..59426455a 100644
--- a/app/views/admin/excellent_courses.html.erb
+++ b/app/views/admin/excellent_courses.html.erb
@@ -72,4 +72,6 @@
     <% end %>
     </tbody>
   </table>
-</div>
\ No newline at end of file
+</div>
+
+<% html_title(l(:label_excellent_courses_list)) -%>
\ No newline at end of file
diff --git a/app/views/admin/latest_login_teachers.html.erb b/app/views/admin/latest_login_teachers.html.erb
index 3c4eb3c5b..c1889bce1 100644
--- a/app/views/admin/latest_login_teachers.html.erb
+++ b/app/views/admin/latest_login_teachers.html.erb
@@ -88,3 +88,5 @@
 <div class="pagination">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
 </div>
+
+<% html_title(l(:label_latest_login_teacher_list)) -%>
\ No newline at end of file
diff --git a/app/views/admin/organization.html.erb b/app/views/admin/organization.html.erb
index 582b8b44a..fe5fdb391 100644
--- a/app/views/admin/organization.html.erb
+++ b/app/views/admin/organization.html.erb
@@ -40,4 +40,4 @@
   </table>
 </div>
 
-<% html_title(l(:label_project_plural)) -%>
+<!% html_title(l(:llabel_organization_list)) -%>
diff --git a/app/views/admin/project_resource_list.html.erb b/app/views/admin/project_resource_list.html.erb
index e82831546..8e8bd8c92 100644
--- a/app/views/admin/project_resource_list.html.erb
+++ b/app/views/admin/project_resource_list.html.erb
@@ -61,4 +61,6 @@
 
 <div class="pagination">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-</div>
\ No newline at end of file
+</div>
+
+<% html_title(l(:label_project_resource_list)) -%>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a82c6b502..033f12ad2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1523,6 +1523,9 @@ en:
   label_excellent_courses_list: excellent_courses
   label_course_resource_list: course_resource_list
   label_project_resource_list: project_resource_list
+  label_organization_list: organzation_list
+  label_latest_login_teacher_list: latest_login_teacher_list
+  label_latest_login_user_list: latest_login_teacher_list
 
   #api
   label_recently_updated_notification: Recently updated notification
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1e4bdd90e..d36117556 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -563,6 +563,7 @@ zh:
   label_overall_activity: 活动概览
   label_new: 新建
   label_latest_login_user_list: 最近登录用户列表
+  label_latest_login_teacher_list: 最近登录教师列表
 
   label_logged_as: 登录为
   label_environment: 环境