From 03d58b962aab197d99a992c8e128f68b5bf8b331 Mon Sep 17 00:00:00 2001
From: Wen <wsm911120@126.com>
Date: Mon, 28 Apr 2014 10:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E4=BA=86=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=96=E5=BE=97logo=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb | 27 +++++++++++++++++++++++++++
 app/views/welcome/course.html.erb     | 23 +----------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 5e8eef074..710b73194 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -39,8 +39,35 @@ class WelcomeController < ApplicationController
     @courseCount = Project.course_entities.count
     @teacherCount = User.teacher.count
     @studentCount = User.student.count
+    @logoLink = logolink(params[:school_id])
   end
   
+  
+  
+ def logolink(id)
+    logo_link = ""
+    if id.nil? and User.current.user_extensions.school.nil?
+      logo_link = '/images/transparent.png'
+    else
+      if id.to_i == 0
+        logo_link = '/images/transparent.png'
+      else
+        if id.nil?
+          if School.find(User.current.user_extensions.school.id).logo_link.nil?
+            logo_link = '/images/transparent.png'
+          else
+            logo_link = School.find(User.current.user_extensions.school.id).logo_link
+          end
+        else
+          logo_link = School.find(id).logo_link
+
+        end
+      end
+    end
+    return logo_link
+  end
+  
+  
   def contest
 
   end
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 451f92c27..8ad0cd6bf 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -20,29 +20,8 @@
 	</div> 
 	<div class="main-content-bar">
 		<div style="float: left">
+		  	<%= image_tag(@logoLink, size:'75x75') %>
 		  	
-
-			<% 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 %>
-							<%#= image_tag('/images/school/default.png', size: "75x75") %>
-							<%= 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, size: "75x75") %>
-						<%#= image_tag('/images/school/default.png', size: "75x75") %>
-						<br />
-					<% end %>
-				<% end %>
-			<% end %>	
 		</div>		
 	<div class="welcome_left" >