From 8babe384fd8a3d2c38569dd9dfdaf613a92286f7 Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 16 Apr 2015 20:11:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/issues_helper.rb | 4 +- app/views/issues/_history.html.erb | 4 +- public/javascripts/project.js | 256 ++++++++++++++--------------- public/stylesheets/pleft.css | 2 +- public/stylesheets/project.css | 4 + 5 files changed, 132 insertions(+), 138 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 54cef5c7a..9c4fab9de 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -340,9 +340,9 @@ module IssuesHelper if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key) # Link to the attachment if it has not been removed if options[:token].nil? - value = link_to_attachment(atta, :download => true, :only_path => options[:only_path]) + value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :class=> "info_foot_num c_blue") else - value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :token => options[:token]) + value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :token => options[:token], :class=> "info_foot_num c_blue") end if options[:only_path] != false && atta.is_text? value += link_to( diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb index 50ddbceee..b0f1ad38d 100644 --- a/app/views/issues/_history.html.erb +++ b/app/views/issues/_history.html.erb @@ -12,8 +12,8 @@

<% if journal.details.any? %> <% details_to_strings(journal.details).each do |string| %> - <%= string %> - <% end %> +

<%= string %>

+ <% end %> <% end %>

diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 3085769ba..b5f769723 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -13,9 +13,10 @@ function regexName(content) { } } -function submitSerch(content) -{ - if(regexName(content)){$("#project_search_form").submit();} +function submitSerch(content) { + if (regexName(content)) { + $("#project_search_form").submit(); + } } @@ -25,15 +26,13 @@ function submitSerch(content) // // }) //}) -function expand_tools_expand(content) -{ - if (content=="invit"){ +function expand_tools_expand(content) { + if (content == "invit") { $("#expand_tools_expand_invit").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd"); $("#expand_tools_expand_invit").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt"); $("#expand_tools_expand_invit").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500); } - else - { + else { $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd"); $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt"); $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500); @@ -43,235 +42,226 @@ function expand_tools_expand(content) } // 描述显示更多信息 -function show_more_msg(){ - $("#course_description").toggleClass("course_description_none"); - var information = $("#expend_more_information"); - var arrow = $("#arrow"); - var val = information.attr("value"); - if (val=="展开更多信息" ) - { +function show_more_msg() { + $("#course_description").toggleClass("course_description_none"); + var information = $("#expend_more_information"); + var arrow = $("#arrow"); + var val = information.attr("value"); + if (val == "展开更多信息") { $("#expend_more_information").text("收起描述信息"); - information.attr("value","收起描述信息"); - arrow.attr("src","/images/jiantouup.jpg") + information.attr("value", "收起描述信息"); + arrow.attr("src", "/images/jiantouup.jpg") } - else - { + else { $("#expend_more_information").text("展开更多信息"); - information.attr("value","展开更多信息"); - arrow.attr("src","/images/jiantou.jpg") + information.attr("value", "展开更多信息"); + arrow.attr("src", "/images/jiantou.jpg") } } /////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////项目讨论区 -function regexSubject() -{ +function regexSubject() { var content = $.trim($("#message_subject").val()); - if(content.length ==0) - { + if (content.length == 0) { $("#subject_span").text("主题不能为空"); - $("#subject_span").css('color','#ff0000'); + $("#subject_span").css('color', '#ff0000'); return false; } - else - { + else { $("#subject_span").text("填写正确"); - $("#subject_span").css('color','#008000'); + $("#subject_span").css('color', '#008000'); return true; } return false; } -function regexContent() -{ +function regexContent() { var content = $.trim($("#message_content").val()); - if(content.length ==0) - { + if (content.length == 0) { $("#message_content_span").text("描述不能为空"); - $("#message_content_span").css('color','#ff0000'); + $("#message_content_span").css('color', '#ff0000'); return false; } - else - { + else { $("#message_content_span").text("填写正确"); - $("#message_content_span").css('color','#008000'); + $("#message_content_span").css('color', '#008000'); return true; } return false; } // 项目编辑和提交 -function submitProjectsBoard() -{ - if(regexSubject()&®exContent()){$("#message-form").submit();} +function submitProjectsBoard() { + if (regexSubject() && regexContent()) { + $("#message-form").submit(); + } } // 提交新闻 -function regexTitle() -{ +function regexTitle() { var name = $("#news_title").val(); - if(name.length ==0) - { + if (name.length == 0) { $("#title_notice_span").text("标题不能为空"); - $("#title_notice_span").css('color','#ff0000'); + $("#title_notice_span").css('color', '#ff0000'); $("#title_notice_span").focus(); return false; } - else if(name.length <= 60) - { + else if (name.length <= 60) { $("#title_notice_span").text("填写正确"); - $("#title_notice_span").css('color','#008000'); + $("#title_notice_span").css('color', '#008000'); return true; } - else - { + else { $("#title_notice_span").text("标题超过60个字符"); - $("#title_notice_span").css('color','#ff0000'); + $("#title_notice_span").css('color', '#ff0000'); $("#title_notice_span").focus(); return false; } } -function regexDescription() -{ +function regexDescription() { var name = $("#news_description").val(); - if(name.length ==0) - { + if (name.length == 0) { $("#description_notice_span").text("描述不能为空"); - $("#description_notice_span").css('color','#ff0000'); + $("#description_notice_span").css('color', '#ff0000'); $("#description_notice_span").focus(); return false; } - else - { + else { $("#description_notice_span").text("填写正确"); - $("#description_notice_span").css('color','#008000'); + $("#description_notice_span").css('color', '#008000'); return true; } } -function submitNews() -{ - if(regexTitle() && regexDescription()) - { +function submitNews() { + if (regexTitle() && regexDescription()) { $("#news-form").submit(); } } -function submitFocus(obj) -{ +function submitFocus(obj) { $(obj).focus(); } //当项目描述长度小于112px时，不显示更多按钮 -$(function(){ +$(function () { // alert($("#course_description_content").height()); - if($("#course_description_content").height()>112) - { + if ($("#course_description_content").height() > 112) { $("#lg-foot").show(); } }); //配置项目信息 -function course_setting(id) -{ +function course_setting(id) { //alert(id); - $('#tb_'+id).removeClass().addClass("hwork_hovertab"); - $('#tbc_0'+id).removeClass().addClass("dis"); - $('#tb_'+(3-id)).removeClass().addClass("hwork_normaltab"); - $('#tbc_0'+(3-id)).removeClass().addClass("undis"); + $('#tb_' + id).removeClass().addClass("hwork_hovertab"); + $('#tbc_0' + id).removeClass().addClass("dis"); + $('#tb_' + (3 - id)).removeClass().addClass("hwork_normaltab"); + $('#tbc_0' + (3 - id)).removeClass().addClass("undis"); } //项目类型 -function show_window () { - $('#light').css('display','block'); - $('#fade').css('display','block'); +function show_window() { + $('#light').css('display', 'block'); + $('#fade').css('display', 'block'); } -function close_window(type){ - $('#light').css('display','none'); - $('#fade').css('display','none'); +function close_window(type) { + $('#light').css('display', 'none'); + $('#fade').css('display', 'none'); - $("#" + type).attr("checked","checked"); + $("#" + type).attr("checked", "checked"); } //弹框l ///////////////////////////////////////////// //项目配置 -function project_setting(n) -{ - for(var i = 1;i < 9; i++) - { - if(i == n) - { - $("#pro_st_tb_"+i).removeClass().addClass("pro_st_hovertab"); - $("#pro_st_tbc_0"+i).removeClass().addClass("pro_st_dis"); +function project_setting(n) { + for (var i = 1; i < 9; i++) { + if (i == n) { + $("#pro_st_tb_" + i).removeClass().addClass("pro_st_hovertab"); + $("#pro_st_tbc_0" + i).removeClass().addClass("pro_st_dis"); } - else - { - $("#pro_st_tb_"+i).removeClass().addClass("pro_st_normaltab"); - $("#pro_st_tbc_0"+i).removeClass().addClass("pro_st_undis"); + else { + $("#pro_st_tb_" + i).removeClass().addClass("pro_st_normaltab"); + $("#pro_st_tbc_0" + i).removeClass().addClass("pro_st_undis"); } } } //配置--成员---申请列表--拒绝 -function refusal_applied_member() -{ +function refusal_applied_member() { $('#new_membership').append(""); $('#new_membership').submit(); } //新闻描述显示更多信息 -function news_show_more_des(id) -{ +function news_show_more_des(id) { $('#news_description_' + id).toggleClass("news_description_none"); } -$(document).ready(function(){ - $("#issue_project_id").css("width","100%"); - $("#issue_project_id").css("overflow ","hidden"); +$(document).ready(function () { + $("#issue_project_id").css("width", "100%"); + $("#issue_project_id").css("overflow ", "hidden"); // $(".jstEditor").css("margin-left ","80px"); //issue_project_id }); function showAndScrollTo(id, focus) { - $('#'+id).show(); + $('#' + id).show(); if (focus !== null) { - $('#'+focus).focus(); - } - $('html, body').animate({scrollTop: $('#'+id).offset().top}, 400); - - - - /*缺陷完成度决定缺陷状态*/ -function PrecentChange(obj){ - var _v= obj; - if(_v==100) - { - //var select=$("select[id='issue_status_id']"); - $("select[id='issue_status_id']").find("option[value='3']").attr("selected","selected"); + $('#' + focus).focus(); } - else if(_v==0) - { - //alert(1); - $("select[id='issue_status_id']").find("option[value='1']").attr("selected","selected"); - } - else if(_v!=100&&_v!=0) - { - // alert(2); - $("select[id='issue_status_id']").find("option[value='2']").attr("selected","selected"); + $('html, body').animate({scrollTop: $('#' + id).offset().top}, 400); + + + /*缺陷完成度决定缺陷状态*/ + function PrecentChange(obj) { + var _v = obj; + if (_v == 100) { + //var select=$("select[id='issue_status_id']"); + $("select[id='issue_status_id']").find("option[value='3']").attr("selected", "selected"); + } + else if (_v == 0) { + //alert(1); + $("select[id='issue_status_id']").find("option[value='1']").attr("selected", "selected"); + } + else if (_v != 100 && _v != 0) { + // alert(2); + $("select[id='issue_status_id']").find("option[value='2']").attr("selected", "selected"); + } } -} // Can't use Rails' remote select because we need the form data // 根据缺陷状态值改变完成度状态 -function updateIssueFrom(url) { - - $.ajax({ - url: url, - type: 'post', - data: $('#issue-form').serialize() - }); - -} + function updateIssueFrom(url) { + + $.ajax({ + url: url, + type: 'post', + data: $('#issue-form').serialize() + }); + + } + +// firefox pre标签换行 + $(document).ready(function () { + var userAgent = navigator.userAgent.toLowerCase(); + var browser = { + version: (userAgent.match(/.+(?:rv|it|ra|ie)[/: ]([d.]+)/) || [])[1], + safari: /webkit/.test(userAgent), + opera: /opera/.test(userAgent), + msie: /msie/.test(userAgent) && !/opera/.test(userAgent), + mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent) + }; + if (browser.mozilla || browser.opera) { + $("pre").addClass("break_word_firefox"); + } + else { + $("pre").addClass("break_word"); + } + + }); + } \ No newline at end of file diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index a64d3671f..cc7e18465 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -50,7 +50,7 @@ a:hover.subnav_green{ background:#14ad5a;} .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;} .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;} .course_description_none{max-height: none;} -.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;} +.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;} /****标签(和资源库的tag样式一致)***/ .project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px;} diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index c6b58b8f3..556623e55 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -501,3 +501,7 @@ a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px p.other-formats { text-align: right; font-size:0.9em; color: #666; } .other-formats span + span:before { content: "| "; } + +/*pre标签换行*/ +.break_word{word-break: break-all;word-wrap: break-word;} +.break_word_firefox{white-space: pre-wrap;word-break: break-all;}