qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

平台底部调整（去除底部图片，增加合作伙伴一栏）

This commit is contained in:
daiao 2017-02-09 10:47:18 +08:00
parent b9cb857025
commit 3e705fabb8
19 changed files with 87 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/cooperation.js.coffee Normal file
View File

@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/stylesheets/cooperation.css.scss Normal file
View File

@ -0,0 +1,3 @@
// Place all the styles related to the cooperation controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

7
app/controllers/cooperation_controller.rb Normal file
View File

@ -0,0 +1,7 @@
class CooperationController < ApplicationController
def index
end
end

2
app/helpers/cooperation_helper.rb Normal file
View File

@ -0,0 +1,2 @@
module CooperationHelper
end

46
app/views/cooperation/index.html.erb Normal file
View File

@ -0,0 +1,46 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>合作伙伴</title>
<link href="css/common.css" rel="stylesheet" type="text/css" />
<link href="css/public.css" rel="stylesheet" type="text/css" />
<link href="css/user.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="homepageContent BgBox mt10">
<h2 class="BgBox_h2">合作伙伴</h2>
<div class="AgreementBox">
<ul class="patner-box ">
<li >
<a href="http://www.nudt.edu.cn/" target="_blank"><img src="images/footer_logo/p-nudt.png" width="210" height="40" alt="国防科技大学"></a>
</li>
<li>
<a href="http://www.sei.pku.edu.cn/" target="_blank"><img src="images/footer_logo/p-PekingUniversity.png" width="210" height="40" alt="北京大学"></a>
</li>
<li>
<a href="http://scse.buaa.edu.cn/" target="_blank"><img src="images/footer_logo/p-BeiHang_university.png" width="210" height="40" alt="北京航空航天大学"></a>
</li>
<li>
<a href="http://www.iscas.ac.cn/" target="_blank"> <img src="images/footer_logo/p-iscas.png" width="210" height="40" alt="中国科学院软件研究所"></a>
</li>
<li>
<a href="http://www.inforbus.com/" target="_blank"><img src="images/footer_logo/p-CVICSE.png" width="210" height="40" alt="中创软件"></a>
</li>
<li>
<a href="http://www.webxmf.com/" target="_blank"><img src="images/footer_logo/p-bee_logo.png" width="210" height="40" alt="小蜜蜂信息告警平台"></a>
</li>
<li>
<a href="https://www.ucloud.cn/" target="_blank"><img src="images/footer_logo/p-ucloud.png" width="210" height="40" alt="ucloud"></a>
</li>
</ul>
<div class="cl"></div>
</div>
</div>
</body>
</html>
<script type="text/javascript" charset="utf-8">
$("#wrapper").css("background","#eaebec");
</script>

18
app/views/layouts/_footer.html.erb
View File

@ -1,15 +1,14 @@
<div id="Footer" class="f12">
<div class="footerAboutContainer">
<ul class="footerAbout">
<!--<li class="fl"><a href="<%#= about_us_path %>" class="f_grey mw20" target="_blank"><%#= l(:label_about_us)%></a>|</li>-->
<li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
<li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
<% memo = Memo.where(:id => 1168).first %>
<% if hidden_unproject_infos && !memo.nil? %>
<li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
<% end %>
<li class="fl"><a href="<%= forums_path %>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
<li class="fl"><a href="<%= forums_path %>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a>|</li>
<li class="fl"><%= link_to "合作伙伴", "#{Setting.protocol}://#{Setting.host_name}/cooperation", :class => "f_grey mw20", :target=>"_blank" %></li>
</ul>
</div>
@ -21,8 +20,8 @@
<li class="fl">
<a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%#= l(:label_sponsor)%></a>
</li-->
<li class="fl mr10">
<strong><%= l(:label_partners)%></strong>
<!-- <li class="fl mr10">
<strong><%#= l(:label_partners)%></strong>
</li>
<li class="fl mr20">
<a href="http://www.sei.pku.edu.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_EECS)%><img src="/images/footer_logo/PekingUniversity.png" width="121" height="40" style="display: inline-block;" alt="北京大学" /></a>
@ -38,9 +37,10 @@
</li>
<li class="fl"><a href="http://www.webxmf.com/" target="_blank"><img src="/images/footer_logo/bee_logo.png" width="167" height="40" style="display: inline-block;" alt="web小蜜蜂" /></a></li>
</ul>
<div class="cl"></div>
<ul class="copyright">
<li class="fl mr30"><%= l(:label_rights_reserved)%></li>
<li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
<div class="cl"></div>-->
<ul class="copyright">
<li class="fl mr30"><%= l(:label_rights_reserved)%></li>
<li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
</ul>
</ul>
</div><!--Footer end-->

2
config/locales/zh.yml
View File

@ -2140,7 +2140,7 @@ zh:
label_co_organizer_BHU: 北京航空航天大学
label_co_organizer_CAS: 中国科学院软件研究所
label_co_organizer_InforS: 中创软件
label_rights_reserved: Copyright 2007~2016, All Rights Reserved
label_rights_reserved: Copyright 2007~2017, 国防科学技术大学.
label_about_us: 关于我们
label_contact_us: 联系我们
label_recruitment_information: 招聘信息

5
config/routes.rb
View File

@ -472,6 +472,11 @@ RedmineApp::Application.routes.draw do
end
end
resources :cooperation do
collection do
end
end
resources :shares

BIN
public/images/footer_logo/p-BeiHang_university.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/images/footer_logo/p-CVICSE.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/images/footer_logo/p-PekingUniversity.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/images/footer_logo/p-bee_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/images/footer_logo/ucloud_logo.png → public/images/footer_logo/p-iscas.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
public/images/footer_logo/p-nudt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
public/images/footer_logo/p-ucloud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/images/footer_logo/ucloud.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

6
public/stylesheets/css/public.css
View File

@ -937,4 +937,8 @@ a.syllabusbox_a_blue{ color:#3b94d6;}
.feedbackText{box-shadow:none; width:550px; height:80px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
._notice_box{border:solid 1px #f6d0b1; background:#fff9e9; padding:4px; color:#ee4a20;}
/*针对名字过长的用户定义公共样式*/
.user_hiddent{width: 55px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block;}
.user_hiddent{width: 55px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block;}
.patner-box li{ float: left; margin:0px 10px 20px; height: 40px; border:1px solid #ddd; padding:10px 5px;}
.patner-box li:hover{border:1px solid #ccc;}

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

@ -178,4 +178,4 @@ a.user_navmorebox .user_icons_closeclass{display:block;position: absolute;top:5p
.homepageTabTime { max-width:160px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis; }
.homepageTabPollTitle { max-width:490px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
.homepageTabAvatar img{border: 3px solid #fff;-webkit-border-radius:30px;-moz-border-radius:30px;-o-border-radius:30px;border-radius:30px;}
.homepageTabAvatar img:hover{border: 3px solid #e6e6e6;}
.homepageTabAvatar img:hover{border: 3px solid #e6e6e6;}

5
spec/controllers/cooperation_controller_spec.rb Normal file
View File

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe CooperationController, :type => :controller do
end