diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 0d99cd8a5..d8eb98559 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -113,7 +113,7 @@ class OrganizationsController < ApplicationController
#@project_acts_issues = get_project_activities_org @organization
#@course_acts = get_course_activities_org @organization
- render :layout => 'base_org_newstyle'
+ render :layout => 'base_org2'
else
render_403
end
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
new file mode 100644
index 000000000..a34017bc5
--- /dev/null
+++ b/app/views/layouts/base_org2.html.erb
@@ -0,0 +1,304 @@
+
+
+
+
+ <%= h html_title %>
+
+
+ <%= csrf_meta_tag %>
+ <%= favicon %>
+ <%= javascript_heads %>
+ <%= heads_for_theme %>
+ <%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %>
+ <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
+ <%= javascript_include_tag 'attachments' %>
+ <%#= call_hook :view_layouts_base_html_head %>
+
+ <%#= yield :header_tags -%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
2016-04-08
+
+
2016年3月27日上午,湖南省经信委巡视员钟志慧,湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同来北斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。为进一步推动北斗资源共享、创新北斗人才培养......
+
+
+
+
+

+
+
2016-04-08
+
+
+
+

+
+
2016-04-08
+
+
+
+

+
+
2016-04-08
+
+
+
+

+
+
2016-04-08
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
更多
+
+
+

+
+
+
更多
+
+
+

+
+
+
更多
+
+
+

+
+
+
更多
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
最新活动展示更多
+
+

+
+
2016-04-08
+
+
+

+
+
2016-04-08
+
+
+

+
+
2016-04-08
+
+
+

+
+
2016-04-08
+
+
+
+
+
关注北斗
+
+

