From 89a001ad9dd5bfa8a3a7a7b9531996912600fefe Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 27 Mar 2015 11:20:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?IE8=E6=B5=8F=E8=A7=88=E5=99=A8=E5=8F=8A?= =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E4=BD=8E=E7=89=88=E6=9C=AC=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 4 +- app/views/layouts/_point_browser.html.erb | 97 +++++++++++++++++------ 2 files changed, 75 insertions(+), 26 deletions(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index d964b788f..719021526 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -85,13 +85,13 @@ show_btn.css('width', 25); } - //close??? + //close closeBtn.bind("click",function(){ sideContent.animate({width: '0px'},"fast"); show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast"); cookiesave('minStatue','true','','',''); }); - //show??? + //show show_btn.bind("click",function() { $(this).animate({width: '0px'},"fast"); sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast"); diff --git a/app/views/layouts/_point_browser.html.erb b/app/views/layouts/_point_browser.html.erb index e936a6b11..55fedd751 100644 --- a/app/views/layouts/_point_browser.html.erb +++ b/app/views/layouts/_point_browser.html.erb @@ -9,38 +9,87 @@ .update{ border-bottom:1px solid #d7d7d7; color:#fea254; text-align:center; width:100%; font-size:10px; height:30px; background:#fdffd9; padding:2px 0;z-index:1000;} a.green_btn{ padding:2px 10px; background:#3caf3f; font-size:12px;color:#fff;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} a:hover.green_btn{ background:#289c2b;} - a.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px; float:right; margin:7px 5px 0 0;} - a:hover.close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -63px no-repeat;} + a.update_close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -35px no-repeat; display:block; width:16px; height:16px; float:right; margin:7px 5px 0 0;} + a:hover.update_close_btn{ background:url(images/floatbox/img_floatbox.png) -20px -63px no-repeat;} + -
- 您当前使用的是IE8浏览器，建议升级您的浏览器。 - - -
-
- +
- - \ No newline at end of file From 762c83b26c856fbc241acfef896457b229399e10 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 27 Mar 2015 15:17:18 +0800 Subject: [PATCH 2/5] commit --- app/views/layouts/_point_browser.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_point_browser.html.erb b/app/views/layouts/_point_browser.html.erb index 55fedd751..52ee855ab 100644 --- a/app/views/layouts/_point_browser.html.erb +++ b/app/views/layouts/_point_browser.html.erb @@ -79,7 +79,7 @@ // test IE11 if (browser == "trident" && version<= 7 && cookieget('closeStatue') == false) { /* return true; */ - cookiesave('closeStatue','false','','',''); + cookiesave('closeStatue','true','','',''); } if( cookieget('closeStatue') == 'false' ) { From 3d2fc8e5ef5a3c5c5fc83fd7229c54a2b7df5d80 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 27 Mar 2015 15:21:48 +0800 Subject: [PATCH 3/5] IE8 --- app/views/layouts/_point_browser.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_point_browser.html.erb b/app/views/layouts/_point_browser.html.erb index 52ee855ab..3ad478928 100644 --- a/app/views/layouts/_point_browser.html.erb +++ b/app/views/layouts/_point_browser.html.erb @@ -72,7 +72,7 @@ /* $("#update_info").html("您当前使用的是"+browser+"浏览器。"+"主版本号为："+version); */ cookiesave('closeStatue','true','','',''); } - if (browser == "mise" && version<= 8 && cookieget('closeStatue') == false) { + if (browser == "msie" && version<= 8 && cookieget('closeStatue') == false) { cookiesave('closeStatue','false','','',''); } From 582c70a96c367fc6011c769760b95b331d2b94b8 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 27 Mar 2015 16:25:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=9C=AA=E9=80=89=E6=8B=A9=E7=BD=AE?= =?UTF-8?q?=E9=A1=B6/=E9=94=81=E5=AE=9A=E9=80=89=E9=A1=B9=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c4be244fa..b4bd12d34 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -137,7 +137,7 @@ a:hover.more{ color:#64bdd9;} .problem_pic:hover{border:1px solid #64bdd9;} .problem_txt{ width:610px; margin-left:10px; color:#777777;} .problem_name{ color:#ff5722 !important;} -.problem_line{margin-top:5px;} +.problem_line{margin-top:5px;float:left;} .problem_name:hover{ color:#d33503;} .problem_tit{ color:#0781b4 !important; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} .problem_tit:hover{ color:#09658c !important; } From 54908423bceca3748cf3cc196bffb4895c823c3b Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 27 Mar 2015 17:00:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B--=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98;?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA=E9=99=84=E4=BB=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_links.html.erb | 6 ++---- app/views/layouts/base_homework.html.erb | 2 +- config/locales/projects/en.yml | 4 ++++ config/locales/projects/zh.yml | 6 ++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index 4c2ee0c8f..02c7ba4dc 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -9,7 +9,7 @@ <% if options[:length] %> <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%> <% else %> - <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%> + <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true, :length => 32 -%> <% end %> <%if is_float%> @@ -26,9 +26,7 @@ <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %> - ( - <%= number_to_human_size attachment.filesize %>) - + (<%= number_to_human_size attachment.filesize , :precision => 0 %>) <% if options[:deletable] %> <% if attachment.container_type == 'HomeworkAttach' %> <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id}, diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index a858c045e..bb7b18a4a 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -178,7 +178,7 @@ - <% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 7} %> + <% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 15} %> <%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %> diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 94344a8d6..9eadfc46f 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -136,7 +136,11 @@ en: # 项目托管平台 # # 问题跟踪 + label_issues_sum: 'Total' + lable_issues_undo: 'Unresolved：' label_successful_create: Successfully created + + # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 880727bd9..9f1a95201 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -49,8 +49,7 @@ zh: label_issue_tracking: 问题跟踪 label_release_issue: 发布问题 - label_issues_sum: 问题总数： - lable_issues_undo: 未解决： + project_module_boards: 讨论区 project_module_boards_post: 发帖 @@ -144,6 +143,9 @@ zh: # # 问题跟踪 label_successful_create: 创建成功 + label_issues_sum: '问题总数' + lable_issues_undo: '未解决：' + #