From ca1e902a8f66a9ef49ddadd8abb62dffd83b31c2 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 16 Apr 2015 16:39:52 +0800
Subject: [PATCH] =?UTF-8?q?#2279=20=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E5=9B=BE=EF=BC=8C=E5=BB=BA=E8=AE=AE=E5=B0=86=E2=80=9C?=
 =?UTF-8?q?=E6=8E=88=E8=AF=BE=E6=97=B6=E9=97=B4=E2=80=9D=E4=B8=8E=E2=80=9C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AE=80=E4=BB=8B=E2=80=9D=E4=B8=8E=E4=B8=8A?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E2=80=9C=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E2=80=9D=E7=AD=89=E4=BF=A1=E6=81=AF=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course.html.erb            | 19 +++++---
 app/views/courses/show.html.erb               |  2 +-
 app/views/welcome/course.html.erb             | 43 ++++++++++++-------
 .../stylesheets/application.css               |  8 ++--
 4 files changed, 45 insertions(+), 27 deletions(-)

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 %>
 	</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">
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 @@
     <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>
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 @@
 
     </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} %>
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 6d4cc658e..1e50e41ca 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -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;