diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 782efbb22..3dad88868 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -247,7 +247,7 @@ tagId = id; taggableType = type; width = parseInt(domEle.css('width').replace('px', '')) >= 100 ? parseInt(domEle.css('width').replace('px', '')) : 100 - domEle.html(''); + domEle.html(''); domEle.parent().css("border", "1px solid #ffffff"); $("#renameTagName").focus(); } @@ -295,8 +295,8 @@ // }else{ //否则就要更新tag名称了 //// if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){ 去掉询问 // $.post( -// '<%= update_tag_name_path %>', -// {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>} +// '<%#= update_tag_name_path %>', +// {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%#= @course.id%>} // ) //// }else{ //// ele.parent().css("border",""); diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index d32fbf4ed..e03ac2fc5 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -61,14 +61,14 @@ function addTag(){ if(<%=@forum.creator.id == User.current.id%>) { if ($("input[name='addTag']").val().trim() != "" ) { - if($("input[name='addTag']").val().trim().length <= 14) { + if($("input[name='addTag']").val().trim().length <= 120) { $.get( '<%= add_forum_tag_forum_path(@forum)%>' + "?tag_str=" + $("input[name='addTag']").val(), {} ); $("input[name='addTag']").val(''); }else{ - alert("标签名字长度不能超过14个字符"); + alert("标签名字长度不能超过120个字符"); } } } diff --git a/config/settings.yml b/config/settings.yml index d0af6d7a1..4286e0930 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -259,7 +259,7 @@ tags_min_length: default: 1 tags_max_length: format: int - default: 14 + default: 120 tags_show_search_results: format: int default: 5 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f8b5395d5..5646737f5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -2745,15 +2745,31 @@ h2 img { vertical-align:middle; } /*added by william*/ #tag { - background: url(../images/issue_tag.png) no-repeat right -19px; - border-radius: 3px; - color: #3a587d !important; - padding: 1px 4px 2px 4px; - margin: 3px; - display: inline-block; - font-size: 13px; /*modified by linchun*/ - text-decoration: none; - cursor: pointer; + /*background: url(../images/issue_tag.png) no-repeat right -19px;*/ + /*border-radius: 3px;*/ + /*color: #3a587d !important;*/ + /*padding: 1px 4px 2px 4px;*/ + /*margin: 3px;*/ + /*display: inline-block;*/ + /*font-size: 13px; *//*modified by linchun*/ + /*text-decoration: none;*/ + /*cursor: pointer;*/ + border-radius: 3px; + color: #3a587d !important; + padding: 1px 4px 2px 4px; + margin: 3px; + display: inline-block; + font-size: 13px; + text-decoration: none; + cursor: pointer; + width: auto; + padding: 0 5px; + padding-top: 2px; + border: 1px solid #f8df8c; + background: #fffce6; + margin-right: 5px; + word-wrap: break-word; + word-break: break-all; } /*tanxianbo*/ diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css index 990c02d54..26976343e 100644 --- a/public/stylesheets/leftside.css +++ b/public/stylesheets/leftside.css @@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index 1f48c9166..1ce12bdda 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -59,7 +59,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;} diff --git a/public/stylesheets/user_leftside.css b/public/stylesheets/user_leftside.css index e33e2c7d6..c8dfbe316 100644 --- a/public/stylesheets/user_leftside.css +++ b/public/stylesheets/user_leftside.css @@ -56,7 +56,7 @@ a:hover.subnav_green{ background:#14ad5a;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} -.re_tag{ width: auto; padding:0 5px; padding-top:2px; height:20px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; word-wrap: break-word;word-break: break-all } .re_tag a{ color:#0d90c3;} .tag_h{ } .tag_h span,.tag_h a{ margin-bottom:5px;}