From 1553eadc58294f8bf98a9164487941b1853a61c3 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 7 Jun 2016 10:17:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=94=B9=E6=88=901000?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95=E6=A8=A1=E5=BC=8F=E4=BA=8C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sub_document_comments_controller.rb | 6 +++--- .../layouts/_org_subdomain_footer.html.erb | 13 ++++++++++++ app/views/layouts/base_org_custom.html.erb | 6 +++--- app/views/layouts/base_sub_domain.html.erb | 20 ++----------------- public/stylesheets/org2.css | 16 +++++++-------- 5 files changed, 29 insertions(+), 32 deletions(-) create mode 100644 app/views/layouts/_org_subdomain_footer.html.erb diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb index 80c14f004..2e0890e27 100644 --- a/app/controllers/sub_document_comments_controller.rb +++ b/app/controllers/sub_document_comments_controller.rb @@ -3,7 +3,7 @@ class SubDocumentCommentsController < ApplicationController before_filter :find_subfield_content, :only => [:show, :index] before_filter :authorize_allowed, :only => [:create, :add_reply] helper :attachments,:organizations - layout 'base_sub_domain' + layout 'base_org_custom' def new @sub_document_comment = SubDocumentComment.new @@ -41,7 +41,7 @@ class SubDocumentCommentsController < ApplicationController if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization) @document = SubDocumentComment.find(params[:id]) respond_to do |format| - format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'} + format.html {render :layout => @organization.switch_type ? 'base_org_custom' : 'base_org'} end else render_403 @@ -58,7 +58,7 @@ class SubDocumentCommentsController < ApplicationController @offset ||= @atta_pages.offset @documents = paginateHelper @documents,20 respond_to do |format| - format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'} + format.html {render :layout => @organization.switch_type ? 'base_org_custom' : 'base_org'} end else render_403 diff --git a/app/views/layouts/_org_subdomain_footer.html.erb b/app/views/layouts/_org_subdomain_footer.html.erb new file mode 100644 index 000000000..dd991d900 --- /dev/null +++ b/app/views/layouts/_org_subdomain_footer.html.erb @@ -0,0 +1,13 @@ +
+
+ +
联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
+
地 址：湖南省长沙市开福区东风路89号观园大厦23层
+ 卫星导航仿真与测试开放实验室
+
+
\ No newline at end of file diff --git a/app/views/layouts/base_org_custom.html.erb b/app/views/layouts/base_org_custom.html.erb index bfa76a221..8f071bfb2 100644 --- a/app/views/layouts/base_org_custom.html.erb +++ b/app/views/layouts/base_org_custom.html.erb @@ -9,16 +9,16 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'new_user', 'public', 'org_custom','jquery/jquery-ui-1.9.2' %> + <%= stylesheet_link_tag 'new_user', 'public', 'org_custom','jquery/jquery-ui-1.9.2', 'org2' %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - <%=render :partial => "math_js" %> + <%#=render :partial => "math_js" %> <% update_visiti_count @organization %>
- <%= render :partial => 'org_custom_header', :locals => {:subfield_content => @subfield_content} %> + <%= render :partial => 'organizations/org_custom_header', :locals => {:subfield_content => @subfield_content} %>
<%# 内容开始 %> diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb index 871e2cdea..0e6509e70 100644 --- a/app/views/layouts/base_sub_domain.html.erb +++ b/app/views/layouts/base_sub_domain.html.erb @@ -160,30 +160,14 @@
- - + diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index 3d46a9296..6672eb073 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -166,17 +166,17 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou /* 内页新闻列表 */ .sn-inner-body{ width:100%; background-color:#fff;} -.sn-innner-content{ width:1200px; margin:0 auto;} +.sn-innner-content{ width:1000px; margin:0 auto;} .sn-inner-newsh2{ font-size:20px; font-weight:normal; padding-bottom:5px; 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; border-bottom:1px solid #eee;} .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;} +a.sn-newslist-titile{ font-size:15px;width:700px; display:block;overflow:hidden;white-space:nowrap; text-overflow:ellipsis;} a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;} /* 内页新闻展示 */ -.sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; } +.sn-inner-newscon{ width:1000px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; } .sn-inner-pcon{text-indent:2em; overflow:hidden;} .sn-inner-newscon img{ display:block; max-width:830px; margin:25px auto 5px;} .sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;} @@ -186,8 +186,8 @@ a:hover.sn-newslist-zan{ background:url(../images/zan.gif) 0 -21px no-repeat; } /* 留言 */ .sn-replybox{ margin-bottom:100px;} .sn-reply-h2{ font-size:18px; font-weight:normal; color:#24366e; margin-bottom:6px;} -.sn-reply-form{ width:1200px;height:180px; border:1px solid #e8e8e8; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#fff; margin-bottom:20px; } -.sn-reply-text{ width:1200px; height:130px; background:#fff; border:none; resize:none;} +.sn-reply-form{ width:1000px;height:180px; border:1px solid #e8e8e8; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#fff; margin-bottom:20px; } +.sn-reply-text{ width:1000px; height:130px; background:#fff; border:none; resize:none;} .sn-reply-btnbox{border-top:1px solid #e8e8e8; height:48px;} a.submit-btn{ display:block; color:#fff; text-align:center; font-size:14px; line-height:27px; width:79px; height:27px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px; background:#24366e; margin:8px 0 0 10px;} a:hover.submit-btn{ color:#16275c; color:#fff;} @@ -196,10 +196,10 @@ a:hover.submit-btn{ color:#16275c; color:#fff;} .sn-reply-userpic img{ width:40px; height:40px;-webkit-border-radius:50px; -moz-border-radius:50px; -o-border-radius:50px; border-radius:50px;} a.sn-reply-zan{ display:block; background:url(../images/zan.gif) 0 4px no-repeat; width:54px; height:16px; padding-left:12px; color:#999; } a:hover.sn-reply-zan{ background:url(../images/zan.gif) 0 -32px no-repeat; } -.sn-comment-listbox{ padding:23px 0; width:1200px;border-bottom:1px solid #e8e8e8;} +.sn-comment-listbox{ padding:23px 0; width:1000px;border-bottom:1px solid #e8e8e8;} a.sn-reply-username { color:#24366e; margin-right:15px; } -.sn-reply-usertxt{ width:1145px; font-size:14px; } -.sn-reply-more{ width:1200px; height:25px; background:#ddd; text-align:center; line-height:25px;} +.sn-reply-usertxt{ width:945px; font-size:14px; } +.sn-reply-more{ width:1000px; height:25px; background:#ddd; text-align:center; line-height:25px;} /*用户图像*/ .topnav_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-7px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 1px;}