From 41ee4b838d67bd03e6c414e91db3d4c779546aab Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 9 Oct 2017 14:15:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=A4=B4=E5=83=8F=E5=BA=94=E8=AF=A5=E4=B8=BA?= =?UTF-8?q?=E5=9C=86=E5=BD=A2=20=E5=B9=B3=E5=8F=B0=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E9=80=89=E6=8B=A9=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=97=B6=E5=8E=BB=E6=8E=89=E5=BC=B9=E6=A1=86=E5=8F=B3?= =?UTF-8?q?=E4=B8=8A=E8=A7=92=E7=9A=84=E5=8F=89=E5=8F=89=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users/_user_journalsformessage.html.erb | 2 +- public/javascripts/edu/application.js | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb index 448069e02..f0315ed8a 100644 --- a/app/views/users/_user_journalsformessage.html.erb +++ b/app/views/users/_user_journalsformessage.html.erb @@ -1,7 +1,7 @@
- <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user), :alt => "用户头像" %> + <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50",:class => "bor-radius-all"), user_path(activity.user), :alt => "用户头像" %> <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js index fb7f18587..628fbe723 100644 --- a/public/javascripts/edu/application.js +++ b/public/javascripts/edu/application.js @@ -319,16 +319,18 @@ function delete_confirm_box_4(url, str){ } //提示框：只有一个按钮，点击关闭弹框 +// function notice_sure_box(str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '知道啦
'; pop_box_new(htmlvalue, 480, 140); } //提示框：只有一个确定按钮，点击关闭弹框 +// function notice_box(str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '确定
'; pop_box_new(htmlvalue, 480, 140); @@ -336,48 +338,54 @@ function notice_box(str){ // 长提示框：只有一个确定按钮，点击关闭弹框 +// function long_notice_box(str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '确定
'; pop_box_new(htmlvalue, 575, 140); } // 长提示框：只有一个“知道啦”按钮，点击关闭弹框 +// function yes_notice_box(str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '知道啦
'; pop_box_new(htmlvalue, 575, 200); } //提示框：只有一个知道啦按钮，点击打开新窗口 +// function sure_box_redirect(url, str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '知道啦
'; pop_box_new(htmlvalue, 480, 140); } //提示框：只有一个知道啦按钮，点击打开新窗口 +// function sure_box_redirect_without_newtab(url, str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '知道啦
'; pop_box_new(htmlvalue, 480, 140); } //提示框：只有一个确定按钮，点击跳转 +// function notice_box_redirect(url, str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '确定
'; pop_box_new(htmlvalue, 480, 140); } //提示框：只有一个确定按钮，点击跳转（局部刷新） +// function notice_box_redirect_remote(url, str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '

提示

'+ '

' + str + '

'+ '确定
'; pop_box_new(htmlvalue, 480, 140);