From 8e2cce8fd2df4c580ddec557effd1a9e2bced7df Mon Sep 17 00:00:00 2001
From: chenglong <871838921@qq.com>
Date: Fri, 21 Apr 2017 20:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_edu_user_watch_fan_list.html.erb   |   8 +--
 app/views/users/show.html.erb                 |  55 +++++++++--------
 .../20170417081351_resource_bank_migration.rb |   2 +-
 public/images/edu_user/edu-nodata.png         | Bin 0 -> 28452 bytes
 public/javascripts/bigdata/user.js            |  31 ++++------
 public/stylesheets/css/bigdata-user.css       |  56 +++++++++++-------
 6 files changed, 83 insertions(+), 69 deletions(-)
 create mode 100644 public/images/edu_user/edu-nodata.png

diff --git a/app/views/users/_edu_user_watch_fan_list.html.erb b/app/views/users/_edu_user_watch_fan_list.html.erb
index 7cb00b3e6..f4ed403d0 100644
--- a/app/views/users/_edu_user_watch_fan_list.html.erb
+++ b/app/views/users/_edu_user_watch_fan_list.html.erb
@@ -25,12 +25,12 @@
       <div class="fens clearfix">
         <% @user_watchlist.each do |user| %>
             <dl class="list fl">
-              <dt><%= link_to image_tag(url_to_avatar(user), width: "56", height: "56", :alt => "头像"), user_path(user), :target => '_blank' %></dt>
+              <dt><%= link_to image_tag(url_to_avatar(user), :width => "56", :height => "56", :class => "touxiang", :alt => "头像"), user_path(user), :target => '_blank', :class => "" %></dt>
               <dd class="mb10"><%= link_to user.show_name, user_path(user), :target => '_blank' %></dd>
             </dl>
         <% end %>
         <% if @user_watchlist_count > 12 %>
-            <%= link_to '查看更多', user_watchlist_user_path(@user), :target => '_blank', :class => 'color-grey' %>
+            <%= link_to '查看更多', user_watchlist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
         <% end %>
       </div>
   <% end %>
@@ -49,12 +49,12 @@
       <div class="fens clearfix">
         <% @user_fanlist.each do |user| %>
             <dl class="list fl">
-              <dt><%= link_to image_tag(url_to_avatar(user), width: "56", height: "56", :alt => "头像"), user_path(user), :target => '_blank' %></dt>
+              <dt><%= link_to image_tag(url_to_avatar(user), :width => "56", :height => "56", :class => "touxiang", :alt => "头像"), user_path(user), :target => '_blank', :class => "" %></dt>
               <dd class="mb10"><%= link_to user.show_name, user_path(user), :target => '_blank' %></dd>
             </dl>
         <% end %>
         <% if @user_fanlist_count > 12 %>
-            <%= link_to '查看更多', user_fanslist_user_path(@user), :target => '_blank', :class => 'color-grey' %>
+            <%= link_to '查看更多', user_fanslist_user_path(@user), :target => '_blank', :class => 'color-grey many' %>
         <% end %>
       </div>
   <% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e8a8c0749..e7af91c15 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -5,15 +5,19 @@
   <div class="photo fl">
     <%= image_tag(url_to_avatar(@user), :class => "person", :alt => "头像") %>
     <% if current_user %>
-        <div class="changephoto font-14">更换头像</div>
+        <div class="changephoto font-14"><div class="subchange">更换头像</div></div>
     <% end %>
   </div>
   <div class="-task-con-data fl">
     <div class="top cl">
       <div class="top-left fl">
-        <p class="p1 mt20 mb20 font-16">
+        <p class="p1  font-16 ">
           <span><%= @user.login %></span>
-          <i class="fa fa-venus" aria-hidden="true"></i>
+          <% if @user.user_extensions && @user.user_extensions.gender &&  @user.user_extensions.gender == 1 %>
+            <i class="pl20 fa fa-venus color-orange" aria-hidden="true"></i>
+          <% else %>
+            <i class="pl20 fa fa-mars color-blue" aria-hidden="true"></i>
+          <% end %>
         </p>
 
         <p class="p2 font-16">
