Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

Browse Source
dev_local_lzdx
daiao 5 years ago
parent ff422a309e f5e822a664
commit a7ac86ff4f
7 changed files with 41 additions and 175 deletions
Show Stats Download Patch File Download Diff File

1
app/views/layouts/_logined_header.html.erb
Unescape View File

@ -63,7 +63,6 @@ display: none; right:110px;">
<li><%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %></li> <li><%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %></li>
<li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li> <li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li>
<li><%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %></li> <li><%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %></li>
<li><%= link_to '我的众包', user_path(User.current, :type => 'a_package') %></li>
<% if User.current.partner.present? %> <% if User.current.partner.present? %>
<li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li> <li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li>
<% end %> <% end %>

4
app/views/layouts/base_management.html.erb
Unescape View File

@ -114,8 +114,8 @@
</li> </li>
<li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 10 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">审批</a> <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 10 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">审批</a>
<ul class="edu-admin-nav-inner"> <ul class="edu-admin-nav-inner">
<li><%= link_to "实名认证", identity_authentication_managements_path %></li> <!-- <li><%#= link_to "实名认证", identity_authentication_managements_path %></li>-->
<li><%= link_to "职业认证", professional_authentication_managements_path %></li> <!-- <li><%#= link_to "职业认证", professional_authentication_managements_path %></li>-->
<li><%= link_to "试用授权", trial_authorization_managements_path %></li> <li><%= link_to "试用授权", trial_authorization_managements_path %></li>
<li><%= link_to "部门审批", depart_managements_path %></li> <li><%= link_to "部门审批", depart_managements_path %></li>
<li><%= link_to '单位审批', unit_managements_path %></li> <li><%= link_to '单位审批', unit_managements_path %></li>

32
app/views/users/_returnTop_btn.html.erb
Unescape View File

@ -30,35 +30,3 @@
</div> </div>
<div id="trophyreturn" class="-task-sidebars" style="right: 65px !important;width: 154px;">
<a onclick="trophyreturnfun();" id="closeIcon" style="position: absolute;right: 12px;top: 10px; color: #000;">
<i class="iconfont icon-shanchudiao"></i>
</a>
<a href="/competitions">
<img src="/images/educoder/competition/lvmeng.png" width="150px" height="150px">
</a>
</div>
<script>
function trophyreturnfun(){
$("#trophyreturn").hide()
localStorage.setItem('trophy_uid', true);
}
$(function() {
var trophy_uid = false;
if (window.localStorage) {
trophy_uid = localStorage.getItem('trophy_uid');
} else {
trophy_uid = false
}
if(trophy_uid==="true"||trophy_uid===true){
$("#trophyreturn").hide()
}
})
</script>

101
app/views/welcome/index.html.erb
Unescape View File

