diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb index abcbbfe5b..8974c3089 100644 --- a/app/views/courses/_course.html.erb +++ b/app/views/courses/_course.html.erb @@ -33,6 +33,15 @@ <% end %>

+

+ <%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%> + <%= get_course_term @course %> +

+

+ <%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %> + <%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %> +

+
@@ -71,15 +80,13 @@
-
- <%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%> - <%= get_course_term @course %> -
+ <%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%> + <%= get_course_term @course %>
- <%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %> - <%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %> + <%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %> + <%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 1cc117dd6..1d2c42457 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -40,7 +40,7 @@


- <%= l :label_create_time %>: : <%= format_time(@course.created_at) %> + <%= l :label_create_time %> : <%= format_time(@course.created_at) %>

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index a764c6eb8..5c57a5ba1 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -39,21 +39,12 @@
+ <% if User.current.login? %> - <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %> - , - - <%= l(:label_welcome_trustie_course_description) %> - - <% else %> - <% if @school_id == "0" %> - + <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %> <% else %> + <% if @school_id == "0" %> + <% else %> <% if @school_id.nil? %> <%= link_to School.find(User.current.user_extensions.school.id).name, options={:action => 'course', :school_id => User.current.user_extensions.school.id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
@@ -61,10 +52,20 @@ <%= link_to School.find(@school_id).name, options={:action => 'course', :school_id => @school_id}, html_options={:class => 'font_welcome_school', :method => 'get'} %>
<% end %> + <% end %> <% end %> - <% end %>
- <% unless @course_page.nil? %> + + + <%= l(:label_welcome_trustie_course) %> + + <% else %> + <% unless @course_page.nil? %> <%= l(:label_welcome_trustie_course) %> - + , + + <%= l(:label_welcome_trustie_course_description) %> + + <% end %> <% end %> +