From 02295e5ca940f1dc62898864633e019199730128 Mon Sep 17 00:00:00 2001
From: Wen <wsm911120@126.com>
Date: Fri, 25 Apr 2014 09:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E4=B8=A5=E6=80=BB=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/school_controller.rb          |   6 ++
 app/views/school/index.html.erb               |   5 +-
 app/views/school/upload_logo.html.erb         |   1 +
 app/views/welcome/course.html.erb             |  59 ++++++++++++++----
 config/locales/zh.yml                         |   2 +-
 .../20140424072458_add_logolink_to_schools.rb |   5 ++
 db/schema.rb                                  |   3 +-
 public/images/transparent.png                 | Bin 0 -> 2904 bytes
 public/stylesheets/application.css            |   9 ++-
 9 files changed, 72 insertions(+), 18 deletions(-)
 create mode 100644 app/views/school/upload_logo.html.erb
 create mode 100644 db/migrate/20140424072458_add_logolink_to_schools.rb
 create mode 100644 public/images/transparent.png

diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index 3e12ba3b3..9ef935cf7 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -1,5 +1,11 @@
 class SchoolController < ApplicationController
   
+  before_filter :require_admin, :only => :upload_logo
+  
+  def upload_logo
+    
+  end
+  
   
   def index
     
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index 1277c0b4b..b24c3a677 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -19,7 +19,7 @@
 
 <script type="text/javascript">
 	function test(id){
-		location.href = "welcome/index?course.trustie.net&school_id="+id;
+		location.href = encodeURI('http://course.trustie.net&school_id=')+id;
 	}
 </script>
 <script type="text/javascript">
@@ -44,7 +44,8 @@
 
 <div>
 	<p>
-		<a href="welcome/index?course.trustie.net&school_id=0">全部学校</a>
+		<a href="http://course.trustie.net&school_id=0">全部学校</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<a href="http://course.trustie.net">我的学校</a>
 	</p>
 		<ul>
 			<li style="width: 40%; float: left">请选择省份:<%= select_tag "province", 
diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb
new file mode 100644
index 000000000..ecad26f59
--- /dev/null
+++ b/app/views/school/upload_logo.html.erb
@@ -0,0 +1 @@
+<input type="file" />
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index ff3938dc0..0554f561b 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -97,22 +97,55 @@
 		<div class="weixin-content">微信扫码</div>
 	</div> 
 	<div class="main-content-bar">
-	<div class="welcome_left" >
-			<span class="font_welcome_trustie">
-				<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
-				<% else%>
-					<% if params[:school_id] == "0" %>
-					<% else %>
-						<% if params[:school_id].nil? %>
-							<%= School.find(User.current.user_extensions.school.id).name %>
-							<br />
+		<div style="float: left">
+		  	
+
+			<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
+				<%= image_tag '/images/transparent.png', size: "75x75" %>
+			<% else%>
+				<% if params[:school_id] == "0" %>
+					<%= image_tag '/images/transparent.png', size: "75x75" %>
+				<% else %>
+					<% if params[:school_id].nil? %>
+						<% if School.find(User.current.user_extensions.school.id).logo_link.nil? %>
+							<%= image_tag '/images/transparent.png', size: "75x75" %>
 						<% else %>
-							<%= School.find(params[:school_id]).name %>
-							<br />
+							<%= image_tag School.find(User.current.user_extensions.school.id).logo_link, size: "75x75" %>
 						<% end %>
+						<br />
+					<% else %>
+						<%= image_tag School.find(params[:school_id]).logo_link, "75x75" %>
+						<br />
 					<% end %>
 				<% end %>
-				<%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
+			<% end %>	
+		</div>		
+	<div class="welcome_left" >
+	
+		<span class="font_welcome_school">
+			<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
+			<% else%>
+				<% if params[:school_id] == "0" %>
+				<% else %>
+					<% if params[:school_id].nil? %>
+
+						<%= School.find(User.current.user_extensions.school.id).name %>
+						<br />
+					<% else %>
+						<%= School.find(params[:school_id]).name %>
+						<br />
+					<% end %>
+				<% end %>
+			<% end %>
+			</span>
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> </span>
+			<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
+				<span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
+			<% else %>
+				<% if params[:school_id] == "0" %>
+					<span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
+				<% end %>
+			<% end %>
 	</div>
 	<div class="search-bar">
 		<%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course}%>	
@@ -145,7 +178,7 @@
 				<div class='desc_item' >
 					<span class=''>
 					<% course = Course.find_by_extra(project.identifier) %>
-					<%= course.teacher.user_extensions.occupation.try(:gsub, /(.+)$/, '\1:') %>
+					<%= course.school.name.try(:gsub, /(.+)$/, '\1:') %>
 					</span>
 					<span class='font_bolder'>
 					<%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ca2429b12..b3c20bcd8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1766,7 +1766,7 @@ zh:
   label_course_userd_by: 个课程引用
   
   
-  label_school_all: 学校列表
+  label_school_all: 中国高校
   
   
   role_of_course: 课程角色
diff --git a/db/migrate/20140424072458_add_logolink_to_schools.rb b/db/migrate/20140424072458_add_logolink_to_schools.rb
new file mode 100644
index 000000000..4c6d314c3
--- /dev/null
+++ b/db/migrate/20140424072458_add_logolink_to_schools.rb
@@ -0,0 +1,5 @@
+class AddLogolinkToSchools < ActiveRecord::Migration
+  def change
+    add_column :schools, :logo_link, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c82407286..072100595 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 => 20140421091020) do
+ActiveRecord::Schema.define(:version => 20140424072458) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -642,6 +642,7 @@ ActiveRecord::Schema.define(:version => 20140421091020) do
     t.string   "province"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.string   "logo_link"
   end
 
   create_table "seems_rateable_cached_ratings", :force => true do |t|
diff --git a/public/images/transparent.png b/public/images/transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fc28b5e214ec0c183fa60f71b91f935586e3e3d
GIT binary patch
literal 2904
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

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 678346bb3..36a8a61ca 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -620,6 +620,13 @@ ul.tool li{list-style-type:none;
 	color:#15bccf;
 }
 
+.font_welcome_school{
+	font-family: Tahoma,"Microsoft YaHei";
+	font-weight: bold;
+	font-size: 20px;
+	color:#FF9900;	
+}
+
 .font_welcome_Cdescription{
 	font-family: 微软雅黑; 
 	font-size: 16px;		
@@ -765,7 +772,7 @@ ul.tool li{list-style-type:none;
 	max-width: 315px;
 	margin: 0; 
 	padding: 0; 
-	margin-left: 75px;
+	margin-left: 15px;
 }
 
 .welcome_right{