@ -77,105 +77,4 @@
<%= render :partial => "shixuns/shixun_item", :locals => {:shixuns => @shixuns} %> <%= render :partial => "shixuns/shixun_item", :locals => {:shixuns => @shixuns} %>
</div> </div>
</div> </div>
<!--导师排行榜-->
<div class="pt60 pb60 mb30 mentor-ranking">
<div class="educontent">
<div class="edu-txt-center">
<p class="color-dark edu-txt-center font-24" style="line-height: 30px">导师排行榜</p>
<p class="color-grey-cd font-12">MENTOR RANKING</p>
</div>
<div class="ranking clearfix">
<ul class="grade color-dark">
<% if @tea_users[1] %>
<li class="mt35 pr">
<img src="/images/educoder/huangguan-two.png" class="huangguan"/>
<a href="/users/<%= (@tea_users[1].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@tea_users[1])) %>
<span class="task-hide rankName"><%= @tea_users[1].try(:show_name) %></span>
</a>
</li>
<% end %>
<% if @tea_users[0] %>
<li class="pr">
<img src="/images/educoder/huangguan.png" class="huangguan"/>
<a href="/users/<%= (@tea_users[0].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@tea_users[0])) %>
<span class="task-hide rankName"><%= @tea_users[0].try(:show_name) %></span>
</a>
</li>
<% end %>
<% if @tea_users[2] %>
<li class="mt35 pr">
<img src="/images/educoder/huangguan-three.png" class="huangguan"/>
<a href="/users/<%=(@tea_users[2].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@tea_users[2])) %>
<span class="task-hide rankName"><%= @tea_users[2].try(:show_name) %></span>
</a>
</li>
<% end %>
</ul>
<br/>
<ul class="grade mt30">
<% if @tea_users.size > 3 %>
<% @tea_users[3..@tea_users.size].each do |t_u| %>
<li>
<a href="/users/<%= t_u.try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(t_u)) %>
<span class="task-hide rankName"><%= t_u.try(:show_name) %></span>
</a>
</li>
<% end %>
<% end %>
</ul>
</div>
</div>
</div>
<!--程序员排行榜-->
<div class="pt60 pb60 mb30 pro-ranking">
<div class="educontent">
<div class="edu-txt-center">
<p class="color-dark edu-txt-center font-24" style="line-height: 30px">程序员排行榜</p>
<p class="color-grey-cd font-12">PROGRAMMER RANKING</p>
</div>
<div class="ranking clearfix">
<ul class="grade color-dark">
<% if @stu_users[1] %>
<li class="mt35 pr">
<img src="/images/educoder/huangguan-two.png" class="huangguan"/>
<a href="/users/<%= @stu_users[1].try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(@stu_users[1])) %>
<span class="task-hide rankName"><%= @stu_users[1].try(:show_name) %></span>
</a>
</li>
<% end %>
<% if @stu_users[0] %>
<li class="pr">
<img src="/images/educoder/huangguan.png" class="huangguan"/>
<a href="/users/<%= @stu_users[0].try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(@stu_users[0])) %>
<span class="task-hide rankName"><%= @stu_users[0].try(:show_name) %></span>
</a>
</li>
<% end %>
<% if @stu_users[2] %>
<li class="mt35 pr">
<img src="/images/educoder/huangguan-three.png" class="huangguan"/>
<a href="/users/<%= (@stu_users[2].try(:login)) %>" class="color-dark"><%= image_tag(url_to_avatar(@stu_users[2])) %>
<span class="task-hide rankName"><%= @stu_users[2].try(:show_name) %></span>
</a>
</li>
<% end %>
</ul>
<br/>
<ul class="grade mt30">
<% if @stu_users.size > 3 %>
<% @stu_users[3..@stu_users.size].each do |e_u| %>
<li>
<a href="/users/<%= e_u.try(:login) %>" class="color-dark"><%= image_tag(url_to_avatar(e_u)) %>
<span class="task-hide rankName"><%= e_u.try(:show_name) %></span>
</a>
</li>
<% end %>
<% end %>
</ul>
</div>
</div>
</div>
</div> </div>

18
config/routes.rb
Unescape View File

