zaihui
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
huang 2017-05-23 20:06:43 +08:00
parent 81294a0616 b0526b50d9
commit be33dad84d
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/account/authentication.html.erb
View File

@ -10,9 +10,8 @@
<div class="mr15 ml50">
<div class="clearfix ml50 mb30 mt30">
<div class="user-liucheng fl">1.上传图片</div>
<div class="task-arrow-right fl mr10"></div>
<div class="user-liucheng user-liucheng-grey fl">2.审核并完成认证</div>
<div class="task-arrow-right task-arrow-right-grey fl"></div>
<div class="task-arrow-right fl "></div>
<div class="user-liucheng fl user-liucheng-grey">2.审核并完成认证</div>
</div>
<div class=" ml50 clearfix mb30">
<span class="fl font-16 font-bd">职业证明：</span>

6
app/views/courses/_courseList.html.erb
View File

@ -22,10 +22,10 @@
<p class="color-grey pl15 pr15 clearfix">
<% syResource = sy_resources sy %>
<% syHome = sy_homeworks sy %>
<span class="fl mr30"><i class="fa fa-cubes color-light-green pr10" aria-hidden="true"></i><em><%= syResource.count %></em></span>
<span class="fl"><i class="fa fa-map color-light-green pr10" aria-hidden="true"></i><em><%= syHome.count %></em></span>
<span class="fl mr30"><i class="fa fa-cubes color-light-green pr10" aria-hidden="true" title="资源"></i><em><%= syResource.count %></em></span>
<span class="fl"><i class="fa fa-map color-light-green pr10" aria-hidden="true"title="题库"></i><em><%= syHome.count %></em></span>
<span class="fr collect" onclick="add_cancel_to_favorites(this);">
<i class="fa fa-heart-o grey" aria-hidden="true"></i>
<i class="fa fa-heart-o grey" aria-hidden="true"title="收藏课程"></i>
</span>
</p>
</div>

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

@ -1,5 +1,5 @@
<div class="edu-class-container " >
<p class="mb10"><i class="fa fa-map-marker mr5 color-grey " ></i><a href="<%= course_path(@course) %>">班级首页</a> > <a href="<%= homework_common_index_path(:course => @course.id) %>">作业列表</a>
<p class="mb10 font-14"><i class="fa fa-map-marker mr5 color-grey " ></i><a href="<%= course_path(@course) %>">班级首页</a> > <a href="<%= homework_common_index_path(:course => @course.id) %>">作业列表</a>
<% if @index %>
><a href="#">#<%= @index %></a>
<% end %>

4
app/views/courses/index.html.erb
View File

@ -5,13 +5,13 @@
<a href="javascript:void(0);">智能课堂</a>
</p>
<div class="search clearfix mb15">
<select class="task task-height-40 panel-box-sizing fl color-grey mr10" style="width:160px;" id="syllabuses" onchange="submit_select_syllabuses(this.value)">
<select class="task task-height-40 panel-box-sizing fl color-grey " style="width:160px; border: none;" id="syllabuses" onchange="submit_select_syllabuses(this.value)">
<option value="all">所有课程</option>
<option value="create">我发布的课程</option>
<option value="join">我参与的课程</option>
<!--<option>我收藏的课程</option>-->
</select>
<div class="header-search fl ml15 mr15" >
<div class="header-search fl ml10 mr15" >
<input type="text" placeholder="输入课程名字的关键字进行搜索" class="header-search-input fl" id="course_search" style="width: 200px;height: 40px;" />
<a href="javascript:void(0);" onclick="search_syllabuses();"><i class="fa fa-search font-16 mt12 mr10"></i></a>
</div>

2
app/views/homework_common/_homework_search_form.html.erb
View File

@ -1,4 +1,4 @@
<%= form_tag(homework_common_index_path(:course => @course.id, :order => @order), :remote => true , :method => 'get', :id => 'resource_search_form') do %>
<input type="text" name="search" placeholder="输入作业名称进行搜索" class="task-form-100 panel-box-sizing" id="homework_name_search" value="<%= @search %>" />
<a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt10"><i class="fa fa-search"></i></a>
<a href="javascript:void(0);" onfocus = 'this.blur();' onclick="$('#resource_search_form').submit();" class="edu-btn-search font-16 color-grey mt5"><i class="fa fa-search"></i></a>
<% end %>

3
app/views/layouts/_course_base_info.html.erb
View File

@ -27,7 +27,7 @@
<ul class="fl edu-class-top-info ml15">
<li class="mb10 font-16"><%= @course.name %></li>
<li class="color-grey clearfix mb10">
<span class="fl font-14">邀请码：
<span class="fl font-14">邀请码：<span class="color-orange">
<% if @course.invite_code_halt == 0 %>
<% if User.current.admin? || User.current.member_of_course?(@course) %>
<%=@course.generate_invite_code %>
@ -37,6 +37,7 @@
<% else %>
已停用
<% end %>
</span>
</span>
<div class="edu-weixin-share fl ml30">
<a href="#" class=" fr font-14 ">分享<i class="fa fa-weixin fr mt5 ml5" aria-hidden="true"></i></a>

4
app/views/layouts/base_courses.html.erb
View File

