Hjqreturn
/
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:
daiao 2017-04-25 08:57:42 +08:00
parent d51deeb949 8a1160add0
commit 3c99fb3d7f
15 changed files with 107 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin_controller.rb
View File

@ -245,6 +245,10 @@ class AdminController < ApplicationController
end
end
def shixuns
@shixuns = Shixun.all
end
# 单位名称列表下的已审批按照名字排序
def apply_shcool_sort
@order = ""

3
app/controllers/shixuns_controller.rb
View File

@ -21,6 +21,9 @@ class ShixunsController < ApplicationController
end
def index
@shixuns = Shixun.all
@shixuns_count = @shixuns.count
render :layout => "base_edu"
end

4
app/helpers/shixuns_helper.rb
View File

@ -1,5 +1,9 @@
module ShixunsHelper
def had_passed_count
end
#显示项目配置菜单
def show_project_memu user
if user.allowed_to?(:edit_project, @shixun)

2
app/models/shixun.rb
View File

@ -1,4 +1,4 @@
# status 控制实训的状态，0：未开启；1: 已开启（TPM）
# status 控制实训的状态，0：未开启；1: 已开启（TPM）; 2：已认证
class Shixun < ActiveRecord::Base
attr_accessible :description, :is_public, :name, :changeset_num, :status, :user_id, :gpid, :language

48
app/views/admin/shixuns.html.erb Normal file
View File

@ -0,0 +1,48 @@
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
<h3>实训列表</h3>
<%#= render 'admin/tab_excellent_courses' %>
<!--<h3>-->
<!--<%#=l(:label_excellent_courses_list)%>-->
<!--</h3>-->
<div class="autoscroll">
<table class="list" style="width: 100%;table-layout: fixed">
<thead>
<tr>
<th style="width: 25px;">
序号
</th>
<th style="width: 120px;">
实训名
</th>
<th style="width: 50px;">
创建者
</th>
<th style="width: 50px;">
操作
</th>
</tr>
</thead>
<tbody>
<% @shixuns.each do |shixun| %>
<tr class="<%= cycle("odd", "even") %>">
<td style="text-align: center;">
<%= shixun.id %>
</td>
<td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=shixun.name%>'>
<span>
<%= link_to(shixun.name, shixun_path(shixun.id)) %>
</span>
</td>
<td align="center">
<%= link_to(shixun.try(:owner).try(:realname).truncate(6, omission: '...'), user_path(shixun.owner)) %>
</td>
<td class="buttons">
<%= link_to(shixun.status == 2 ? "已认证" : "认证", { :controller => 'admin', :action => 'shixun', :id => shixun.id }, :class => 'icon-del') %>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>

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

@ -35,12 +35,12 @@
<font></font>
<ul class="task-user-dropdown-nav">
<li><%= link_to User.current.show_name, user_path(User.current), :class => "task-index-name task-hide" %></li>
<li class="task-line"></li>
<span class="task-line"></span>
<li><%= link_to '我的主页', user_path(User.current) %></li>
<li><%= link_to '我的课程', {:controller => "users", :action => "user_courselist", :id => User.current} %></li>
<li><%= link_to '我的实训', {:controller => "users", :action => "user_projectlist", :id => @user} %></li>
<li><%= link_to '待办任务', "" %></li>
<li class="task-line"></li>
<span class="task-line"></span>
<li><%= link_to '修改资料', my_account_path %></li>
<li><%= link_to '退出', logout_url_without_domain %></li>
</ul>

15
app/views/layouts/_unlogin_header.html.erb
View File

