diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 6cd55be39..68bcd2b22 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -29,7 +29,7 @@ class OrganizationsController < ApplicationController helper :issues include UsersHelper before_filter :find_organization, :only => [:show, :members, :apply_subdomain, :select_org_layout] - layout 'base_org' + layout 'base_org_newstyle' def index end diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb index 0296d20b4..bdfec084f 100644 --- a/app/views/layouts/base_org_newstyle.html.erb +++ b/app/views/layouts/base_org_newstyle.html.erb @@ -1,6 +1,3 @@ -<% @nav_dispaly_project_label = 1 - @nav_dispaly_forum_label = 1 %> -<%#@nav_dispaly_project_label = 1 %> @@ -12,8 +9,8 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','courses','org', 'share' %> - <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%> + <%= stylesheet_link_tag 'org_new_style' %> + <%= javascript_include_tag 'org'%> <%= javascript_include_tag 'attachments' %> <%= call_hook :view_layouts_base_html_head %> @@ -29,138 +26,434 @@ showMathMenuMSIE: false, tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]} }); - + + + -
-
- - - +
+
+
+
+ + +
-
+
+
+ + + +
+
+
+
+
+
+

中国北斗开源社区
GNSS

+

open laboratory of simulation and testing

+

+ More +

+
+
+
+
+

中国北斗开源社区
GNSS

+

open laboratory of simulation and testing

+

+ More +

+
+
+ +
+
+

中国北斗开源社区
GNSS

+

open laboratory of simulation and testing

+

+ More +

+
+
+
+
+ ? ? +
+
-
-
-
-
- - - - - -
- <%= link_to truncate(@organization.name,:length => 26), organization_path(@organization.id), :class=>"pr_info_name c_dark fb break_word" %> - <% if User.current.logged? %> - <% if @organization.is_public? %> - <%= l(:label_public)%> - <% else %> - <%= l(:label_private)%> - <% end %> - <% end %> -
- <% if User.current.admin_of_org?(@organization) %> - 配置 - <% end %> +
+
+

北斗开放实验室

open laboratory

+
+ + + +
+
+
+
- - - - - - - - -
-
- <%= link_to '文章', organization_org_document_comments_path(@organization) %>  - <%# if User.current.logged? %> - ( - <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> - ) - <%# end %> - <% if User.current.logged? %> -  |  - <%= link_to '成员', members_organization_path(@organization.id) %>  - (<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>) - <% end %> +
+
+

北斗项目动态

project activities

+ +
+
+
+
+

2016.01.30环球网卫星导航仿真与测试开放实验室落户泉州

+

卫星导航仿真与测试开放实验室是国内首个GNSS仿真与测试开放共享平台,北斗泉州实验室由国防科技大学泉州工业技术研究中心、福建省福信富通网络科技股份有限公司与开放实验室合作共建,计划于2016年3月建成并投用,将承建国内首个北斗海上数据应用中心,利用开放实验室优势资源承担相关专业人才培训,联合所属区域高校和企业开展船载导航终端北斗导航定位数据的采集、分析和应用,服务于全国北斗终端测试检定和相关应用研究。 + 据介绍,实验室建成后,将为泉州以及周边县(市、区)的北斗产业应用发展提供相应支撑,并依托泉州的地理和政策优势,推动北斗向海上丝绸之路经济带沿线国家的推广应用。

+
+
+
+
+
    +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