@@ -41,7 +45,7 @@
           <% end %>
         </p>
       </div>
-      <div class="top-right fr font-16 mt15 mr10">
+      <div class="top-right fr font-16  mr10">
         <% if current_user %>
             <div class="mynew">
               <p>
@@ -60,13 +64,13 @@
                 </a>
 
                 <a class="<%= @user.mail.blank? ? 'color-grey' : 'color-green' %>" href="<%= security_settings_path %>">
-                  <i class="fa fa-envelope-o pr10" aria-hidden="true"></i>
+                  <i class="fa fa-envelope-o" aria-hidden="true"></i>
                 </a>
               </p>
             </div>
         <% else %>
             <div class="itnew">
-              <p class="p2 font-14 color-grey">
+              <p class="p2 font-14 color-grey mt10 mb10">
                 <i class="fa fa-eye" aria-hidden="true"></i>
                 <span><%= @user.visits.to_i %></span> 次访问
               </p>
@@ -75,7 +79,7 @@
                 <% if(@user.watched_by?(User.current)) %>
                     <%= link_to "已关注",
                                 watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
-                                :class => "fl font-14 user_watch",
+                                :class => "fl font-14 user_watch ml30",
                                 :id => "cancel_watch",
                                 :method => "delete",
                                 :remote => "true",
@@ -83,7 +87,7 @@
                 <% else %>
                     <%= link_to "添加关注",
                                 watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
-                                :class => "fl font-14 user_watch",
+                                :class => "fl font-14 user_watch ml30",
                                 :method => "post",
                                 :remote => "true",
                                 :title => "添加关注" %>
@@ -101,9 +105,9 @@
     <div class="bot">
       <% if current_user %>
           <input type="hidden" id="current_user_id" value="<%= @user.id %>">
-          <input type="text" class="font-14 task-hide" id="user_breif_introduction" placeholder="一句话介绍一下自己吧~" value="<%= @user.user_extensions.brief_introduction %>"/>
+          <input type="text" class="font-14 task-hide color-grey" id="user_breif_introduction" placeholder="一句话介绍一下自己吧~" value="<%= @user.user_extensions.brief_introduction %>"/>
       <% else %>
-          <p class="font-14 task-hide" title="<%= @user.user_extensions.brief_introduction.blank? ? "这家伙很懒，什么都没留下~" : @user.user_extensions.brief_introduction %>">
+          <p class="font-14 task-hide color-grey" title="<%= @user.user_extensions.brief_introduction.blank? ? "这家伙很懒，什么都没留下~" : @user.user_extensions.brief_introduction %>">
             <%= @user.user_extensions.brief_introduction.blank? ? "这家伙很懒，什么都没留下~" : @user.user_extensions.brief_introduction %>
           </p>
       <% end %>
@@ -150,13 +154,16 @@
       <div class="pr10 color-blue play">
         <i class="fa fa-sort-down zhuan mr5" aria-hidden="true"></i>开始
       </div>
-      <ul class="list">
-        <li><%= link_to '创建课程', new_syllabus_path(:host => Setting.host_course), :target => "_blank" %></li>
-        <li><%= link_to '创建班级', new_course_path(:host => Setting.host_course), :target => "_blank" %></li>
-        <li><%= link_to "加入班级", join_private_courses_courses_path, :remote => true, :method => "post" %></li>
-        <li><%= link_to "发现实训", '', :target => "_blank"  %></li>
-        <li><%= link_to '发起求助', new_forum_memo_path(:forum_id => Forum.first.id, :forum_index => true), :target => "_blank" %></li>
-      </ul>
+      <div class="list">
+        <ul>
+          <li><%= link_to '创建课程', new_syllabus_path(:host => Setting.host_course), :target => "_blank" %></li>
+          <li><%= link_to '创建班级', new_course_path(:host => Setting.host_course), :target => "_blank" %></li>
+          <li><%= link_to "加入班级", join_private_courses_courses_path, :remote => true, :method => "post" %></li>
+          <li><%= link_to "发现实训", '', :target => "_blank"  %></li>
+          <li><%= link_to '发起求助', new_forum_memo_path(:forum_id => Forum.first.id, :forum_index => true), :target => "_blank" %></li>
+        </ul>
+      </div>
+     
     </div>
     <% if @courses_count == 0 && @shixuns_count == 0 %>
         <div class="kong">