@ -18,12 +18,17 @@
</div>
<!--<input type="text" placeholder="请输入关键词进行搜索" class="new-search fl ml15 mr10">-->
<ul class="fl innner-nav">
<li>
<%= link_to "问吧", forums_path, :class =>"new-nav-a", :target => "_blank" %>
</li>
<li><%= link_to "智能课堂", user_course_community_path(User.current), :class => "new-nav-a", :target => "_blank" %></li>
<li><%= link_to "游戏实训", user_project_community_path(User.current), :class => "new-nav-a", :target => "_blank" %></li>
<li><%= link_to "有问有答", forums_path, :class =>"new-nav-a", :target => "_blank" %></li>
<li><%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "new-nav-a", :target=>"_blank" %></li>
<div class="cl"></div>
</ul>
<a href="<%= user_join_path %>" class="fr new-btn mt10">注册</a>
<a href="<%= signin_path %>" class="fr new-btn new-btn-blue mr5 mt10">登录</a>
<div class="edu-unlogin-nav">
<a href="<%= user_join_path %>" class="fr ">注册</a>
<span class="fr ml10 mr10">或</span>
<a href="<%= signin_path %>" class="fr ">登录</a>
</div>
</div>
<script>

2
app/views/layouts/base_edu.html.erb
View File

@ -9,7 +9,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/bigdata-common','css/bigdata-public', 'css/taskstyle', 'css/font-awesome', 'css/bigdata-tooltipster' %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/bigdata-common','css/bigdata-public', 'css/taskstyle', 'css/font-awesome' %>
<%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%>
</head>

144
app/views/shixuns/index.html.erb
View File

