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

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

Browse Source
dev_aliyun
cxt 5 years ago
parent a005006d8c 2c39e21898
commit a9c205a8a2
4 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,7 +1,9 @@
<div class="educontent clearfix"> <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %> <div class="educontent">
<div class="head-nav pr"> <div class="head-nav pr">
<ul id="header-nav"> <ul id="header-nav">
<li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
<li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li> <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
<li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li> <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
<!-- 精选实训 --> <!-- 精选实训 -->
@ -31,7 +33,8 @@
</li> </li>
<% end %> <% end %>
</ul> </ul>
<div class="posi-search" id="posi-search" style="display: none"> <div class="posi-search mrf40" id="posi-search" style="
display: none">
<div class="search-all clearfix"> <div class="search-all clearfix">
<div class="fl pr search-clear edu-menu-panel" style="display: none"> <div class="fl pr search-clear edu-menu-panel" style="display: none">
<input type="hidden" id="search_type" value="1"> <input type="hidden" id="search_type" value="1">
@ -70,7 +73,7 @@
<li class="bor-top-greyE"><%= link_to '退出', signout_path %></li> <li class="bor-top-greyE"><%= link_to '退出', signout_path %></li>
</ul> </ul>
</div> </div>
<div class="fr head-right"> <div class="fr head-right mr10">
<a href="javascript:void(0)" id="search-open" class="fl headIcon pointer"> <a href="javascript:void(0)" id="search-open" class="fl headIcon pointer">
<i class="iconfont icon-sousuo color-white"></i> <i class="iconfont icon-sousuo color-white"></i>
</a> </a>

13
app/views/layouts/_unlogin_header.html.erb
Unescape View File

@ -1,8 +1,11 @@
<div class="educontent clearfix">
<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg"), home_path %> <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
<div class="educontent">
<div class="head-nav pr"> <div class="head-nav pr">
<ul id="header-nav"> <ul id="header-nav">
<li class="active" style="display: none"><%= link_to "首页", home_path %></li> <li class="<%= params[:controller] == "welcome" ? 'active' : '' %>"><%= link_to "首页", home_path %></li>
<li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li> <li class="<%= subjects_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "实践课程", subjects_path %></li>
<li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li> <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
@ -28,7 +31,7 @@
<li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li> <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "交流问答", forums_path %></li>
<!--<li><%#= link_to "活动竞赛", competitions_path %></li>--> <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
</ul> </ul>
<div class="posi-search unlogin" id="posi-search" style="display: none" > <div class="posi-search unlogin mrf40" id="posi-search" style="display: none" >
<div class="search-all clearfix"> <div class="search-all clearfix">
<!--<a href="javascript:void(0)" class="search-clear fl" onclick="closeSearch();">×</a>--> <!--<a href="javascript:void(0)" class="search-clear fl" onclick="closeSearch();">×</a>-->
<div class="fl pr search-clear edu-menu-panel" style="display: none"> <div class="fl pr search-clear edu-menu-panel" style="display: none">
@ -56,7 +59,7 @@
<a href="/register" class="mr5 color-white">注册</a> <a href="/register" class="mr5 color-white">注册</a>
<%#= link_to '注册', user_join_path, :class => "ml5 color-white" %> <%#= link_to '注册', user_join_path, :class => "ml5 color-white" %>
</span> </span>
<div class="fr head-right"> <div class="fr head-right mr10">
<a href="javascript:void(0)" id="search-open" class="fl headIcon"> <a href="javascript:void(0)" id="search-open" class="fl headIcon">
<i class="iconfont icon-sousuo color-white"></i> <i class="iconfont icon-sousuo color-white"></i>
</a> </a>

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

@ -352,15 +352,17 @@ class NewHeader extends Component {
</div> </div>
</div> </div>
</Modal> </Modal>
<div className="educontent clearfix"> <a href="/" className={"ml20 fl"}>
{ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
</a>
<div className="educontent">
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
<a href="/">
{ImageUrlType===true?<img alt="高校智能化教学与实训平台" className="fl" src={getImageUrl(ImageUrl)} style={{height:'60px'}} />:<img alt="高校智能化教学与实训平台" className="logoimg" src={getImageUrl(ImageUrl)}/>}
</a>
<div className="head-nav pr"> <div className="head-nav pr">
<ul id="header-nav"> <ul id="header-nav">
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/} {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
<li><a href="/">首页</a></li>
<li><a href="/paths">实践课程</a></li> <li><a href="/paths">实践课程</a></li>
<li><a href="/courses">翻转课堂</a></li> <li><a href="/courses">翻转课堂</a></li>
@ -399,7 +401,16 @@ class NewHeader extends Component {
<li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">交流问答</a></li> <li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">交流问答</a></li>
<li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'工程认证'}</a></li> <li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'工程认证'}</a></li>
</ul> </ul>
<div className="posi-search" id="posi-search" style={{display: 'none'}}> <style>
{
`
.mar55{
margin-right: 55px;
}
`
}
</style>
<div className="posi-search mar55" id="posi-search" style={{display: 'none'}}>
<div className="search-all clearfix"> <div className="search-all clearfix">
{/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/} {/*<!--<a href="javascript:void(0)" className="search-clear fl" onclick="closeSearch();">×</a>-->*/}
<div className="fl pr search-clear edu-menu-panel" style={{display: 'none'}}> <div className="fl pr search-clear edu-menu-panel" style={{display: 'none'}}>
@ -464,7 +475,7 @@ class NewHeader extends Component {
</div> </div>
<div className="fr head-right"> <div className="fr head-right mr10">
<a href="javascript:void(0)" id="search-open" className="fl mr30 headIcon"> <a href="javascript:void(0)" id="search-open" className="fl mr30 headIcon">
{/*"/images/educoder/icon/search.svg" {/*"/images/educoder/icon/search.svg"
<img src={getImageUrl(`images/educoder/icon/search.svg`)} /> */} <img src={getImageUrl(`images/educoder/icon/search.svg`)} /> */}

8
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -6,8 +6,8 @@
float: left; float: left;
width: 97px; width: 97px;
} }
.head-nav{float: left;width: 920px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;} .head-nav{float: left;width: 915px;text-align: center;height: 60px;box-sizing: border-box; min-width: 400px;}
.head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;} .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;}
.head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px} .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
.head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff} .head-nav ul#header-nav li a{display: block;height: 100%;width: 100%;color: #fff}
.head-nav ul#header-nav li a:hover{color: #cccccc;} .head-nav ul#header-nav li a:hover{color: #cccccc;}
@ -3530,4 +3530,8 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
.vertical4{ .vertical4{
vertical-align: -4px; vertical-align: -4px;
margin-right: 0px !important; margin-right: 0px !important;
}
.mrf40{
margin-right: -40px;
} }
Write Preview
Loading…
Cancel
Save