Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/controllers/welcome_controller.rb

@@ -39,17 +39,18 @@ class WelcomeController < ApplicationController
     @courseCount = Project.course_entities.count
     @teacherCount = User.teacher.count
     @studentCount = User.student.count
-    @logoLink = logolink(params[:school_id])
+    @logoLink = logolink()
   end
   
   
   
- def logolink(id)
+ def logolink()
+    id = params[:school_id]
     logo_link = ""
     if id.nil? and User.current.user_extensions.school.nil?
       logo_link = '/images/transparent.png'
     else
-      if id.to_i == 0
+      if id == "0"
         logo_link = '/images/transparent.png'
       else
         if id.nil?

app/views/welcome/course.html.erb

@@ -24,14 +24,12 @@
 
 		</div>
 		<div class="welcome_left" >
-	
-		<span class="font_welcome_school">
-			<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
+			<br />
+			<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 %>
@@ -39,8 +37,7 @@
 							<br />
 						<% end %>
 					<% end %>
-			<% end %>
-			</span>
+				<% 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>

public/stylesheets/application.css

@@ -624,7 +624,7 @@ ul.tool li{list-style-type:none;
 	font-family: Tahoma,"Microsoft YaHei";
 	font-weight: bold;
 	font-size: 20px;
-	color:#FF9900;	
+	color:#e8770d;	
 }
 
 .font_welcome_Cdescription{