@ -2,11 +2,11 @@
<div class="task-index-head mt20 mb20">
<div class="task-index-head-top">
<h2 class="fl task-inde-head-title">游戏实训</h2>
<a href="javascript:void(0);" class=" task-btn task-btn-green fr">创建</a>
<%= link_to "创建", new_shixun_path, :class => "task-btn task-btn-green fr" %>
<div class="cl"></div>
</div>
<ul class="task-index-head-info clearfix">
<li><span class="color-orange font-bd">55</span><br/><span >全部实训</span></li>
<li><span class="color-orange font-bd"><%= @shixuns_count %></span><br/><span >全部实训</span></li>
<li><span class="color-orange font-bd">3</span><br/><span>你已通过</span></li>
<li><span class="color-orange font-bd">280</span><br/><span>取得成绩</span></li>
</ul>
@ -68,129 +68,29 @@
</div>
<div class="task-index-list clearfix mb20">
<div class="task-index-list-box fl ">
<div class="task-mg8 task-mg8-hover">
<div class="task-index-list-box-top">
<span class="color-orange">未审核</span>
<h3 class="task-index-list-title task-hide">Helloworld：Python入门实训项目</h3>
<div class=" clearfix task-index-list-user">
<img src="images/user/female.jpg" width="60" height="60" alt="用户" class="panel-warp-img mr10 fl">
<a href="#" class="task-index-name task-hide fl">Cillian</a>
<% @shixuns.each do |shixun| %>
<div class="task-index-list-box fl ">
<div class="task-mg8 task-mg8-hover">
<div class="task-index-list-box-top">
<span class="color-orange">未审核</span>
<h3 class="task-index-list-title task-hide"><%= shixun.name %></h3>
<div class=" clearfix task-index-list-user">
<%= link_to image_tag(url_to_avatar(shixun.owner), :width =>"60", :height => "60", :class => "panel-warp-img mr10 fl", :alt=>"头像"),user_path(shixun.owner)%>
<%= link_to shixun.owner.try(:show_name), user_path(shixun.owner), :class => "task-index-name task-hide fl" %>
</div>
<div class="task-index-list-hover">
<p><%= shixun.description %></p>
</div>
</div>
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-gamepad mr5 color-light-green" title="实训任务"></i><span><%= shixun.challenges.count %></span></li>
<!--<li><i class="fa fa-comments-o mr5 color-light-green"></i><span>1255</span></li>-->
<li><i class="fa fa-users mr5 color-light-green"></i><span><%= shixun.myshixuns.count %></span></li>
</ul>
</div>
<div class="task-index-list-hover">
<p>大家好，本项目是一个Python的入门学习和训练课程。
课程知识点和训练内容包括：
1、介绍Python的字符串输出功能的实现要点，并要求学生提交Helloworld的实现代码；
2、介绍Python的命令行输入的实现要点，并要求学生根据输入参数决定输出的字符串。</p>
</div>
</div>
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-gamepad mr5 color-light-green"></i><span>5</span></li>
<li><i class="fa fa-comments-o mr5 color-light-green"></i><span>1255</span></li>
<li><i class="fa fa-users mr5 color-light-green"></i><span>2.1万</span></li>
</ul>
</div>
</div>
<div class="task-index-list-box fl">
<div class="task-mg8">
<div class="task-index-list-box-top">
<span class="btn-cir btn-cir-orange fr font-14 task-vip">vip</span>
<span class="color-orange">已审核</span>
<h3 class="task-index-list-title task-hide">Helloworld：Python入门实训项目Helloworld：Python入门实训项目</h3>
<div class=" clearfix task-index-list-user">
<img src="images/user/female.jpg" width="60" height="60" alt="用户" class="panel-warp-img mr10 fl">
<a href="#" class="task-index-name task-hide fl">Cillian风吹麦浪风吹麦浪</a>
</div>
<div class="task-index-list-hover">
<p>大家好，本项目是一个Python的入门学习和训练课程。
课程知识点和训练内容包括：
1、介绍Python的字符串输出功能的实现要点，并要求学生提交Helloworld的实现代码；
2、介绍Python的命令行输入的实现要点，并要求学生根据输入参数决定输出的字符串。</p>
</div>
</div>
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-gamepad mr5 color-light-green"></i><span>5</span></li>
<li><i class="fa fa-comments-o mr5 color-light-green"></i><span>1255</span></li>
<li><i class="fa fa-users mr5 color-light-green"></i><span>2.1万</span></li>
</ul>
</div>
</div>
<div class="task-index-list-box fl">
<div class="task-mg8">
<div class="task-index-list-box-top">
<span class="color-orange">未审核</span>
<h3 class="task-index-list-title task-hide">Helloworld：Python入门实训项目</h3>
<div class=" clearfix task-index-list-user">
<img src="images/user/female.jpg" width="60" height="60" alt="用户" class="panel-warp-img mr10 fl">
<a href="#" class="task-index-name task-hide fl">Cillian</a>
</div>
<div class="task-index-list-hover">
<p>大家好，本项目是一个Python的入门学习和训练课程。
课程知识点和训练内容包括：
1、介绍Python的字符串输出功能的实现要点，并要求学生提交Helloworld的实现代码；
2、介绍Python的命令行输入的实现要点，并要求学生根据输入参数决定输出的字符串。</p>
</div>
</div>
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-gamepad mr5 color-light-green"></i><span>5</span></li>
<li><i class="fa fa-comments-o mr5 color-light-green"></i><span>1255</span></li>
<li><i class="fa fa-users mr5 color-light-green"></i><span>2.1万</span></li>
</ul>
</div>
</div>
<div class="task-index-list-box fl">
<div class="task-mg8">
<div class="task-index-list-box-top">
<span class="btn-cir btn-cir-orange fr font-14 task-vip">vip</span>
<span class="color-orange">已审核</span>
<h3 class="task-index-list-title task-hide">Helloworld：Python入门实训项目Helloworld：Python入门实训项目</h3>
<div class=" clearfix task-index-list-user">
<img src="images/user/female.jpg" width="60" height="60" alt="用户" class="panel-warp-img mr10 fl">
<a href="#" class="task-index-name task-hide fl">Cillian风吹麦浪风吹麦浪</a>
</div>
<div class="task-index-list-hover">
<p>大家好，本项目是一个Python的入门学习和训练课程。
课程知识点和训练内容包括：
1、介绍Python的字符串输出功能的实现要点，并要求学生提交Helloworld的实现代码；
2、介绍Python的命令行输入的实现要点，并要求学生根据输入参数决定输出的字符串。</p>
</div>
</div>
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-gamepad mr5 color-light-green"></i><span>5</span></li>
<li><i class="fa fa-comments-o mr5 color-light-green"></i><span>1255</span></li>
<li><i class="fa fa-users mr5 color-light-green"></i><span>2.1万</span></li>
</ul>
</div>
</div>
<div class="task-index-list-box fl">
<div class="task-mg8">
<div class="task-index-list-box-top">
<span class="color-orange">未审核</span>
<h3 class="task-index-list-title task-hide">Helloworld：Python入门实训项目</h3>
<div class=" clearfix task-index-list-user">
<img src="images/user/female.jpg" width="60" height="60" alt="用户" class="panel-warp-img mr10 fl">
<a href="#" class="task-index-name task-hide fl">Cillian</a>
</div>
<div class="task-index-list-hover">
<p>大家好，本项目是一个Python的入门学习和训练课程。
课程知识点和训练内容包括：
1、介绍Python的字符串输出功能的实现要点，并要求学生提交Helloworld的实现代码；
2、介绍Python的命令行输入的实现要点，并要求学生根据输入参数决定输出的字符串。</p>
</div>
</div>
<ul class="task-index-list-box-bottom clearfix">
<li><i class="fa fa-gamepad mr5 color-light-green"></i><span>5</span></li>
<li><i class="fa fa-comments-o mr5 color-light-green"></i><span>1255</span></li>
<li><i class="fa fa-users mr5 color-light-green"></i><span>2.1万</span></li>
</ul>
</div>
</div>
<% end %>
<div class="cl"></div>
<div class="panel-pages mt20 ">
<a href="javascript:void(0);" class="pages-big">上一页</a>