@@ -165,7 +172,7 @@
           </p>
 
           <div class="p2 font-14 color-grey">
-            <img src="../images/edu_user/logo1.jpg"/>
+            <img src="../images/edu_user/edu-nodata.png"/>
 
             <p>显示你常用的课堂社区、实训社区列表</p>
 
@@ -188,10 +195,10 @@
           <div class="lesson ml10 mr10" id="my_courses_list">
             <% @courses.each do |course| %>
                 <p>
-                  <a href="<%= course_path(course) %>" target="_blank" class="font-16"><i class="fa fa-dot-circle-o color-grey" aria-hidden="true"></i>&nbsp;&nbsp;<%= course.name %></a>
+                  <a href="<%= course_path(course) %>" target="_blank" class="font-16 first"><i class="fa fa-circle qian" aria-hidden="true"></i>&nbsp;&nbsp;<%= course.name %></a>
                   <span class="font-14 hasmargin">课程：<a href="<%= syllabus_path(course.syllabus) %>" target="_blank"><%= course.syllabus.title %></a></span>
                   <span class="font-14 haspadding">更新时间：<%= format_time course.updatetime %></span>
-                  <span class="font-14">分享<i class="fa fa-weixin font-14" aria-hidden="true"></i></span>
+                  <span class="font-14 last">分享&nbsp;&nbsp;<i class="fa fa-weixin font-14 color-green" aria-hidden="true"></i></span>
                 </p>
             <% end %>
             <% if @courses_count > 8 %>
@@ -202,9 +209,9 @@
           <div class="train ml10 mr10 none" id="my_shixuns_list">
             <% @shixuns.each do |shixun| %>
                 <p>
-                  <span class="font-16"><i class="fa fa-dot-circle-o color-grey" aria-hidden="true"></i>&nbsp;&nbsp;胡莎莎/Helloword:java实训入门</span>
+                  <span class="font-16 first"><i class="fa fa-circle qian" aria-hidden="true"></i>&nbsp;&nbsp;胡莎莎/Helloword:java实训入门</span>
                   <span class="hasmargin font-14">已解锁第<i>2</i>关/共<i>8</i>关</span>
-                  <span class="font-14">上次离开时间：2017-02-09 15:21</span>
+                  <span class="font-14 last">上次离开时间：2017-02-09 15:21</span>
                 </p>
             <% end %>
 
@@ -226,9 +233,9 @@
     <i class="fa fa-qrcode" aria-hidden="true"></i>
   </div>
   <div class="consult" tooltips="在线咨询">
-    <a target="_blank" class="color_white" href="http://shang.qq.com/wpa/qunwpa?idkey=064e805dac955b8aea158c4b0dd3f033b8841bcee175fd619613f0e4ac4d8151"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+    <a target="_blank" class="color_white" href="http://shang.qq.com/wpa/qunwpa?idkey=064e805dac955b8aea158c4b0dd3f033b8841bcee175fd619613f0e4ac4d8151"><i class="fa fa-qq" aria-hidden="true"></i></a>
   </div>
   <div class="gotop" tooltips="返回顶部">
     <i class="fa fa-arrow-up" aria-hidden="true"></i>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/db/migrate/20170417081351_resource_bank_migration.rb b/db/migrate/20170417081351_resource_bank_migration.rb
index d76f68289..e38f54f2d 100644
--- a/db/migrate/20170417081351_resource_bank_migration.rb
+++ b/db/migrate/20170417081351_resource_bank_migration.rb
@@ -1,6 +1,6 @@
 class ResourceBankMigration < ActiveRecord::Migration
   def up
