diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index ea63f680f..2bdb554ce 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -1,41 +1,49 @@ <%= javascript_include_tag "feedback" %> -
+
-
-
- - - - +
+ 问题和建议 + × + ›
-
-
+
+
<% get_memo %> <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> - <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %> + <%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => l(:label_feedback_tips) %> <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> - - + 还能输入50个字符 + <%= l(:label_submit)%> +
<% end %>
-
+
+
+
- <%#= l(:label_technical_support) %> + <%#= l(:label_technical_support) %> - - - Trustie师姐师兄答疑群 + + + +

加入QQ群

+
+
+

关注官方微信

+
-
-
- <%= l(:label_submit)%> - +
+
+ + 提
问 + × +
diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index 754cfd10b..8d09ecb52 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -107,10 +107,15 @@ $(".course_list_menu").each(function(){ var courseWidth = $(this).children().eq(0).width(); - var classWidth = 170 -courseWidth; + var classWidth = $(this).children().eq(2).width(); + var newClassWidth = 170 - courseWidth; + var newCourseWidth = 170 - classWidth; console.log(courseWidth, classWidth); - if(courseWidth < 80){ - $(this).children().eq(2).css("max-width",classWidth + "px"); + if(courseWidth < 80 && classWidth > 80){ + $(this).children().eq(2).css("max-width",newClassWidth + "px"); + } + if(classWidth < 80 && courseWidth > 80){ + $(this).children().eq(0).css("max-width",newCourseWidth + "px"); } }) diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 49d5f4d03..cfe52e11a 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -358,7 +358,7 @@ zh: # 意见反馈 # label_feedback: 意见反馈 - label_feedback_tips: "请在此发布平台问题和建议，或直接加入答疑群，谢谢！" + label_feedback_tips: "在此输入对平台问题和建议，您也可以通过QQ、微信留言，谢谢！" label_technical_support: "QQ 在线支持：" label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！" label_feedback_value: "该帖来自用户反馈:)" diff --git a/public/images/QQ_Logo.png b/public/images/QQ_Logo.png new file mode 100644 index 000000000..1e3815efa Binary files /dev/null and b/public/images/QQ_Logo.png differ diff --git a/public/images/dialog.png b/public/images/dialog.png new file mode 100644 index 000000000..b92274fef Binary files /dev/null and b/public/images/dialog.png differ diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js index 97209131e..066b5b96d 100644 --- a/public/javascripts/feedback.js +++ b/public/javascripts/feedback.js @@ -1,148 +1,148 @@ -(function($){ - $.fn.fix = function(options){ - var u = navigator.userAgent; - if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ - $("#scrollsidebar").css("display","none"); - return; - } - var defaults = { - float : 'right', - minStatue : true, - skin : 'blue', - durationTime : 1000 - }; - var options = $.extend(defaults, options); - - this.each(function(){ - //??????? - var thisBox = $(this), - closeBtn = thisBox.find('.close_btn' ), - show_btn = thisBox.find('.show_btn' ), - sideContent = thisBox.find('.side_content'); - var defaultTop = thisBox.offset().top; //????????top - thisBox.css(options.float, 0); - if(options.minStatue == "true"){ - show_btn.css("float", options.float); - sideContent.css('width', 0); - show_btn.css('width', 28); - } - //close - closeBtn.bind("click",function(){ - sideContent.animate({width: '0px'},"fast"); - show_btn.stop(true, true).delay(300).animate({ width: '28px'},"fast"); - cookiesave('minStatue','true','','',''); - }); - //show - show_btn.bind("click",function() { - $(this).animate({width: '0px'},"fast"); - sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast"); - cookiesave('minStatue','false','','',''); - }); - }); //end this.each - }; -})(jQuery); - -function f_submit() -{ - $("#new_memo").submit(); -} - -function cookiesave(n, v, mins, dn, path) -{ - if(n) - { - - if(!mins) mins = 365 * 24 * 60; - if(!path) path = "/"; - var date = new Date(); - date.setTime(date.getTime() + (mins * 60 * 1000)); - var expires = "; expires=" + date.toGMTString(); - if(dn) dn = "domain=" + dn + "; "; - document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path; - - } -} -function cookieget(n) -{ - var name = n + "="; - var ca = document.cookie.split(';'); - for(var i=0;i -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ - $("#scrollsidebar").css("display","none"); - return; - } - $(".closeSidebar").click(function(){ - $(".show_btn").css("display","none"); - $("#scrollsidebar").css("display","none"); - return false; - }); - - $("#button1").click(function(){ - myTips("反馈成功","success"); - }); - - $("#scrollsidebar").fix({ - float: 'right', //default.left or right - minStatue: cookieget('minStatue'), - skin: 'green', //default.gray or blue - durationTime: 600 - }); - - $("#subject").keydown(function(){ - var curLength=$("#subject").val().length; - if(curLength>50){ - var num=$("#subject").val().substr(0,50); - $("#subject").val(num); - } - else{ - $("#textCount").text(50-$("#subject").val().length) - } - }).keyup(function(){ - var curLength=$("#subject").val().length; - if(curLength>50){ - var num=$("#subject").val().substr(0,50); - $("#subject").val(num); - } - else{ - $("#textCount").text(50-$("#subject").val().length) - } - }); -}); - -//var browser={ -// versions:function(){ -// var u = navigator.userAgent, app = navigator.appVersion; -// return {//移动终端浏览器版本信息 -// trident: u.indexOf('Trident') > -1, //IE内核 -// presto: u.indexOf('Presto') > -1, //opera内核 -// webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核 -// gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核 -// mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端 -// ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端 -// android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器 -// iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 -// iPad: u.indexOf('iPad') > -1, //是否iPad -// webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部 -// }; -// }(), -// language:(navigator.browserLanguage || navigator.language).toLowerCase() -//} -//document.writeln("语言版本: "+browser.language); -//document.writeln(" 是否为移动终端: "+browser.versions.mobile); -//document.writeln(" ios终端: "+browser.versions.ios); -//document.writeln(" android终端: "+browser.versions.android); -//document.writeln(" 是否为iPhone: "+browser.versions.iPhone); -//document.writeln(" 是否iPad: "+browser.versions.iPad); +(function($){ + $.fn.fix = function(options){ + var u = navigator.userAgent; + if((u.indexOf('Android') > -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ + $("#scrollsidebar").css("display","none"); + return; + } + var defaults = { + float : 'right', + minStatue : true, + skin : 'blue', + durationTime : 1000 + }; + var options = $.extend(defaults, options); + + this.each(function(){ + //??????? + var thisBox = $(this), + closeBtn = thisBox.find('.close_btn' ), + show_btn = thisBox.find('.show_btn' ), + sideContent = thisBox.find('.side_content'); + var defaultTop = thisBox.offset().top; //????????top + thisBox.css(options.float, 0); + if(options.minStatue == "true"){ + show_btn.css("float", options.float); + sideContent.css('width', 0); + show_btn.css('width', 28); + } + //close + closeBtn.bind("click",function(){ + sideContent.animate({width: '0px'},"fast"); + show_btn.stop(true, true).delay(300).animate({ width: '28px'},"fast"); + cookiesave('minStatue','true','','',''); + }); + //show + show_btn.bind("click",function() { + $(this).animate({width: '0px'},"fast"); + sideContent.stop(true, true).delay(200).animate({ width: '180px'},"fast"); + cookiesave('minStatue','false','','',''); + }); + }); //end this.each + }; +})(jQuery); + +function f_submit() +{ + $("#new_memo").submit(); +} + +function cookiesave(n, v, mins, dn, path) +{ + if(n) + { + + if(!mins) mins = 365 * 24 * 60; + if(!path) path = "/"; + var date = new Date(); + date.setTime(date.getTime() + (mins * 60 * 1000)); + var expires = "; expires=" + date.toGMTString(); + if(dn) dn = "domain=" + dn + "; "; + document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path; + + } +} +function cookieget(n) +{ + var name = n + "="; + var ca = document.cookie.split(';'); + for(var i=0;i -1 || u.indexOf('Linux') > -1 ||u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1)){ + $("#scrollsidebar").css("display","none"); + return; + } + $(".closeSidebar, .hide-side-bar").click(function(){ + $(".show_btn").css("display","none"); + $("#scrollsidebar").css("display","none"); + return false; + }); + + $("#button1").click(function(){ + myTips("反馈成功","success"); + }); + + $("#scrollsidebar").fix({ + float: 'right', //default.left or right + minStatue: cookieget('minStatue'), + skin: 'green', //default.gray or blue + durationTime: 600 + }); + + $("#subject").keydown(function(){ + var curLength=$("#subject").val().length; + if(curLength>50){ + var num=$("#subject").val().substr(0,50); + $("#subject").val(num); + } + else{ + $("#textCount").text(50-$("#subject").val().length) + } + }).keyup(function(){ + var curLength=$("#subject").val().length; + if(curLength>50){ + var num=$("#subject").val().substr(0,50); + $("#subject").val(num); + } + else{ + $("#textCount").text(50-$("#subject").val().length) + } + }); +}); + +//var browser={ +// versions:function(){ +// var u = navigator.userAgent, app = navigator.appVersion; +// return {//移动终端浏览器版本信息 +// trident: u.indexOf('Trident') > -1, //IE内核 +// presto: u.indexOf('Presto') > -1, //opera内核 +// webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核 +// gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') == -1, //火狐内核 +// mobile: !!u.match(/AppleWebKit.*Mobile.*/)||!!u.match(/AppleWebKit/), //是否为移动终端 +// ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端 +// android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器 +// iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 +// iPad: u.indexOf('iPad') > -1, //是否iPad +// webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部 +// }; +// }(), +// language:(navigator.browserLanguage || navigator.language).toLowerCase() +//} +//document.writeln("语言版本: "+browser.language); +//document.writeln(" 是否为移动终端: "+browser.versions.mobile); +//document.writeln(" ios终端: "+browser.versions.ios); +//document.writeln(" android终端: "+browser.versions.android); +//document.writeln(" 是否为iPhone: "+browser.versions.iPhone); +//document.writeln(" 是否iPad: "+browser.versions.iPad); //document.writeln(navigator.userAgent); \ No newline at end of file diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 88f3e4cba..f7dd1b763 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -607,7 +607,6 @@ a:hover.sy_btn_blue{ background: #2788d0;} .is_public_checkbox{margin-left: 15px;margin-right: 10px;} .author_name{color: #3ca5c6 !important;} .ke-container-default{max-width: 100%;} -.borderRadius {border-radius:5px;} /*状态提示图标*/ .success-icon {background:url("/images/icons_ziliao.png") 0 -28px no-repeat; padding-left:25px;} diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 77f7fdfe2..dcc6e9ff4 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -515,9 +515,6 @@ a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;borde a:hover.blueCir{ background:#3598db; color:#fff;} .proList {background-color:#eaeaea; padding:5px 10px; display:block; max-width:655px; float:left;} -.borderRadius {border-radius:5px;} -.tac {text-align:center;} - .reCon{ margin:5px; width:710px;} .reTop{width:710px; height:40px; background:#eaeaea; padding:5px;} .filesTag{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;cursor: pointer } diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index d4ba7b86c..923ec4dbb 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -116,36 +116,32 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n .softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;} /*意见反馈*/ -.qr-code-border {border:2px solid #269ac9;} html{ overflow-x:hidden;} .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; } -.side_content{width:154px; height:auto; overflow:hidden; float:left; } -.side_content .side_list {width:154px;overflow:hidden;} -.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;} -.show_btn span { display:none;} -.close_btn{width:24px;height:24px;cursor:pointer;} -.side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat; } +.side_content{width:180px; height:auto; overflow:hidden; float:left;} +.side_content .side_list {width:180px;overflow:hidden;} +.show_btn{ width:0; height:100px; overflow:hidden; float:left; margin-top:200px; cursor:pointer; background-color:#fff;} +.close_btn{cursor:pointer;} +.side_title,.side_bottom {background:url(/images/sidebar_bg.png) no-repeat; } .side_title {height:35px;} .side_bottom { height:8px;} .side_center {font-family:Verdana, Geneva, sans-serif; padding:0px 12px; font-size:12px;} -.close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;} -.close_btn span { display:none;} .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;} .msgserver { margin:10px 0 0px 5px;} .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; } -.opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} +.opnionText{box-shadow:none; width:150px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;} a.opnionButton:hover{background: #297fb8; } /* blue skin as the default skin */ .side_title {background-position:-195px 0;} .side_center {background:url(/images/blue_line.png) repeat-y center; } .side_bottom {background-position:-195px -50px;} -.close_btn {background-position:-44px 0;} -.close_btn:hover {background-position:-66px 0;} -.show_btn {background-position:-119px 0;} .msgserver a {color:#269ac9; } .msgserver a:hover { text-decoration:underline; } -.closeSidebar {background:url(/images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;} +.closeSidebar {width:26px; height:18px; line-height:18px; vertical-align:middle; border-top:1px solid #aaa; color:#aaa; display:block;} + +.side-bar-circle {width:13px; height:13px; font-size:14px; color:#aaa; border:1px solid #aaa; border-radius:50%; display:block; font-weight:bold; position:relative; cursor:pointer;} +.side-bar-content {position:absolute; top:-5px; left:1px;} .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}