From b9ed34f86eb74ccd0de702c6813f670aa0a58557 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 19 Mar 2015 11:42:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8F=B3=E8=BE=B9=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E3=80=81=E5=A2=9E=E5=8A=A0js=EF=BC=9A?=
 =?UTF-8?q?=E6=9C=80=E7=9F=AD=E4=B8=BA=E5=B7=A6=E4=BE=A7=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=203=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9course.css=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb         | 43 +++++++++----
 app/views/layouts/base_courses.html.erb |  2 +-
 public/javascripts/course.js            |  6 +-
 public/stylesheets/courses.css          | 86 ++++++++++++++-----------
 4 files changed, 85 insertions(+), 52 deletions(-)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index fef53d618..53754020f 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -10,13 +10,14 @@
                 <%= image_tag(url_to_avatar(e.event_author), :width => "42", :height => "42") %>
               </a>
               <div class="problem_txt fl mt5">
-                <a class="problem_name fl ">jacknudt</a>
-                <span class="fl"> 有了最新动态：</span>
-                <a class="problem_tit fl fb"> 附件: 2.2完成乘10运算的图灵机.mp4附件: 2.2完成乘10运算的图灵机.mp4附件: 2.2完成乘10运算的图灵机.mp4</a>
+                <%= link_to_user_header(e.event_author,false,:class => 'problem_name c_orange fl') if e.respond_to?(:event_author) %>
+                <%= link_to_user_header("(#{e.event_author})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName && e.respond_to?(:event_author) %>
+                <span class="fl"> <%= l(:label_new_activity) %>：</span>
+                <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:class => "problem_tit c_dblue fl fb"%>
                 <br />
-                <p class="mt5">项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题项目问题个数显示问题
+                <p class="mt5"><%= e.event_description %>
                   <br />
-                  发布时间 ：  2014-11-26 10:19
+                  <%= l :label_activity_time %> ：  <%= format_activity_day(day) %><%= format_time(e.event_datetime, false) %>
                 </p>
               </div>
               <div class="cl"></div>
@@ -25,11 +26,29 @@
     <% end%>
 <% end%>
 
-<ul class="wlist" >
-<li><a href="#">下一页</a></li>
-<li><a href="#">...</a></li>
-<li><a href="#">2</a></li>
-<li class="wlist_select" ><a href="#">1</a></li>
-<li><a href="#">上一页</a></li>
-</ul>
+<div class="problem_main">
+  <a class="problem_pic fl">
+    <%= image_tag(url_to_avatar(@user), :width => "42", :height => "42") %>
+  </a>
+  <div class="problem_txt fl mt5">
+    <%= link_to_user_header(@user,false,:class => 'problem_name c_orange fl') %>
+    <%= link_to_user_header("(#{@user})", @canShowRealName,:class => 'problem_name c_orange fl') if @canShowRealName %>
+    <span class="fl"> <%= l(:label_user_create_project) %>：</span>
+    <%= link_to @course.name,course_path(@course),:class => "problem_tit c_dblue fl fb"%>
+    <br />
+    <p class="mt5">
+      <br />
+      <%= l :label_create_time %>: ：  <%= format_time(@course.created_at) %>
+    </p>
+  </div>
+  <div class="cl"></div>
+</div><!--课程动态 end-->
+
+<!--<ul class="wlist" >-->
+<!--<li><a href="#">下一页</a></li>-->
+<!--<li><a href="#">...</a></li>-->
+<!--<li><a href="#">2</a></li>-->
+<!--<li class="wlist_select" ><a href="#">1</a></li>-->
+<!--<li><a href="#">上一页</a></li>-->
+<!--</ul>-->
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 3193acd04..5dd5f4444 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -16,7 +16,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses', :media => 'all' %>
+  <%= stylesheet_link_tag 'public', 'leftside', 'courses'%>
   <%= javascript_include_tag "course","header" %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index e859a0a6e..be3833cf7 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -23,4 +23,8 @@ function submitSerch(content)
 function show_more_msg()
 {
     $("#course_description").toggleClass("course_description_none");
-}
\ No newline at end of file
+}
+
+$(document).ready(function () {
+    $("#RSide").css("min-height",$("#LSide").height()-30);
+});
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index e62f5150a..80bd24e07 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1,6 +1,7 @@
 
 /*右侧内容--动态*/
 .project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;}
 .project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
 .project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
 .project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
