Merge branch 'szzh' into develop

11 years ago · 2c51d6e802
parent 00725aae93 3b0a229c43
commit 2c51d6e802
2 changed files with 2 additions and 1 deletions
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@ -89,7 +89,7 @@
 			closeBtn.bind("click",function(){
 				sideContent.animate({width: '0px'},"fast");
            	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
-            	cookiesave('minStatue','true','','','');
+            	cookiesave('minStatue','false','','','');
 			});
 			//show???
 			 show_btn.bind("click",function() {
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -2078,5 +2078,6 @@ zh:
  label_end_time: 截止时间
  label_send_email: 确定发送
  label_input_email: 请输入邮箱地址
+  project_module_files: 资源库