@ -52,7 +52,7 @@
<div class="cl"></div>
<div class="edu-class-container edu-position" style="flex: 1 0 auto;">
<% if @show_page %>
<p class="mb10">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to User.current.show_name, user_path(User.current) %> >
<%= link_to '智能课堂', user_course_community_path(User.current) %> >
@ -60,7 +60,7 @@
<%= link_to @course.name, course_path(@course), :title => '班级' %>
</p>
<% else %>
<p class="mb10">
<p class="mb10 font-14">
<i class="fa fa-map-marker mr5 color-grey" ></i>
<%= link_to '班级首页', course_path(@course) %> > <span class="color-dark-grey"><%= @curr_page %></span>
</p>

4
app/views/syllabuses/_syllabus_des.html.erb
View File

@ -1,7 +1,7 @@
<div class="edu-tab-con-box" id="sy_des_show_div">
<% if @syllabus.des_status == 1 %>
<% if @is_syllabus_member %>
<a href="javascript:void(0);" id="edit_sy_des" class="link-color-grey fr font-16" title="编辑"><i class="fa fa-edit mr15"></i></a>
<a href="javascript:void(0);" id="edit_sy_des" class="link-color-grey fr font-16" title="编辑"><i class="fa fa-edit "></i></a>
<div class="cl"></div>
<% end %>
<div class="">
@ -14,7 +14,7 @@
<% end %>
</div>
<div class="edu-tab-con-box undis" id="sy_des_edit_div">
<a href="javascript:void(0)" id="save_sy_des" class="link-color-grey fr font-16" title="保存"><i class="fa fa-floppy-o mr15"></i></a>
<a href="javascript:void(0)" id="save_sy_des" class="link-color-grey fr font-16" title="保存"><i class="fa fa-floppy-o "></i></a>
<a href="javascript:void(0)" id="cancel_edit_sy_des" class="link-color-grey fr font-16" title="取消"><i class="fa fa-undo mr15"></i></a>
<%= labelled_form_for @syllabus, :url =>update_des_syllabus_path(@syllabus),
:html => {:nhname=>'form',:multipart => true, :method => 'post', :id => 'syllabus-des-form'} do |f| %>

BIN
public/images/user/shenghe.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

4
public/stylesheets/css/edu-public.css
View File

@ -27,7 +27,7 @@ select.header-search-select{ border:none; font-size:14px; padding:5px; backgroun
.task-user-dropdown-nav { padding-top:5px; }
.task-user-dropdown-nav li { display: inline-block; text-align: center; width:100%; height: 30px; line-height: 30px;}
.task-user-dropdown-nav li:hover{ background:#eee;}
.task-line{ display: block; height: 1px!important; line-height: 1px; border-bottom:1px solid #eee;}
.task-line{ display: block; height: 1px!important; line-height: 1px!important; border-bottom:1px solid #eee; margin:0;}
.inner-nav-user:hover .task-user-dropdown{ display:block;}
dropdown{display: inline-block; height:30px; line-height:1.9; font-size:12px; }
dropdown label, dropdown ul li{ display: block; width:42px; padding:4px 10px; text-align: center;border-radius:3px; color:#666;}
@ -203,7 +203,7 @@ input.task-height-150,textarea.task-height-150,.task-height-100{height:100px;}
.my_account_info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.my_account_info li{ padding-left: 5px; line-height: 1.5;}
.li_bottom_border{ border-bottom:1px solid #eee;}
a.task-index-name{ max-width:80px;}
a.task-index-name{ display: inline-block; max-width:80px;}
.task-index-name{ display: inline-block; max-width:80px;}
/*滑块验证*/

6
public/stylesheets/css/edu-user.css
View File

@ -159,8 +159,8 @@ input.input-width43{ width:43%;}
.panel-user-headimg-show{ width: 50%; border-right:1px solid #eee;}
.panel-user-headimg-show img{ width:200px; margin:100px auto; }
.user-liucheng{ padding:10px 110px; text-align: center; background:#3498db; color:#fff; font-size:12px;}
.user-liucheng-grey{ background:#ccc; color:#666;}
.user-liucheng{ padding:10px 0px; width: 300px; text-align: center; background:#3498db; color:#fff; font-size:12px; border-radius:3px 0 0 3px;}
.user-liucheng-grey{ border-radius:0 3px 3px 0;}
.user-renzheng-box li{ float: left; width:200px; margin-right:25px;}
.user-renzheng-img{ width: 200px;}
a.user-renzheng-upload{ display: block; width: 200px; height: 100px; background:#ccc; text-align: center; padding-top:50px; color:#888;}
@ -169,7 +169,7 @@ a:hover.user-renzheng-upload{ color:#666;}
.panel-user-setting-ul li.t_l{ text-align: left;}
.panel-user-setting-ul{ padding:20px 0; border-bottom:1px solid #eee; }
.panel-span-name{ display:inline-block; max-width:80px; overflow: hidden; line-height:12px;}
.task-arrow-right {width:0; height:0; border-top:21px solid transparent; border-bottom: 21px solid transparent; border-left:21px solid #3498db;}
.task-arrow-right {display: block;background: url(/images/user/shenghe.jpg) no-repeat 0px 0; width:41px; height:42px;}
.task-arrow-right-grey {border-left:21px solid #ccc;}
.select_box{font-family: "宋体"; font-size: 12px;color: #999999;width: 178px;line-height: 20px;margin: 50px auto;}