course首页布局上的小调整
This commit is contained in:
parent
7cc4a9f3a6
commit
50745d5d21
|
@ -39,17 +39,18 @@ class WelcomeController < ApplicationController
|
||||||
@courseCount = Project.course_entities.count
|
@courseCount = Project.course_entities.count
|
||||||
@teacherCount = User.teacher.count
|
@teacherCount = User.teacher.count
|
||||||
@studentCount = User.student.count
|
@studentCount = User.student.count
|
||||||
@logoLink = logolink(params[:school_id])
|
@logoLink = logolink()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def logolink(id)
|
def logolink()
|
||||||
|
id = params[:school_id]
|
||||||
logo_link = ""
|
logo_link = ""
|
||||||
if id.nil? and User.current.user_extensions.school.nil?
|
if id.nil? and User.current.user_extensions.school.nil?
|
||||||
logo_link = '/images/transparent.png'
|
logo_link = '/images/transparent.png'
|
||||||
else
|
else
|
||||||
if id.to_i == 0
|
if id == "0"
|
||||||
logo_link = '/images/transparent.png'
|
logo_link = '/images/transparent.png'
|
||||||
else
|
else
|
||||||
if id.nil?
|
if id.nil?
|
||||||
|
|
|
@ -24,14 +24,12 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="welcome_left" >
|
<div class="welcome_left" >
|
||||||
|
<br />
|
||||||
<span class="font_welcome_school">
|
<span class="font_welcome_school"> <% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
|
||||||
<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
|
|
||||||
<% else%>
|
<% else%>
|
||||||
<% if params[:school_id] == "0" %>
|
<% if params[:school_id] == "0" %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<% if params[:school_id].nil? %>
|
<% if params[:school_id].nil? %>
|
||||||
|
|
||||||
<%= School.find(User.current.user_extensions.school.id).name %>
|
<%= School.find(User.current.user_extensions.school.id).name %>
|
||||||
<br />
|
<br />
|
||||||
<% else %>
|
<% else %>
|
||||||
|
@ -39,8 +37,7 @@
|
||||||
<br />
|
<br />
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %> </span>
|
||||||
</span>
|
|
||||||
<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> </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? %>
|
<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
|
||||||
<span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
|
<span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 58 KiB |
|
@ -624,7 +624,7 @@ ul.tool li{list-style-type:none;
|
||||||
font-family: Tahoma,"Microsoft YaHei";
|
font-family: Tahoma,"Microsoft YaHei";
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
color:#FF9900;
|
color:#e8770d;
|
||||||
}
|
}
|
||||||
|
|
||||||
.font_welcome_Cdescription{
|
.font_welcome_Cdescription{
|
||||||
|
|
Loading…
Reference in New Issue