From a51b532a0bbf9ed6f4b97ef500d8099bff056319 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 4 Aug 2015 18:18:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users_new.html.erb | 2 +- public/stylesheets/public_new.css | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 0513f49ce..09d437da4 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -271,7 +271,7 @@
- <%= render :partial => 'layouts/base_footer_public'%> + <%= render :partial => 'layouts/new_footer'%>
diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css index 78538c07f..7389dff8a 100644 --- a/public/stylesheets/public_new.css +++ b/public/stylesheets/public_new.css @@ -436,12 +436,12 @@ a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} div.ke-statusbar{height:1px; border-top:none;} /*底部*/ -#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;} -.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} -.footerAbout{ width:585px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; } -.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} -.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;} -.copyright{ width:390px; margin:0 auto;height:20px;line-height:20px;} -a.f_grey {color:#666666;} -a.f_grey:hover {color:#000000;} +/*#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}*/ +/*.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}*/ +/*.footerAbout{ width:585px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }*/ +/*.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}*/ +/*.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}*/ +/*.copyright{ width:390px; margin:0 auto;height:20px;line-height:20px;}*/ +/*a.f_grey {color:#666666;}*/ +/*a.f_grey:hover {color:#000000;}*/ From bc6b6b05364848102caaf98c2d038b84dda01339 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 4 Aug 2015 18:24:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b40359f46..c47976275 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2058,22 +2058,22 @@ zh: lable_unset: 未设置 label_chose_group: 请选择分班 - label_hosted_organization: 主办单位 - label_hosted_by: 国防科学技术大学并行与分布处理国家重点实验室 - label_sponsor: 计算机科学与技术系 - label_partners: 合作单位 - label_co_organizer_NUDT: 国防科学技术大学计算机学院 - label_co_organizer_EECS: 北京大学 - label_co_organizer_BHU: 北京航空航天大学 - label_co_organizer_CAS: 中国科学院软件研究所 - label_co_organizer_InforS: 中创软件 - label_rights_reserved: Copyright 2007~2015, All Rights Riserved - label_about_us: 关于我们 - label_contact_us: 联系我们 - label_recruitment_information: 招聘信息 - label_surpport_group: 帮助中心 - label_forums: 论坛反馈 - label_language: 语言 - label_license: 湘ICP备09019772 +# label_hosted_organization: 主办单位 +# label_hosted_by: 国防科学技术大学并行与分布处理国家重点实验室 +# label_sponsor: 计算机科学与技术系 +# label_partners: 合作单位 +# label_co_organizer_NUDT: 国防科学技术大学计算机学院 +# label_co_organizer_EECS: 北京大学 +# label_co_organizer_BHU: 北京航空航天大学 +# label_co_organizer_CAS: 中国科学院软件研究所 +# label_co_organizer_InforS: 中创软件 +# label_rights_reserved: Copyright 2007~2015, All Rights Riserved +# label_about_us: 关于我们 +# label_contact_us: 联系我们 +# label_recruitment_information: 招聘信息 +# label_surpport_group: 帮助中心 +# label_forums: 论坛反馈 +# label_language: 语言 +# label_license: 湘ICP备09019772