-    #add_column :attachments, :resource_bank_id, :integer
+    add_column :attachments, :resource_bank_id, :integer
 
     count =Attachment.where(:container_type => 'Course').count / 30 + 2
     transaction do
diff --git a/public/images/edu_user/edu-nodata.png b/public/images/edu_user/edu-nodata.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b158a05fc77f3deed45e4275e93d4b52b963830
GIT binary patch
literal 28452
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

literal 0
HcmV?d00001

diff --git a/public/javascripts/bigdata/user.js b/public/javascripts/bigdata/user.js
index 474b34cdf..5aba89c0a 100644
--- a/public/javascripts/bigdata/user.js
+++ b/public/javascripts/bigdata/user.js
@@ -3,30 +3,21 @@
  */
 //-------------------浮动“开始”出现增加课程列表----------------//
 $(function(){
-    $(".-task-con-int .passageway .hint ").mouseenter(function(){
+    $(".-task-con-int .passageway .hint ").mouseenter(function() {
         $(".-task-con-int .passageway .hint .list").show();
-        $(".-task-con-int .passageway .hint .list").css({
-            opacity:0,
-        }).stop().animate({
-            opacity:1
-        },1000);
-    });
-    $(".-task-con-int .passageway .hint .list li").hover(function(e){
-        $(e.target).css({
-            background:"#e6e6e6"
-        })
-    },function(e){
-        $(e.target).css({
-            background:"#fff"
-        })
+        $(".-task-con-int .passageway .hint .list li").hover(function (e) {
+            $(e.target).css({
+                background: "#e6e6e6"
+            });
+        }, function (e) {
+            $(e.target).css({
+                background: "#fff"
+            });
+        });
     });
     $(".-task-con-int .passageway .hint").mouseleave(function(){
         $(".-task-con-int .passageway .hint .list").hide();
-        $(".-task-con-int .passageway .hint .list").css({
-            opacity:1,
-        }).stop().animate({
-            opacity:0
-        },1000);
+
     });
 });
 
diff --git a/public/stylesheets/css/bigdata-user.css b/public/stylesheets/css/bigdata-user.css
index 250a526d9..07b955314 100644
--- a/public/stylesheets/css/bigdata-user.css
+++ b/public/stylesheets/css/bigdata-user.css
@@ -2,24 +2,27 @@
 .-task-con{width:1200px;margin:20px auto;}
 /*个人信息*/
 .-task-con-per{width:100%;background:#fff;}
-.-task-con-per .photo{width:150px;position:relative;margin:1%;}
-.-task-con-per .photo .person{width:150px;height:150px;}
-.-task-con-per .photo .changephoto{width:100%;text-align:center;line-height:38px;color:#fff;background:black;opacity:0.4;filter: alpha(opacity=40);position:absolute;bottom:0;left:0;cursor: pointer;}
-.-task-con-data{width:85%;}
+.-task-con-per .photo{width:9%;position:relative;margin:1%;}
+.-task-con-per .photo .person{width:100%;height:100px;}
+.-task-con-per .photo .changephoto{width:100%;position:absolute;bottom:0;left:0;cursor: pointer;}
+.-task-con-per .photo .changephoto .subchange{width:100%;text-align:center;line-height:26px;color:#fff;background:black;opacity:0.4;filter: alpha(opacity=40);}
+.-task-con-data{width:89%;}
 .-task-con-data .top{width:100%;}
 .-task-con-data .top .top-left{width:46%;}
+.-task-con-data .top .top-left .p1{margin:5px 0;}
 .-task-con-data .top .top-right{width:20%;text-align: right;}
 .-task-con-data .top .top-right .mynew{display:block;width:100%;}
 .-task-con-data .top .top-right .mynew p a{color:#5789c8;}
-.-task-con-data .top .top-right .mynew .p2{line-height:50px;color:#ccc;}
+.-task-con-data .top .top-right .mynew .p2{color:#ccc;}
 .-task-con-data .top .top-right .mynew p .fa{position:relative;}
 .-task-con-data .top .top-right .mynew p .fa .fa-check,.fa-close{position:absolute;left:8px;bottom:0;display:none;}
 .-task-con-data .bot{width:100%;}
-.-task-con-data .top .top-right .itnew .p2{padding:20px 0 10px 0}
-.-task-con-data .top .top-right .itnew .sub a{border:1px solid #eee;display:inline-block;padding:2px 10px;text-align:center;width: 57px;}
+/*.-task-con-data .top .top-right .itnew .p2{}*/
+.-task-con-data .top .top-right .itnew .sub a{border:1px solid #e5e5e5;display:inline-block;padding:2px 10px;text-align:center;width: 57px;border-radius:5px;}
+.-task-con-data .top .top-right .itnew .sub a:hover{background:#f0f0f0;}
 .-task-con-data .top .top-right .itnew .sub{width:100%;}
-.-task-con-data .bot input{width:100%;height:60px;line-height:60px;border:none;outline:none;background:#fff;}
-.-task-con-data .bot p{width: 100%; height: 45px; padding-top: 33px; background: #fff;}
+.-task-con-data .bot input{width:100%;height:40px;line-height:40px;border:none;outline:none;background:#fff;}
+.-task-con-data .bot p{width: 100%; height: 25px; background: #fff;}
 /*-----------------博客------------------------*/
 .-task-con-int .blog,.favour{width:100%;margin-top:15px;background:#fff;}
 .-task-con-int .blog .p1{width:100%;height:40px;background:#f2f2f2;line-height:40px;text-indent:10px;}
@@ -27,7 +30,7 @@
 .-task-con-int .blog .p2{line-height:90px;text-align:center;}
 .-task-con-int .blog .p2:hover .changecolor{color:#29bd8b;}
 .-task-con-int .blog .p3{height:90px;position:relative;}
-.-task-con-int .blog .p3 .check{position:absolute;right:10px;top:-27px;}
+.-task-con-int .blog .p3 .check{position:absolute;right:10px;top:-30px;}
 .-task-con-int .blog .p3 .blognew{width:32%;}
 .-task-con-int .blog .p3 .hasborder{border-left:1px solid #eee;}
 .-task-con-int .blog .p3 .blognew .font-14{height:60px;display:flex;align-items: center;color:#333;}
@@ -39,23 +42,26 @@
 .-task-con-int .favour .p1 .span1{background:#fefefe;}
 .-task-con-int .favour .p2{line-height:90px;text-align:center;}
 .-task-con-int .favour .p2:hover .changecolor{color:#29bd8b;}
-/*.-task-con-int .favour .fens{position:relative;}*/
-/*.-task-con-int .favour .fens a{position:absolute;right:10px;top:10px;}*/
-.-task-con-int .favour .fens .list{width:100px;text-align:center;}
-.-task-con-int .favour .fens .list dt{margin:20px;}
+.-task-con-int .favour .fens{position:relative;}
+.-task-con-int .favour .fens .many{position:absolute;right:10px;top:2px;}
+.-task-con-int .favour .fens .list{width:100px;text-align:center;padding-top:5px;}
+.-task-con-int .favour .fens .list dt{margin:20px;margin-bottom:5px;}
+.-task-con-int .favour .fens .touxiang{border-radius:28px;overflow:hidden;}
+
 /*-----------------------入口------------------------*/
 .-task-con-int  .passageway{width:100%;background:#fff;position:relative;}
 .-task-con-int  .passageway .hint{position:absolute;top:0;right:0;width:80px;text-align:center;}
 .-task-con-int  .passageway .hint .play{display:block;line-height:40px;}
-.-task-con-int  .passageway .hint .list{-webkit-box-shadow: 0 0 3px #999;  -moz-box-shadow: 0 0 3px #999;  box-shadow: 0 0 3px #999;cursor:pointer;display:none;opacity:0;}
-.-task-con-int  .passageway .hint .list li{border-radius:2px; padding-top:1px;}
+/*.-task-con-int  .passageway .hint .list{cursor:pointer;display:none;}*/
+/*.-task-con-int  .passageway .hint .list li{border-radius:2px; padding-top:1px;z-index:100;}*/
 
 .-task-con-int  .passageway .kong .p1{background:#f2f2f2;line-height:40px;}
 .-task-con-int  .passageway .kong .p1 span{text-indent:10px;}
 .-task-con-int  .passageway .kong .p2{width:100%;position:relative;}
 .-task-con-int  .passageway .kong .p2 img{ padding:100px 0 30px 500px;}
 .-task-con-int  .passageway .kong .p2 p{text-align:center;width:100%;line-height:30px;}
-.-task-con-int  .passageway .hint .list{width:80px;text-align:center;-webkit-box-shadow: 0 0 3px #999;  -moz-box-shadow: 0 0 3px #999;  box-shadow: 0 0 3px #999;cursor:pointer; }
+.-task-con-int  .passageway .hint .list{ cursor:pointer;display:none;background:#000; }
+.-task-con-int  .passageway .hint .list ul{width:80px;text-align:center;-webkit-box-shadow: 0 0 3px #999;  -moz-box-shadow: 0 0 3px #999; box-shadow: 0 0 3px #999;background:#fff;}
 .-task-con-int  .passageway .hint .list li{border-radius:2px; padding-top:1px;}
 .-task-con-int  .passageway .hascon i{font-style:normal;}
 .-task-con-int  .passageway .hascon .title{background:#f2f2f2;line-height:40px;}
@@ -63,9 +69,19 @@
 .-task-con-int .passageway .hascon .title span i{font-size:12px;font-style:normal;padding:0 5px;border-radius:8px;background:#ddd;line-height:14px;}
 .-task-con-int .passageway .hascon .lesson p{height:70px;line-height:70px;border-bottom:1px dotted #eee;}
 .-task-con-int .passageway .hascon .train p{height:70px;line-height:70px;border-bottom:1px dotted #eee;}
-.-task-con-int .passageway .hascon .lesson p .hasmargin{margin: 0 4.2% 0 21.7%;}
-.-task-con-int .passageway .hascon .lesson p .haspadding{margin: 0 8.3%;}
-.-task-con-int .passageway .hascon .train p .hasmargin{margin: 0 12.5% 0 25%;}
+.-task-con-int .passageway .hascon .lesson p .first{width:25%;display:inline-block;}
+.-task-con-int .passageway .hascon .lesson p .qian{color:#ddd;}
+.-task-con-int .passageway .hascon .train p .qian{color:#ddd;}
+.-task-con-int .passageway .hascon .lesson p .hasmargin{width:16.7%;display:inline-block;margin:0 10%;color:#888;}
+.-task-con-int .passageway .hascon .lesson p .haspadding{width:16.7%;display:inline-block;margin-right:12%;color:#888;}
+.-task-con-int .passageway .hascon .lesson p .last{width:8.33%;display:inline-block;color:#888;}
+.-task-con-int .passageway .hascon .train p .first{width:25%;display:inline-block;}
+.-task-con-int .passageway .hascon .train p .hasmargin{width:16.7%;margin: 0 16.7%;color:#888;}
+.-task-con-int .passageway .hascon .train p .last{width:25%;display:inline-block;color:#888;}
+.-task-con-int .passageway .hascon .lesson p:hover a{color:#51a74f;}
+.-task-con-int .passageway .hascon .lesson p:hover .qian{color:#51a74f;}
+.-task-con-int .passageway .hascon .train p:hover a{color:#51a74f;}
+.-task-con-int .passageway .hascon .train p:hover .qian{color:#51a74f;}
 .-task-con-int .passageway .hascon .expand{display:block;;height:70px;line-height:70px;text-align:center;;border-bottom:1px dotted #eee;}
 /*--------------------------------------箭头动画效果-----------------------------------*/
 .-task-con-int  .passageway .hint .zhuan{