From 73854cc35cec48ecf59a20e03ba7a5cb01bdd351 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 21 Aug 2015 14:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E9=9D=99=E6=80=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 18 +- app/views/users/show.html.erb | 5 + public/javascripts/user.js | 259 +---------------------- public/stylesheets/new_public.css | 8 +- 4 files changed, 12 insertions(+), 278 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 3358a52e1..429bfdd6c 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -10,7 +10,7 @@ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_public', 'user_leftside', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> - <%= javascript_include_tag "bootstrap","avatars"%> + <%= javascript_include_tag "bootstrap","avatars","user"%> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -27,13 +27,13 @@
-
+
<%= image_tag(url_to_avatar(@user),width:"206", height: "206", :id=>'nh_user_tx') %> <% if User.current.logged?%> <% if User.current == @user%> -
+
@@ -223,17 +223,5 @@
- - diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 4975229eb..d96fd1036 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -213,4 +213,9 @@
+
+ + +
+
\ No newline at end of file diff --git a/public/javascripts/user.js b/public/javascripts/user.js index b032221f8..a26b6b94a 100644 --- a/public/javascripts/user.js +++ b/public/javascripts/user.js @@ -1,262 +1,5 @@ -//个人动态 $(function(){ - function init_editor(params){ - var editor = params.kindutil.create(params.textarea, { - resizeType : 1,minWidth:"1px",width:"100%",height:"80px", - items:['emoticons'], - afterChange:function(){//按键事件 - nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea}); - }, - afterCreate:function(){ - var toolbar = $("div[class='ke-toolbar']",params.div_form); - $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情'); - params.toolbar_container.append(toolbar); - } - }).loadPlugin('paste'); - return editor; - } - - function nh_check_field(params){ - var result=true; - if(params.content!=undefined){ - if(params.content.isEmpty()){ - result=false; - } - if(params.content.html()!=params.textarea.html() || params.issubmit==true){ - params.textarea.html(params.content.html()); - params.content.sync(); - if(params.content.isEmpty()){ - params.contentmsg.html('内容不能为空'); - params.contentmsg.css({color:'#ff0000'}); - }else{ - params.contentmsg.html('填写正确'); - params.contentmsg.css({color:'#008000'}); - } - params.contentmsg.show(); - } - } - return result; - } - function init_form(params){ - params.form.submit(function(){ - var flag = false; - if(params.form.attr('data-remote') != undefined ){ - flag = true - } - var is_checked = nh_check_field({ - issubmit:true, - content:params.editor, - contentmsg:params.contentmsg, - textarea:params.textarea - }); - if(is_checked){ - if(flag){ - return true; - }else{ - $(this)[0].submit(); - return false; - } - } - return false; - }); - } - function nh_reset_form(params){ - params.form[0].reset(); - params.textarea.empty(); - if(params.editor != undefined){ - params.editor.html(params.textarea.html()); - } - params.contentmsg.hide(); - } - - KindEditor.ready(function(K){ - $("a[nhname='reply_btn']").live('click',function(){ - var params = {}; - params.kindutil = K; - params.container = $(this).parent().parent('div'); - params.div_form = $("div[nhname='div_form']",params.container); - params.form = $("form",params.div_form); - params.textarea = $("textarea[name='user_notes']",params.div_form); - params.textarea.prev('div').css("height","60px"); - params.contentmsg = $("p[nhname='contentmsg']",params.div_form); - params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); - params.cancel_btn = $("a[nhname='cancel_btn']",params.div_form); - params.submit_btn = $("a[nhname='submit_btn']",params.div_form); - if(params.textarea.data('init') == undefined){ - params.editor = init_editor(params); - init_form(params); - params.cancel_btn.click(function(){ - nh_reset_form(params); - toggleAndSettingWordsVal(params.div_form, params.textarea); - }); - params.submit_btn.click(function(){ - params.form.submit(); - }); - params.textarea.data('init',1); - } - params.cancel_btn.click(); - setTimeout(function(){ - if(!params.div_form.is(':hidden')){ - params.textarea.show(); - params.textarea.focus(); - params.textarea.hide(); - } - },300); - }); - - $("a[nhname='sub_reply_btn']").live('click',function(){ - var params = {}; - params.kindutil = K; - params.container = $(this).parent().parent('div'); - params.div_form = $("div[nhname='sub_div_form']",params.container); - params.form = $("form",params.div_form); - params.textarea = $("textarea[name='user_notes']",params.div_form); - params.textarea.prev('div').css("height","60px"); - params.contentmsg = $("p[nhname='sub_contentmsg']",params.div_form); - params.toolbar_container = $("div[nhname='sub_toolbar_container']",params.div_form); - params.cancel_btn = $("a[nhname='sub_cancel_btn']",params.div_form); - params.submit_btn = $("a[nhname='sub_submit_btn']",params.div_form); - if(params.textarea.data('init') == undefined){ - params.editor = init_editor(params); - init_form(params); - params.cancel_btn.click(function(){ - nh_reset_form(params); - toggleAndSettingWordsVal(params.div_form, params.textarea); - }); - params.submit_btn.click(function(){ - params.form.submit(); - }); - params.textarea.data('init',1); - } - params.cancel_btn.click(); - setTimeout(function(){ - if(!params.div_form.is(':hidden')){ - params.textarea.show(); - params.textarea.focus(); - params.textarea.hide(); - } - },300); - }); - - $("div[nhname='new_message']").each(function(){ - var params = {}; - params.kindutil = K; - params.div_form = $(this); - params.form = $("form",params.div_form); - if(params.form==undefined || params.form.length==0){ - return; - } - params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form); - params.contentmsg = $("p[nhname='contentmsg']",params.div_form); - params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form); - params.cancel_btn = $("#new_message_cancel_btn"); - params.submit_btn = $("#new_message_submit_btn"); - - if(params.textarea.data('init') == undefined){ - params.editor = init_editor(params); - init_form(params); - params.cancel_btn.click(function(){ - nh_reset_form(params); - }); - params.submit_btn.click(function(){ - params.form.submit(); - }); - params.textarea.data('init',1); - $(this).show(); - } - }); - }); -}); -function init_list_more_div(params){ - var p=params; - p.exbtn.click(function(){ - var isclose = p.container.data('isclose'); - var hasmore = p.container.data('hasmore'); - if(isclose == '1'){ - $("div[nhname='rec']",p.container).show(); - p.container.data('isclose','0'); - change_status_4_list_more_div(params); - return; - } - if(hasmore == '0'){ - change_status_4_list_more_div(params,'get'); - return; - } - var url = p.container.data('url'); - if($("div[nhname='rec']",p.container).length > 0){ - var lastid = $("div[nhname='rec']",p.container).filter(':last').data('id'); - url += "?lastid="+lastid; - var lasttime = $("div[nhname='rec']",p.container).filter(':last').data('time'); - if(lasttime != undefined){ - url += "&lasttime="+lasttime; - } - } - $.ajax( {url:url,dataType:'text',success:function(data){ - var html = $("
"+data+"
"); - var lens = $("div[nhname='rec']",html).length; - if(lens < p.size){ - p.container.data('hasmore','0'); - } - if(lens>0){ - var currpage = parseInt(p.container.data('currpage'))+1; - p.container.data('currpage',currpage); - p.container.append(html.html()) - } - change_status_4_list_more_div(params,'get'); - p.div.show(); - }} ); - }); - p.clbtn.click(function(){ - var i=0; - $("div[nhname='rec']",p.container).each(function(){ - i++; - if(i> p.size){ - $(this).hide(); - } - }); - p.container.data('isclose','1'); - change_status_4_list_more_div(params); - }); - p.exbtn.click(); -} -function change_status_4_list_more_div(params,opt){ - var p=params; - if($("div[nhname='rec']",p.container).length == 0 && opt != 'get'){ - p.exbtn.click(); - return; - } - var show_lens = $("div[nhname='rec']",p.container).length - $("div[nhname='rec']",p.container).filter(':hidden').length; - if( show_lens > p.size ){ - p.clbtn.show(); - }else{ - p.clbtn.hide(); - } - if($("div[nhname='rec']",p.container).length == 0){ - p.exbtn.html(p.nodatamsg); - }else if( p.container.data('hasmore') == '1' || p.container.data('isclose')=='1' ){ - p.exbtn.html('点击展开更多'); - }else{ - p.exbtn.html('没有更多了'); - } -} -function init_list_more_div_params(div){ - var params = {}; - params.div = div; - params.container = $("div[nhname='container']",div); - params.exbtn = $("a[nhname='expand']",div); - params.clbtn = $("a[nhname='close']",div); - params.size = params.container.data('pagesize'); - params.nodatamsg = params.container.data('nodatamsg'); - if( params.size == undefined ){ - params.size = 13; - } - return params; -} -$(function(){ - $("div[nhname='list_more_div']").each(function(){ - var params = init_list_more_div_params($(this)); - init_list_more_div(params) - }); + $("#RSide").css("min-height",$("#LSide").height()-40).css("padding","10px"); }); $(function(){ diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css index 17057eabb..9bcfc4dc0 100644 --- a/public/stylesheets/new_public.css +++ b/public/stylesheets/new_public.css @@ -10,6 +10,8 @@ a:hover,a:active{color:#000;} /*常用*/ .hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +.none{display: none;} +.rside_back{ width:670px; margin-left:10px; background:#fff; margin-bottom:10px;} .break_word{ word-break:break-all; word-wrap: break-word;} select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; } .sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #707070; color:#000; border-radius:3px; padding:1px 10px; background:#dbdbdb;} @@ -281,10 +283,6 @@ a.topnav_login_box:hover {color:#a1ebff;} a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;} a:hover.search_btn{ background: #0fa9bb;} .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; } -/*主类容左右分栏*/ -#LSide{ width:240px; } -#RSide{ width:730px; margin-left:10px; background:#fff; padding:10px; margin-bottom:10px;} - /*资源库*/ .resources {width:730px; background-color:#ffffff; padding:10px;} @@ -511,7 +509,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;} .postAttSize {color:#888888; font-size:12px;} a.postGrey {color:#484848;} a.postGrey:hover {color:#000000;} -a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;} +a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;margin-top: 2px;margin-right: 15px;} a:hover.gz_btn{ color:#ff5722;}