+
+
+
+
+ +
-
- <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %> -
-
访问计数 <%= @organization.visits.to_i %>
-
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
+ + +
+
+ + + +
+
- -
- + +
@@ -168,41 +461,6 @@ <%= l(:label_loading) %>
- diff --git a/public/images/org_new_style/bg.jpg b/public/images/org_new_style/bg.jpg new file mode 100644 index 000000000..a993fc0ca Binary files /dev/null and b/public/images/org_new_style/bg.jpg differ diff --git a/public/images/org_new_style/bg2.jpg b/public/images/org_new_style/bg2.jpg new file mode 100644 index 000000000..35f851122 Binary files /dev/null and b/public/images/org_new_style/bg2.jpg differ diff --git a/public/images/org_new_style/con-left1.jpg b/public/images/org_new_style/con-left1.jpg new file mode 100644 index 000000000..f4936fa85 Binary files /dev/null and b/public/images/org_new_style/con-left1.jpg differ diff --git a/public/images/org_new_style/con-left2.jpg b/public/images/org_new_style/con-left2.jpg new file mode 100644 index 000000000..b7b7f3472 Binary files /dev/null and b/public/images/org_new_style/con-left2.jpg differ diff --git a/public/images/org_new_style/con-right.gif b/public/images/org_new_style/con-right.gif new file mode 100644 index 000000000..d49c2003e Binary files /dev/null and b/public/images/org_new_style/con-right.gif differ diff --git a/public/images/org_new_style/detailimg1.jpg b/public/images/org_new_style/detailimg1.jpg new file mode 100644 index 000000000..6fccfd2e8 Binary files /dev/null and b/public/images/org_new_style/detailimg1.jpg differ diff --git a/public/images/org_new_style/detailimg2.jpg b/public/images/org_new_style/detailimg2.jpg new file mode 100644 index 000000000..bc51a1714 Binary files /dev/null and b/public/images/org_new_style/detailimg2.jpg differ diff --git a/public/images/org_new_style/detailimg3.jpg b/public/images/org_new_style/detailimg3.jpg new file mode 100644 index 000000000..4b8b8bc0b Binary files /dev/null and b/public/images/org_new_style/detailimg3.jpg differ diff --git a/public/images/org_new_style/detailimg4.jpg b/public/images/org_new_style/detailimg4.jpg new file mode 100644 index 000000000..22b3e674d Binary files /dev/null and b/public/images/org_new_style/detailimg4.jpg differ diff --git a/public/images/org_new_style/header-background.jpg b/public/images/org_new_style/header-background.jpg new file mode 100644 index 000000000..998acd6d5 Binary files /dev/null and b/public/images/org_new_style/header-background.jpg differ diff --git a/public/images/org_new_style/icons.png b/public/images/org_new_style/icons.png new file mode 100644 index 000000000..4bbaacd56 Binary files /dev/null and b/public/images/org_new_style/icons.png differ diff --git a/public/images/org_new_style/img1.jpg b/public/images/org_new_style/img1.jpg new file mode 100644 index 000000000..acfee71e5 Binary files /dev/null and b/public/images/org_new_style/img1.jpg differ diff --git a/public/images/org_new_style/img2.jpg b/public/images/org_new_style/img2.jpg new file mode 100644 index 000000000..72741b981 Binary files /dev/null and b/public/images/org_new_style/img2.jpg differ diff --git a/public/images/org_new_style/logo.jpg b/public/images/org_new_style/logo.jpg new file mode 100644 index 000000000..78e3918d4 Binary files /dev/null and b/public/images/org_new_style/logo.jpg differ diff --git a/public/images/org_new_style/pic1.jpg b/public/images/org_new_style/pic1.jpg new file mode 100644 index 000000000..8866da4cb Binary files /dev/null and b/public/images/org_new_style/pic1.jpg differ diff --git a/public/images/org_new_style/pic2.jpg b/public/images/org_new_style/pic2.jpg new file mode 100644 index 000000000..1ad7665e7 Binary files /dev/null and b/public/images/org_new_style/pic2.jpg differ diff --git a/public/images/org_new_style/pic3.jpg b/public/images/org_new_style/pic3.jpg new file mode 100644 index 000000000..5f276d3df Binary files /dev/null and b/public/images/org_new_style/pic3.jpg differ diff --git a/public/images/org_new_style/slide1.png b/public/images/org_new_style/slide1.png new file mode 100644 index 000000000..fcce41730 Binary files /dev/null and b/public/images/org_new_style/slide1.png differ diff --git a/public/images/org_new_style/slide2.png b/public/images/org_new_style/slide2.png new file mode 100644 index 000000000..a6c93910d Binary files /dev/null and b/public/images/org_new_style/slide2.png differ diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css new file mode 100644 index 000000000..d152b3d4f --- /dev/null +++ b/public/stylesheets/org_new_style.css @@ -0,0 +1,182 @@ +@charset "utf-8"; +/* CSS Document */ + +body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;} +body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5; background:#fff;} +div,img,tr,td,table{ border:0;} +table,tr,td{border:0;cellspacing:0; cellpadding:0;} +ol,ul,li{ list-style-type:none} +a:link,a:visited{color:#000;text-decoration:none;} +a:hover{color:#29156f;} + +.fl{ float:left;} +.fr{ float:right;} +.cl{ clear:both;overflow:hidden;} +.mr40{ margin-right:40px;} +.mr30{ margin-right:30px;} +.mb20{ margin-bottom:20px;} +.mb70{ margin-bottom:70px;} + +/** header **/ +.header{ width:100%; height:72px; background:#29146f; padding:38px 0 40px;} +.header-con{ width:1200px; margin:0 auto;} +a.login{ background:url(../images/org_new_style/icons.png) -7px -11px no-repeat; width:146px; height:55px; margin-right:40px; margin-top:11px;} +a:hover.login{ background:url(../images/org_new_style/icons.png) -7px -88px no-repeat; } +a.register{ background:url(../images/org_new_style/icons.png) -190px -11px no-repeat; width:158px; height:55px; ;margin-top:11px;} +a:hover.register{ background:url(../images/org_new_style/icons.png) -190px -88px no-repeat; } +/** nav **/ +.nav-box{ width:1200px; height:79px; margin:0 auto;} +.nav a{ display:block; padding:25px 10px; font-size:18px; color:#000; margin-right:20px; } +.navact{border-bottom:3px solid #ffbd18;} +.nav a:hover{border-bottom:3px solid #ffbd18;} +.searchbox{ width:338px; height:57px; border:1px solid #ccc; -moz-border-radius: 35px; -webkit-border-radius: 35px; margin:10px 0px 0 0;} +.search-input{width:270px; height:40px; color:#bebebe; font-size:18px; border:1px solid #ccc;-moz-border-radius: 35px; -webkit-border-radius: 35px;border-radius: 35px; border:0px; background:none; margin:10px 0 0 20px;} +.search-input:hover{ border:none;color:#fff; } +a.search-icon{ background:url(../images/org_new_style/icons.png) -387px -11px no-repeat; width:40px; height:40px; margin-top:8px;} +a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -89px no-repeat;} +.searchbox:hover{ background:#999999; color:#fff;} + +/* Header text */ +.header-content { background: url(../images/org_new_style/header-background.jpg) no-repeat 50% 0px #070317;margin: 0;padding: 0;float: left;width: 100%;line-height: 22px;position: relative;z-index: 1;} +.header-content.home {height: 609px;} +.home .header-content { background: #070317 ; } +.header-content img {float: left; margin: 0 0 0 15px;} +.header-content .text {width:800px; text-align:center; margin-top:20%; } +.header-content .copy {font-size: 24px; line-height: 70px; } +.header-content .button { margin:0 auto;} +.header-content .dimmed { background: rgba(255, 255, 255, 0.4);} +.header-content .dimmed:hover { background: rgba(255, 255, 255, 1); } +.header-content .align-bottom {position: absolute; bottom: 0px;} +/* => SLIDE PREV AND NEXT ARROWS <= */ +.slider-prev, +.slider-next {text-indent:-9999px; width:60px;height:60px;background:url("../images/org_new_style/icons.png") -306px -264px no-repeat; position:absolute;top:50%; margin-top:-19px; z-index:999; opacity:.5; +-webkit-transition: all 0.3s ease-out; /* Saf3.2+, Chrome */-moz-transition: all 0.3s ease-out; /* FF4+ */ -ms-transition: all 0.3s ease-out; /* IE10? */ -o-transition: all 0.3s ease-out; /* Opera 10.5+ */ transition: all 0.3s ease-out;display: none} +.slider-prev{ left:50px; } +.slider-next { right:50px;background-position:-382px -264px;} +.slider-prev:hover,.slider-next:hover{opacity:1;} +/* => SLIDER NAV o o o <= */ +.slider-nav {position:absolute;bottom:5px;left:50%;list-style:none; overflow:hidden; padding:2px; z-index:10;margin: 0; } +.slider-nav li{ float:left; } +.slider-nav li a{ display:block;width:13px;height:13px;overflow:hidden; padding:0px; margin:5px; background:url("../images/org_new_style/icons.png") no-repeat -419px -219px; text-decoration:none; text-indent:-999px;} +.slider-nav li a:hover,.slider-nav li a.selected{background-position:-402px -219px;} +/* => HOLY SLIDES <= */ +.slider section {display: none;} +.slider section.first {display: block;} +.slider-sections, .slider-sections section {width: 806px; height: 600px; } +.slider-sections {margin: 0 auto; position: relative;} +.slider-sections section {position: absolute; top: 0; left: 0px; } +.header-content h2 {font:400 62px/1.2 "microsoft yahei", Tahoma, arial, sans-serif;color: #fff;margin: 0 0 26px; } +.header-content p {margin: 0 0 30px; font-size:28px; color:#fff;} +.header-content .centered-content{padding-top: 30px;padding-bottom: 10px;} +.button {float: left;width:800px;list-style: none; } +.button a { font-size: 15px;line-height: 18px; text-decoration: none;color:#FFF; padding: 12px 56px;display: block;width: auto;z-index: 2;border: none; -moz-border-radius: 25px;border-radius: 25px;cursor: pointer; margin:0 auto; width:35px;} +.button a:hover{color:#29156f;} + +/** box1 **/ +.box1{ width:100%; padding:70px 0;} +.content{ width:1200px; margin:0 auto;} +.box-top{ margin:0 auto; text-align:center; margin-bottom:45px; } +.box-title{ width:355px; height:67px; margin:0 auto; background:#29156f; color:#fff; text-align:center; font-size:40px; font-weight: lighter; margin-bottom:2px;} +.box-title-p{ font-size:20px; color:#999999;} +.row{ width:1200px; margin: 0 auto; } +.row-box1{ width:365px;} +.row-img{ margin-bottom:10px; width:365px; height:230px; display:block;} +.row-time{ color:#ffbd18; font-size:14px; font-weight:bold; line-height:1.9;} +.row-title{ font-size:16px; font-weight:bold; line-height:1.9;display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.row-con { display:block; } +.row-con:hover{ color:#29156f; } +.row-txt{line-height:2.4; padding-bottom:10px; margin-bottom:10px; color:#888;} +.row-txt:hover{color:#29156f;} +.row-txt-line{border-bottom:1px solid #cccccc; width:365px;} +a.btn-more{ display:block; font-size:14px; width:110px; height:40px;-moz-border-radius: 3px; -webkit-border-radius: 3px; background:#ffbd18; color:#fff; text-align:center; line-height:3.0;} +a:hover.btn-more{ background:#29156f;} +.row-box2{ width:388px; border:1px solid #ccc; border-bottom:none;} +.row-con2 a{ display:block;padding:20px 10px; border-bottom:1px solid #ccc;} +.row-con2 a:hover{ background:#29156f; color:#fff;} +.row-con2 a:hover{ color:#fff;} +.row-txt2{line-height:2.4; color:#888;} +.row-txt2:hover{ color:#fff; } +/** 项目动态 **/ +.slider2 {position: relative;text-align: center;} +.slider2-left{ width:550px; margin-top:20px;} +.slider2-left h3{ font-size:18px; font-weight:bold; display:block; width:550px;white-space:nowrap; overflow:hidden; } +.slider2-left h3 span{color:#29156f; margin-right:20px;} +.slider2-left p{ display:block; margin-top:20px; font-size:14px; line-height:1.9; width:550px;} +.slider2-right{ width:600px; margin-top:20px;} +.rslides li {-webkit-backface-visibility: hidden;position: absolute; display: none; width: 100%;left:60px;top: 0; } +.rslides li:first-child {position: relative;display: block; float: left;} +.callbacks_tabs a:after { +content: "\f111"; +font-size: 0; +font-family: FontAwesome; +visibility: visible; +display: block; +width: 15px; +height: 15px; +display: inline-block; +background:url(../images/org_new_style/icons.png) no-repeat -100px -511px ; +} +.callbacks_here a:after{background:url(../images/org_new_style/icons.png) no-repeat -83px -511px ;} +.callbacks_tabs a{visibility:hidden;} +.callbacks_tabs li{display:inline-block;} +ul.callbacks_tabs.callbacks1_tabs {position:absolute;bottom: 7.3%;z-index: 999;left: -92%; display: block;} +/** 开源 **/ +.box2{ height:569px; padding:70px 0; width:100%; background:url(../images/org_new_style/bg.jpg) no-repeat; } +.row-box3{ width:380px;} +.row-title3{ width:290px; font-size:18px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:bold; } +.box3{height:540px; width:100%; padding:70px 0; background:url(../images/org_new_style/bg2.jpg) no-repeat; } +.box-title-p3{font-size:14px; color:#999999;} +.row-img2{ margin-bottom:10px; width:380px; height:310px; display:block;} +/** 社区规则 **/ +.indexmaindiv{height:310px;margin:0px auto;width:1200px; } +.indexmaindiv1{margin-top:25px;} +.stylesgoleft{float:left;width:49px;height:47px;background:url(../images/org_new_style/icons.png) no-repeat -391px -360px; opacity:.5;margin:106px 20px 0px 0px;cursor:pointer;} +.stylesgoleft:hover{float:left;opacity:1;} +.playerdetail{width:240px;height:310px; } +.div.detailimg{width:240px;height:240px;} +.detailimg img{width:240px;height:240px;} +.teanames{font-size:18px; font-weight:bold;margin-top:10px;color:#000;} +.teadetail{font-size:14px; color:#999;margin-top:5px;} +.stylesgoright{float:left;width:49px;height:47px;background:url(../images/org_new_style/icons.png) no-repeat -393px -432px; opacity:.5;margin:106px 0px 0px 15px;cursor:pointer;} +.stylesgoright:hover{float:left;opacity:1;} +.teanames{ text-align:left;} +.maindiv1{float:left;width:1063px;height:310px;overflow:hidden;position:relative; } +.maindiv1 ul{position:absolute;left:0;top:0;} +.maindiv1 ul li{float:left;width:240px;height:310px;margin-left:21px; } +/** 活动专区 **/ +.con-left{ width:618px;} +.con-left-box{ margin-bottom:20px; height:96px; display:block;} +.con-left-img{ width:175px; height:96px;} +.con-left-txt{ width:360px; margin-left:15px; font-size:14px; color:#888; padding-top:8px; line-height:1.9;} +.con-left-txt:hover{color:#29156f;} +.con-left-pre{ margin-top:15px; } +a.con-back-btn{ display: block;width:25px;height:25px;background:url(../images/org_new_style/icons.png) no-repeat -38px -505px ;} +a.con-arrow-btn{ display: block;width:25px;height:25px;background:url(../images/org_new_style/icons.png) no-repeat -12px -505px ; opacity:.5;} +.con-right{ width:532px; height:170px; background:#f6f6f6 ; padding:25px;} +.con-right p{background: url(../images/org_new_style/con-right.gif) no-repeat 0 0;line-height:1.9; width:415px; padding:40px 0 0 20px; font-size:14px; color:#888; margin-left:20px;} +.con-r-img img{ border:3px solid #e6473b; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:67px; height:67px;} +.con-r-img img:hover{border:3px solid #29156f;} +.con-name{ font-size:18px; font-weight:bold; margin-top:5px;} +.con-r-img { text-align:center;} +.con-r-pre{ margin-top:20px;} +a.pre-arrow,a.pre-back{ display:block; width:25px; height:10px; background:#29156f; margin-left:5px;} +a.pre-back{ background:#888;} +/** footer **/ +.footer{ height:220px; background:#29156f; width:100%;} +.footer-con{ width:1200px; padding:65px 0 0 60px; margin:0 auto; text-align:center; font-size:14px; color:#fff;} +.footer-con ul{ display:block; width:430px; height:50px; margin:0 auto; } +.footer-con ul li a{font-size:18px; color:#fff; margin-right:35px; font-weight:bold;} + + + + + + + + + + + + + +