qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐

This commit is contained in:
whimlex 2015-04-16 16:39:52 +08:00
parent 5649f4c5a1
commit ca1e902a8f
4 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/courses/_course.html.erb
View File

@ -33,6 +33,15 @@
<% end %>
</p>
<p>
<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
<%= get_course_term @course %>
</p>
<p>
<%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
</p>
</div>
<div class="information_for_course" >
@ -71,15 +80,13 @@
</div>
<div class="add-info">
<div class="main-language" style="margin-left: 30px;margin-top:-10px">
<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
<%= get_course_term @course %>
</div>
<%= content_tag "span","#{l(:label_duration_time)}:", :class => "course-font"%>
<%= get_course_term @course %>
</div>
<div class="add-info" style="margin-left: 30px; margin-top: -20px">
<%= 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 %>
</div>
<div class="tags">

2
app/views/courses/show.html.erb
View File

@ -40,7 +40,7 @@
<br />
<p class="mt5">
<br />
<%= l :label_create_time %>: ： <%= format_time(@course.created_at) %>
<%= l :label_create_time %> ： <%= format_time(@course.created_at) %>
</p>
</div>
<div class="cl"></div>

43
app/views/welcome/course.html.erb
View File

@ -39,21 +39,12 @@
</div>
<div class="course welcome_left" id="welcome_left">
<% if User.current.login? %>
<span class="font_welcome_school">
<% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
<span class="font_welcome_tdescription">,
<!--
edit by meng
@course_page.description存储在first_page表中的description字段
原本代码
<%= @course_page.description %>
!-->
<%= l(:label_welcome_trustie_course_description) %>
</span>
<% 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'} %>
<br/>
@ -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'} %>
<br/>
<% end %>
<% end %>
<% end %>
<% end %>
</span>
<% unless @course_page.nil? %>
<span class="font_welcome_trustie">
<!--
edit by meng
@course_page.title存储在first_page表中的title字段
原本代码
<%= @course_page.title %>
!-->
<%= l(:label_welcome_trustie_course) %>
</span>
<% else %>
<% unless @course_page.nil? %>
<span class="font_welcome_trustie">
<!--
edit by meng
@ -74,8 +75,18 @@
!-->
<%= l(:label_welcome_trustie_course) %>
</span>
<span class="font_welcome_tdescription">,
<!--
edit by meng
@course_page.description存储在first_page表中的description字段
原本代码
<%= @course_page.description %>
!-->
<%= l(:label_welcome_trustie_course_description) %>
</span>
<% end %>
<% end %>
</div>
<div class="search-bar" id="search-bar">
<%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course} %>

8
public/themes/redpenny-master/stylesheets/application.css
View File

@ -1057,7 +1057,7 @@ display: block;
float: left;
margin-left: 20px;
margin-top: 10px;
width: 470px;
width: 540px;
font-family: '微软雅黑'; /*modify by men*/
color: rgb(0, 0, 0);
font-size: 13px;
@ -1085,7 +1085,7 @@ float: left;
}*/
.information_for_course {
margin-top: 20px;
margin-left: 507px;
margin-left: 550px;
float: left;
height: auto;
width: 300px;
@ -2008,10 +2008,10 @@ div.tableline{
text-align: justify;
}
.brief_introduction {
margin-top: -18px;
margin-top: -30px;
margin-left: 60px;
/*display: inline-block;*/
width: 500px;
width: 480px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;