@ -609,19 +609,19 @@ RedmineApp::Application.routes.draw do ## oauth相关
get 'batch_authorization', :as => 'batch_authorization' get 'batch_authorization', :as => 'batch_authorization'
match 'search_user', :via => [:get, :post] match 'search_user', :via => [:get, :post]
match 'affirm_cancel_auth', :via => [:get, :post] match 'affirm_cancel_auth', :via => [:get, :post]
get 'identity_authentication', :as => 'identity_authentication' # get 'identity_authentication', :as => 'identity_authentication'
match 'trial_authorization_operation', :as => 'trial_authorization_operation' match 'trial_authorization_operation', :as => 'trial_authorization_operation'
get 'reject_authentication' # get 'reject_authentication'
get 'agree_authentication' # get 'agree_authentication'
match 'users', :via => [:get, :post] match 'users', :via => [:get, :post]
get 'users_trial' get 'users_trial'
get 'auto_users_trial' get 'auto_users_trial'
match 'users_authorization_agree' match 'users_authorization_agree'
match 'users_authorization_cancel' match 'users_authorization_cancel'
get 'update_webssh' get 'update_webssh'
get 'professional_authentication', :as => 'professional_authentication' # get 'professional_authentication', :as => 'professional_authentication'
get 'agree_authentication_pro' # get 'agree_authentication_pro'
post 'reject_authentication_pro' # post 'reject_authentication_pro'
get 'update_shixun_hidden' get 'update_shixun_hidden'
get 'update_subject_hidden' get 'update_subject_hidden'
post 'course_homepage_show' post 'course_homepage_show'
@ -2383,9 +2383,9 @@ RedmineApp::Application.routes.draw do ## oauth相关
get 'admin/code_work_tests' get 'admin/code_work_tests'
post 'admin/select_course_syllabus' post 'admin/select_course_syllabus'
post 'admin/create_syllabus' post 'admin/create_syllabus'
get 'admin/identity_authentication' # get 'admin/identity_authentication'
get 'admin/reject_authentication' # get 'admin/reject_authentication'
get 'admin/agree_authentication' # get 'admin/agree_authentication'
resources :auth_sources do resources :auth_sources do
member do member do

10
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -238,11 +238,11 @@ class NewHeader extends Component {
} else { } else {
var uid = false var uid = false
} }
if(!uid){ // if(!uid){
this.setState({ // this.setState({
competitiontype:true // competitiontype:true
}) // })
} // }
} }
setcompetitionfun=()=>{ setcompetitionfun=()=>{

50
public/react/src/modules/tpm/SiderBar.js
Unescape View File

@ -13,26 +13,26 @@ class SiderBar extends Component {
} }
componentDidMount() { componentDidMount() {
window._initSider(); // window._initSider();
var trophy_uid = false; // var trophy_uid = false;
if (window.localStorage) { // if (window.localStorage) {
trophy_uid = localStorage.getItem('trophy_uid'); // trophy_uid = localStorage.getItem('trophy_uid');
} else { // } else {
trophy_uid = false // trophy_uid = false
} // }
if(trophy_uid==="true"||trophy_uid===true){ // if(trophy_uid==="true"||trophy_uid===true){
this.setState({ // this.setState({
trophyreturn:true // trophyreturn:true
}) // })
} // }
} }
trophyreturnfun=()=>{ trophyreturnfun=()=>{
this.setState({ // this.setState({
trophyreturn:true // trophyreturn:true
}) // })
localStorage.setItem('trophy_uid', true); // localStorage.setItem('trophy_uid', true);
} }
render() { render() {
return ( return (
@ -70,15 +70,15 @@ class SiderBar extends Component {
</div> </div>
</div> </div>
{this.state.trophyreturn===true?"":<div className="-task-sidebars" style={{right: "65x",width: "154px"}}> {/*{this.state.trophyreturn===true?"":<div className="-task-sidebars" style={{right: "65x",width: "154px"}}>*/}
<a onClick={this.trophyreturnfun} id="closeIcon" {/* <a onClick={this.trophyreturnfun} id="closeIcon"*/}
style={{position: "absolute", right: "12px",top:"10px",color: "#000"}}> {/* style={{position: "absolute", right: "12px",top:"10px",color: "#000"}}>*/}
<i className="iconfont icon-shanchudiao"></i> {/* <i className="iconfont icon-shanchudiao"></i>*/}
</a> {/* </a>*/}
<a href="/competitions"> {/* <a href="/competitions">*/}
<img src={getImageUrl("images/educoder/competition/lvmeng.png")} width="150px" height="150px" /> {/* <img src={getImageUrl("images/educoder/competition/lvmeng.png")} width="150px" height="150px" />*/}
</a> {/* </a>*/}
</div>} {/*</div>}*/}
</div> </div>
); );

Write Preview
Loading…
Cancel
Save