@@ -12,16 +13,16 @@
 .img_talk{ background:url(../images/new_project/img_project.png) 0 -62px no-repeat;}
 .img_ziyuan{ background:url(../images/new_project/img_project.png) 0 -115px no-repeat;}
 .img_edition{ background:url(../images/new_project/img_project.png) 0 -167px no-repeat;}
-.project_name{ color:#058c42;}
-.project_name:hover{ color:#016f33;}
+a.project_name{ color:#058c42;}
+a:hover.project_name{ color:#016f33;}
 .project_txt{ color:#0781b4; width:445px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.project_txt02{ color:#0781b4; width:618px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.project_txt:hover{ color:#066e9a;}
+a.project_txt02{ color:#0781b4; width:618px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a:hover.project_txt{ color:#066e9a;}
 .noline{ border-bottom:none;}
 .news_description{max-height: 38px;overflow:hidden;}
 .news_description_none{max-height: none;}
-.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;}
-.news_foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
+a.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;}
+a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 
 /*弹框*/
 .floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
@@ -36,29 +37,29 @@
 /*.icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; }*/
 /*.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px  no-repeat;width:16px; height:16px; display:block;  margin:5px 0 0 5px}*/
 /*.icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px  no-repeat;}*/
-.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;}
-.btn_free:hover{ background:#d63502;}
+a.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;}
+a:hover.btn_free{ background:#d63502;}
 /*成员邀请*/
 .invi_search{ width:230px; margin:0 auto;}
 .invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
-.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
-.invi_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;}
+a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
+a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;}
 /*问题跟踪*/
 .problem_top{ margin:10px 0 ;}
 .problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
-.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;}
-.problem_search_btn:hover{ background:#3da1c1; border:1px solid #3da1c1;}
-.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; padding:1px 3px;  font-size:12px; text-align:center; padding-top:2px;}
-.problem_new_btn:hover{ background:#ff7143; color:#fff;}
+a.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;}
+a:hover.problem_search_btn{ background:#3da1c1; border:1px solid #3da1c1;}
+a.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; padding:1px 3px;  font-size:12px; text-align:center; padding-top:2px;}
+a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
 .problem_p{ color:#535252; margin-top:5px;}
 .problem_p span{ color:#ff3e00;}
-.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
-.problem_pic:hover{border:1px solid #64bdd9;}
+a.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;}
+a:hover.problem_pic{border:1px solid #64bdd9;}
 .problem_txt{ width:610px; margin-left:10px; color:#777777;}
-.problem_name{ color:#ff5722;}
-.problem_name:hover{ color:#d33503;}
-.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.problem_tit:hover{ color:#09658c; }
+a.problem_name{ color:#ff5722;}
+a:hover.problem_name{ color:#d33503;}
+a.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a:hover.problem_tit{ color:#09658c; }
 .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
 /****翻页***/
 .wlist{}
@@ -71,25 +72,25 @@
 .talk_txt{ width:460px; margin-left:10px; color:#676868;}
 .talk_up{ color:#f63c00;}
 .talk_pic{width:32px; height:32px; padding:2px;}
-.talk_btn{ background:#64bdd9; width:50px; height:20px; color:#fff; text-align:center; margin-top:12px; padding-top:3px;}
-.talk_btn:hover{ background:#2a9dc1;}
+a.talk_btn{ background:#64bdd9; width:50px; height:20px; color:#fff; text-align:center; margin-top:12px; padding-top:3px;}
+a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .mt0{ margin-top:0px;}
 .talk_info{ color:#7d7d7d; margin-left:50px; margin-top:10px;}
-.talk_edit{ color:#426e9a; margin-right:5px;}
-.talk_edit:hover{ color:#ff5722;}
+a.talk_edit{ color:#426e9a; margin-right:5px;}
+a:hover.talk_edit{ color:#ff5722;}
 .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;}
 .talkpage_text{  border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;}
 /****新建讨论***/
 .talk_new{  color:#4c4c4c;}
-.talk_input{ border:1px solid #64bdd9; height:22px; width:585px; background:#fff; margin-bottom:10px; padding:5px;}
+.talk_input{ border:1px solid #64bdd9; height:16px; width:585px; background:#fff; margin-bottom:10px; padding:5px;}
 .talk_text{ border:1px solid #64bdd9; height:100px;width:585px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
 .talk_new ul li{ }
 .sb{width:70px; height:26px; color:#606060; cursor:pointer;}
-.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; height:26px; width:50px; text-align:center; margin-left:10px; margin-top:10px; padding-top:3px;}
-.blue_btn:hover{ background:#329cbd;}
-.grey_btn{ background:#d9d9d9; color:#656565;}
-.grey_btn:hover{ background:#717171; color:#fff;}
+a.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; height:26px; width:50px; text-align:center; margin-left:10px; margin-top:10px; padding-top:3px;}
+a:hover.blue_btn{ background:#329cbd;}
+a.grey_btn{ background:#d9d9d9; color:#656565;}
+a:hover.grey_btn{ background:#717171; color:#fff;}
 /****资源库***/
 .f_l{ float:left;}
 .f_r{ float:right;}
@@ -110,17 +111,17 @@
 .re_search{ margin-top:7px; margin-left:5px;}
 .re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
 .re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px; }
-.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
-.re_fabu:hover{background:#55a1b9;}
+a.re_fabu { display:block; width:90px; height:30px; font-size:14px; color:#fff; text-align:center; padding-top:10px; }
+a:hover.re_fabu{background:#55a1b9;}
 .re_con{ margin:5px; width:665px;}
 .re_con_top{color:#494949; }
 .re_con_top span{ color:#999999; font-weight:bold;}
-.re_select{ display:block; width:88px; height:20px; border:1px solid #ff9900; color:#ff9900;  margin-left:10px; padding-top:2px;}
-.re_select:hover{ background:#ff9900; color:#fff; text-decoration:none;}
-.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; color:#64bdd9;  margin-left:10px;padding-top:3px;}
-.re_open:hover{ background:#64bdd9; color:#fff; text-decoration:none;}
+a.re_select{ display:block; width:88px; height:20px; border:1px solid #ff9900; color:#ff9900;  margin-left:10px; padding-top:2px;}
+a:hover.re_select{ background:#ff9900; color:#fff; text-decoration:none;}
+a.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; color:#64bdd9;  margin-left:10px;padding-top:3px;}
+a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;}
 a.re_de{ color:#6883b6; margin-left:15px;}
-.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
+a:hover.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
 /****资源库***/
 /*.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;}*/
 
@@ -244,7 +245,7 @@ a:hover.tijiao{ background:#0f99a9;}
 /* 创建作品 homework */
 .hwork_new{  color:#4c4c4c;}
 .c_red{ color:#F00;}
-.hwork_input{ border:1px solid #64bdd9; height:20px; width:555px; background:#fff; margin-bottom:10px; padding:5px;}
+.hwork_input{ border:1px solid #64bdd9; height:16px; width:555px; background:#fff; margin-bottom:10px; padding:5px;}
 .hwork_input02{ border:1px solid #64bdd9; height:15px; width:120px; background:#fff; margin-bottom:10px; padding:5px;}
 .hwork_text{ border:1px solid #64bdd9; height:100px;width:555px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
 .hwork_new ul li{ }
@@ -290,7 +291,16 @@ a:hover.st_img { border:1px solid #1c9ec7; }
 .ml258{ margin-left:254px;}
 .ml65{ margin-left:65px;}
 a:hover.st_add{ color:#ff8e15;}
-
+.classbox_on{ border:1px solid #f8df8c; background:#f6f098;   padding:0 3px; float:left; margin-left:15px;}
+.classbox_on a{ color:#716cad;}
+/* 创建课程courses*/
+.courses_input{ border:1px solid #64bdd9; height:16px; width:532px; background:#fff; margin-bottom:10px; padding:5px;}
+.courses_input_w{ width:300px;}
+.courses_text{ border:1px solid #64bdd9; height:100px;width:532px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
+.upimg{ border:1px solid  #eaeaea; display:block; width:60px; height:60px; padding:1px;}
+.upimg:hover{ border:1px solid #64bdd9; }
+.upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;}
+.upbtn:hover{border:1px solid #64bdd9; color:#64bdd9;}