1
config/locales/zh.yml
View File

@ -493,6 +493,7 @@ zh:
label_course_all: 班级列表
label_syllabus_all: 课程列表
label_excellent_courses_list: 精品班级列表
label_shixuns_list: 实训列表
label_course_resource_list: 班级资源列表
label_project_resource_list: 項目资源列表
label_teacher_all: 所有教师

1
config/routes.rb
View File

@ -1388,6 +1388,7 @@ RedmineApp::Application.routes.draw do
post 'admin/update_course_name'
post 'admin/update_syllabus_title'
get 'admin/excellent_courses', as: :excellent_courses
get 'admin/shixuns', as: :admin_shixuns
get 'admin/excellent_all_courses', as: :excellent_all_courses
match 'admin/set_excellent_course/:id', :to => 'admin#set_excellent_course'
match 'admin/cancel_excellent_course/:id', :to => 'admin#cancel_excellent_course'

1
lib/redmine.rb
View File

@ -406,6 +406,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
menu.push :notices, {:controller => 'admin', :action => 'notices'}, :caption => :label_notification_list
menu.push :latest_login_users, {:controller => 'admin', :action => 'latest_login_users'}, :caption => :label_latest_login_user_list
menu.push :excellent_courses, {:controller => 'admin', :action => 'excellent_courses'}, :caption => :label_excellent_courses_list
menu.push :shixuns, {:controller => 'admin', :action => 'shixuns'}, :caption => :label_shixuns_list
menu.push :course_resource_list, {:controller => 'admin', :action => 'course_resource_list'}, :caption => :label_course_resource_list
menu.push :project_resource_list, {:controller => 'admin', :action => 'project_resource_list'}, :caption => :label_project_resource_list
menu.push :homework, {:controller => 'admin', :action => 'homework'}, :caption => :label_user_homework

11
public/stylesheets/css/bigdata-public.css
View File

