-
- +
<%= @user.login %> - + <% if @user.user_extensions && @user.user_extensions.gender && @user.user_extensions.gender == 1 %> + + <% else %> + + <% end %>
@@ -41,7 +45,7 @@ <% end %>
+
<% if current_user %>
<% else %>
@@ -60,13 +64,13 @@ - +
-
+
<%= @user.visits.to_i %> 次访问
@@ -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 @@
<% if current_user %>
-
+
<% else %>
-
<% if @courses_count == 0 && @shixuns_count == 0 %>
"> +
"> <%= @user.user_extensions.brief_introduction.blank? ? "这家伙很懒，什么都没留下~" : @user.user_extensions.brief_introduction %>
<% end %> @@ -150,13 +154,16 @@
开始
- -
-
- <%= link_to '创建课程', new_syllabus_path(:host => Setting.host_course), :target => "_blank" %> -
- <%= link_to '创建班级', new_course_path(:host => Setting.host_course), :target => "_blank" %> -
- <%= link_to "加入班级", join_private_courses_courses_path, :remote => true, :method => "post" %> -
- <%= link_to "发现实训", '', :target => "_blank" %> -
- <%= link_to '发起求助', new_forum_memo_path(:forum_id => Forum.first.id, :forum_index => true), :target => "_blank" %> -
+
+
-
+
- <%= link_to '创建课程', new_syllabus_path(:host => Setting.host_course), :target => "_blank" %> +
- <%= link_to '创建班级', new_course_path(:host => Setting.host_course), :target => "_blank" %> +
- <%= link_to "加入班级", join_private_courses_courses_path, :remote => true, :method => "post" %> +
- <%= link_to "发现实训", '', :target => "_blank" %> +
- <%= link_to '发起求助', new_forum_memo_path(:forum_id => Forum.first.id, :forum_index => true), :target => "_blank" %> +
@@ -165,7 +172,7 @@
- 
+ 
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 000000000..4b158a05f
Binary files /dev/null and b/public/images/edu_user/edu-nodata.png differ
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{
+
显示你常用的课堂社区、实训社区列表
@@ -188,10 +195,10 @@
<% @courses.each do |course| %>
-
\ No newline at end of file
+- <%= course.name %> + <%= course.name %> 课程：<%= course.syllabus.title %> 更新时间：<%= format_time course.updatetime %> - 分享 + 分享
<% end %> <% if @courses_count > 8 %> @@ -202,9 +209,9 @@
<% @shixuns.each do |shixun| %>
- 胡莎莎/Helloword:java实训入门 + 胡莎莎/Helloword:java实训入门 已解锁第2关/共8关 - 上次离开时间：2017-02-09 15:21 + 上次离开时间：2017-02-09 15:21
<% end %> @@ -226,9 +233,9 @@