+
卫星导航仿真与测试开放实验室
扫一扫 关注我!
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+<%# 更新访问数,刷新的时候更新访问次数 %>
+<% update_visiti_count @organization %>
+<%# over %>
+
+
+
+
+
+
+
+ <%= l(:label_loading) %>
+
+<%#= call_hook :view_layouts_base_body_bottom %>
+
+
+
diff --git a/public/images/active/img-active01.jpg b/public/images/active/img-active01.jpg
new file mode 100644
index 000000000..c0969a317
Binary files /dev/null and b/public/images/active/img-active01.jpg differ
diff --git a/public/images/active/img-active02.jpg b/public/images/active/img-active02.jpg
new file mode 100644
index 000000000..049b09385
Binary files /dev/null and b/public/images/active/img-active02.jpg differ
diff --git a/public/images/active/img-active03.jpg b/public/images/active/img-active03.jpg
new file mode 100644
index 000000000..793370c59
Binary files /dev/null and b/public/images/active/img-active03.jpg differ
diff --git a/public/images/banner-small.jpg b/public/images/banner-small.jpg
new file mode 100644
index 000000000..409b161d7
Binary files /dev/null and b/public/images/banner-small.jpg differ
diff --git a/public/images/banner/banner01.jpg b/public/images/banner/banner01.jpg
new file mode 100644
index 000000000..aefee8910
Binary files /dev/null and b/public/images/banner/banner01.jpg differ
diff --git a/public/images/banner/banner02.jpg b/public/images/banner/banner02.jpg
new file mode 100644
index 000000000..23486604b
Binary files /dev/null and b/public/images/banner/banner02.jpg differ
diff --git a/public/images/banner/focus_btn.png b/public/images/banner/focus_btn.png
new file mode 100644
index 000000000..f3caa102e
Binary files /dev/null and b/public/images/banner/focus_btn.png differ
diff --git a/public/images/news/img-news-big.jpg b/public/images/news/img-news-big.jpg
new file mode 100644
index 000000000..ae919d6ee
Binary files /dev/null and b/public/images/news/img-news-big.jpg differ
diff --git a/public/images/news/img-news-small01.jpg b/public/images/news/img-news-small01.jpg
new file mode 100644
index 000000000..c39334e25
Binary files /dev/null and b/public/images/news/img-news-small01.jpg differ
diff --git a/public/images/news/img-news-small02.jpg b/public/images/news/img-news-small02.jpg
new file mode 100644
index 000000000..c1a47081a
Binary files /dev/null and b/public/images/news/img-news-small02.jpg differ
diff --git a/public/images/news/img-news-small03.jpg b/public/images/news/img-news-small03.jpg
new file mode 100644
index 000000000..93e7b9edf
Binary files /dev/null and b/public/images/news/img-news-small03.jpg differ
diff --git a/public/images/news/img-news-small04.jpg b/public/images/news/img-news-small04.jpg
new file mode 100644
index 000000000..a39a1f61d
Binary files /dev/null and b/public/images/news/img-news-small04.jpg differ
diff --git a/public/images/partner/img-dhyq.jpg b/public/images/partner/img-dhyq.jpg
new file mode 100644
index 000000000..c412cd8ea
Binary files /dev/null and b/public/images/partner/img-dhyq.jpg differ
diff --git a/public/images/partner/img-jzdz.jpg b/public/images/partner/img-jzdz.jpg
new file mode 100644
index 000000000..be9a5c562
Binary files /dev/null and b/public/images/partner/img-jzdz.jpg differ
diff --git a/public/images/partner/img-qhdx.jpg b/public/images/partner/img-qhdx.jpg
new file mode 100644
index 000000000..d09aeb897
Binary files /dev/null and b/public/images/partner/img-qhdx.jpg differ
diff --git a/public/images/partner/img-zgdz.jpg b/public/images/partner/img-zgdz.jpg
new file mode 100644
index 000000000..4b3c1b92f
Binary files /dev/null and b/public/images/partner/img-zgdz.jpg differ
diff --git a/public/images/resources/img-resources01.jpg b/public/images/resources/img-resources01.jpg
new file mode 100644
index 000000000..9c94fa3b0
Binary files /dev/null and b/public/images/resources/img-resources01.jpg differ
diff --git a/public/images/resources/img-resources02.jpg b/public/images/resources/img-resources02.jpg
new file mode 100644
index 000000000..4d45aba7d
Binary files /dev/null and b/public/images/resources/img-resources02.jpg differ
diff --git a/public/images/resources/img-resources03.jpg b/public/images/resources/img-resources03.jpg
new file mode 100644
index 000000000..605abe53e
Binary files /dev/null and b/public/images/resources/img-resources03.jpg differ
diff --git a/public/images/resources/img-resources04.jpg b/public/images/resources/img-resources04.jpg
new file mode 100644
index 000000000..b136d9fa9
Binary files /dev/null and b/public/images/resources/img-resources04.jpg differ
diff --git a/public/images/wx.gif b/public/images/wx.gif
new file mode 100644
index 000000000..744f5ae7a
Binary files /dev/null and b/public/images/wx.gif differ
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
new file mode 100644
index 000000000..b4fa072e2
--- /dev/null
+++ b/public/stylesheets/org2.css
@@ -0,0 +1,109 @@
+/* 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.9; background:#f2f2f2;}
+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,a:active{color:#24366e;}
+
+/* 公共 */
+.cl{ clear:both;}
+.fl{ float:left;}
+.fr{ float:right;}
+.mb18{ margin-bottom:18px;}
+.mt10{ margin-top:10px;}
+.mr20{ margin-right:20px;}
+/* 首页内容 */
+.sn-content{ width:1200px; margin:0 auto;}
+.sn-content-left{ width:820px; margin-right:12px; margin-bottom:74px;}
+.sn-content-right{ width:368px; margin-bottom:74px; }
+/* index-banner */
+.sn-index-banner{ width:820px; height:435px; margin-bottom:20px;}
+.focus{ position:relative; width:820px; height:435px; background-color: #000; float: left;}
+.focus img{ width:820px; height:435px;}
+.focus .shadow .title{width: 260px; height: 65px;padding-left: 30px;padding-top: 20px;}
+.focus .shadow .title a{ text-decoration:none; color:#fff; font-size:14px; font-weight:bolder; overflow:hidden; }
+.focus .btn{ position:absolute; bottom:34px; left:510px; overflow:hidden; zoom:1;}
+.focus .btn a{position:relative; display:inline; width:13px; height:13px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; }
+.focus .btn a:hover,.focus .btn a.current{ cursor:pointer;background:#fc114a;}
+.focus .fPic{ position:absolute; left:0px; top:0px; }
+.focus .D1fBt{ overflow:hidden; zoom:1; height:16px; z-index:10; }
+.focus .shadow{ width:100%; position:absolute; bottom:0; left:0px; z-index:10; height:80px; line-height: 80px; background:rgba(0,0,0,0.6);
+ filter:progid:DXImageTransform.Microsoft.gradient( GradientType = 0,startColorstr = '#80000000',endColorstr = '#80000000')\9; display:block; text-align:left; }
+.focus .shadow a{ text-decoration:none; color:#fff; font-size:20px; overflow:hidden; margin-left:10px; }
+.focus .fcon{ position:relative; width:100%; float:left; display:none; background:#000 }
+.focus .fcon img{ display:block; }
+.focus .fbg{bottom:25px; right:40px; position:absolute; height:21px; text-align:center; z-index: 200; }
+.focus .fbg div{margin:4px auto 0;overflow:hidden;zoom:1;height:14px}
+.focus .D1fBt a{position:relative; display:inline; width:12px; height:12px; border-radius:7px; margin:0 5px;color:#B0B0B0; text-decoration:none; text-align:center; outline:0; float:left; background:#D9D9D9; }
+.focus .D1fBt .current,.focus .D1fBt a:hover{background:#fc114a;}
+.focus .D1fBt img{display:none}
+.focus .D1fBt i{display:none; font-style:normal; }
+.focus .prev,.focus .next{position:absolute;width:40px;height:74px;background: url(../images/banner/focus_btn.png) no-repeat;}
+.focus .prev{top: 50%;margin-top: -37px; left: 0;background-position:0 -74px; cursor:pointer; }
+.focus .next{top: 50%;margin-top: -37px; right: 0; background-position:-40px -74px; cursor:pointer;}
+.focus .prev:hover{ background-position:0 0; }
+.focus .next:hover{ background-position:-40px 0;}
+/* index-news */
+.sn-index-leftbox{ width:820px; background:#fff; margin-bottom:20px;}
+.h2-title{ padding:5px 0 3px; border-bottom:1px solid #ebebeb; font-size:18px; color:#777; font-weight:normal; padding-left:17px;}
+.h2-title a.more{ font-size:12px; color:#777; float:right; margin-right:17px; line-height:2.8;}
+.h2-title a:hover.more{ color:#24366e;}
+.sn-news-bigbox{ padding:0px 26px 0px 18px; margin:18px 0 26px; border-right:1px solid #ebebeb;}
+.sn-news-bigbox a.h3-title{ font-size:18px; width:380px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
+.sn-news-bigbox .sn-news-txt{ width:380px; color:#666;}
+.sn-news-bigbox .sn-news-bigimg{ width:380px; height:165px;}
+.txt-grey{ color:#999;}
+.sn-news-smallbox{padding:0px 18px 0px 26px; margin:18px 0 26px; width:350px; }
+.sn-news-smallbox .sn-news-smallimg{ width:85px; height:85px; margin-right:10px;}
+.sn-news-smallbox a.h4-title{ font-size:14px; width:255px; float:left;}
+/* index-resources */
+.sn-index-resourcescon{ padding-top:12px;background:#f2f2f2;}
+.sn-index-resourcesbox{ padding:10px; background:#f2f2f2; width:185px; float:left;}
+.sn-index-resourcesbox:hover{ background:#fff;}
+.sn-index-resourcesbox a.resources-title{ font-size:18px; font-weight:normal; line-height:2.0;width:185px; display:block; border-bottom:1px solid #ccc; margin-bottom:5px;}
+.sn-index-resourcesbox a.resources-tag{ font-size:14px; color:#999; margin-right:5px; line-height:1.5;}
+a.more-btn{ display:block; width:190px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;}
+/* index-partner */
+.sn-index-partnerbox{ padding:25px 30px; }
+.sn-index-partnerbox{ width:775px;}
+.sn-index-partnerbox ul li{ height:55px;}
+.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;}
+.partner-btnbox{ width:90px; margin:0 auto;}
+.partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;}
+.partner-btn:hover{ background-color:#172b65;}
+/* index-active */
+.sn-index-activebox{ margin-bottom:20px; background:#fff; padding-bottom:10px;}
+.active-title{width:330px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
+.sn-index-active{ margin:0px 20px 5px 20px;}
+.sn-index-active a.sn-activeimg{width:330px; height:210px;}
+/* index-wx*/
+.sn-index-wxbox{margin-bottom:20px; background:#fff;}
+.sn-index-wximg{ margin:15px; margin-right:5px;}
+.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;}
+.sn-index-smallbanner img{ display:block; width:369px; height:169px; }
+
+/* 内页新闻列表 */
+.sn-inner-body{ width:100%; background-color:#fff;}
+.sn-innner-content{ width:1200px; margin:0 auto;}
+.sn-inner-newsh2{ font-size:20px; font-weight:normal; padding-bottom:10px; border-bottom:1px dashed #eee;}
+.sn-circle{ margin:18px 5px 0 5px ;border:1px solid #24366e; width:5px; height:5px; -webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px; }
+.sn-inner-newslist ul li{ line-height:42px; font-size:15px;}
+.sn-inner-newslist a{font-size:15px; color:#888;}
+.sn-inner-newslist a:hover{ color:#24366e;}
+a.sn-newslist-titile{ font-size:15px;width:840px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;}
+
+
+
+
+
+
+
+
+
+
+
+
+