@ -17,15 +17,18 @@ input.header-search-input{ width:135px; height:30px; padding:0 5px; border-style
.inner-nav-user{ width: 55px; height: 40px; margin-top:5px; position: relative;}
.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
select.header-search-select{ border:none; font-size:14px; padding:5px; background: none;}
.edu-unlogin-nav a{ color:#fff!important; font-size:14px; line-height:50px;}
.edu-unlogin-nav a:hover{ color:#3b94d6;}
.edu-unlogin-nav{ font-size:12px; color:#fff; line-height:50px;}
.task-user-dropdown{width:120px; background-color:#fff; border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:relative; top:10px; right:45px; display: none; z-index:999;}
.task-user-dropdown{font-size:12px; line-height: 1.9; width:120px; background-color:#fff; border-radius:3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:relative; top:10px; right:45px; display: none; z-index:999;}
.task-user-dropdown font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left:60px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.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;}
li.task-line{ height: 1px; line-height: 1px; border-bottom:1px solid #eee;}
.task-line{ display: block; height: 1px!important; line-height: 1px; border-bottom:1px solid #eee;}
.inner-nav-user:hover .task-user-dropdown{ display:block;}
dropdown{display: inline-block; height:30px; }
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;}
dropdown label:hover, dropdown ul li:hover{background: #eee; color:#666;cursor: pointer;}
dropdown label{color: #666;border-radius: 3px 0 0 3px; position: relative; z-index: 2; width:50px; text-align: center;}
@ -192,6 +195,8 @@ 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;}
.task-index-name{ display: inline-block; max-width:80px;}
/*滑块验证*/
.drag_slider{ position: relative; background-color: #e8e8e8; width: 350px; height: 45px; line-height: 45px; text-align: center;}

20
public/stylesheets/css/bigdata-showpage.css
View File

@ -1,6 +1,5 @@
/* 新版展示内页 */
.innner-nav li{ float: left; margin-right: 25px;}
.inner-banner{ background:url(/images/inner/banner-inner.jpg) 0px 0px no-repeat; width: 100%; height: 550px; padding-top:50px;}
.inner-man{ position: absolute; right:100px; top:115px;}
.inner-man img{width:200px; }
@ -21,24 +20,7 @@ a:hover.btn-blue-line{background: #3b94d6; color:#fff;}
.innerbox-txt-p{font-size: 16px; color: #666; margin-bottom:20px;}
.back-color-black{ background:#47494d;}
.inner-t-c{ text-align: center;}
.inner-footer{ width: 100%; background:#323232; height:155px;}
.inner-footer_con{ width: 1200px; margin: 0 auto;}
.inner-footer-nav{ height: 50px; border-bottom:1px solid #47494d;}
.inner-footer-nav li a{ float: left; margin-right:15px; font-size: 14px; color: #888; line-height: 50px;}
.saoma-box{ position: relative;}
.img-saoma{ }
.saoma-img-box{ position: absolute; top:-300px; left: -95px; border-radius:3px; background:#fff; padding:15px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display: none;}
.saoma-box li:hover ul{display:block; }
.img-show{ width:50px; height:50px; border-radius:50px; }
.saoma-img-box font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top:289px;left: 110px; border-style:solid; border-color:#fff transparent transparent transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
.inner-btnbox02{ width:270px; margin: 30px auto 0;}
.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
.inner-nav-mes{ font-size:28px; color: #fff; position: relative; margin-top:3px; margin-right:35px;}
.inner-nav-cir{ position: absolute; top:0px; left:15px; background:#3b94d6; color:#fff; border-radius:15px;padding:0 5px; display: inline-block; font-size: 10px;}
.inner-nav-user{ width: 55px; height: 40px; margin-top:5px; position: relative;}
.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
.inner-nav-user font{border: 1px solid #dddddd; display: block; border-width: 6px; position: absolute; top:18px;left:45px; border-style:solid; border-color:#fff transparent transparent transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5);}
/*消息弹框*/
.shadowbox_news{ width:305px; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 12px; top:50px; left:-135px;display: none; z-index:999;}
.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}

2
public/stylesheets/css/taskstyle.css
View File

@ -228,8 +228,6 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f
}
.task-index-list-hover{ position:absolute; top:0; left:0; background:rgba(0,0,0,0.7); color:#fff; width: 100%; height: 100%; border-radius:2px 2px 0 0; }
.task-index-list-hover p{ margin:15px;overflow:hidden; text-align: left; height: 85%;}
a.task-index-name{ max-width:80px;}
.task-index-name{ display: inline-block; max-width:80px;}
.task-index-list-hover{ display: none; }
.task-mg8:hover .task-index-list-hover{display: block;}
.task-mg8:hover{ box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.15);cursor: pointer;}