From 5e25b64004c65da508087aa982d673dbcc55c964 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Sat, 29 Aug 2015 14:08:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 8 ++++---- app/views/users/_course_create.html.erb | 4 ++-- app/views/users/_course_homework.html.erb | 4 ++-- app/views/users/_course_journalsformessage.html.erb | 4 ++-- app/views/users/_project_attachment.html.erb | 4 ++-- app/views/users/_project_create.html.erb | 4 ++-- app/views/users/_project_document.html.erb | 4 ++-- app/views/users/_project_journal.html.erb | 4 ++-- app/views/users/_project_news.html.erb | 4 ++-- app/views/users/show_chen.erb | 8 ++++---- public/stylesheets/new_user.css | 4 ++-- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 7b7f4a536..fc3582c40 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -31,7 +31,7 @@
- <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %> + <%= image_tag(url_to_avatar(@user),width:"90", height: "90", :id=>'nh_user_tx') %> <% if User.current.logged?%> <% if is_current_user%>
@@ -46,15 +46,15 @@ <% end %> <% end%>
-
-
+ <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %> <% end %>
-

教授

+

教授

<%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") if is_current_user%> diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb index 19a5d89d2..b86f55385 100644 --- a/app/views/users/_course_create.html.erb +++ b/app/views/users/_course_create.html.erb @@ -1,11 +1,11 @@
-
+
用户头像
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）
提交（10）
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 88a00e8ab..10bbe4bdf 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -4,7 +4,7 @@ <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
-
+
<% if activity.try(:user).try(:realname) == ' ' %> <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %> <% else %> @@ -12,7 +12,7 @@ <% end %> TO <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
-
+
<%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb index a72eac345..90d5d05ee 100644 --- a/app/views/users/_course_journalsformessage.html.erb +++ b/app/views/users/_course_journalsformessage.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（留言）
提交（10）
diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index 54a7b3c17..13e6df408 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）
提交（10）
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb index 1d6943be1..b2487c444 100644 --- a/app/views/users/_project_create.html.erb +++ b/app/views/users/_project_create.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目创建）
提交（10）
diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb index 6e58552de..4f5d986d7 100644 --- a/app/views/users/_project_document.html.erb +++ b/app/views/users/_project_document.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（文档名称）
提交（10）
diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb index 7833d8675..3c1f8c61d 100644 --- a/app/views/users/_project_journal.html.erb +++ b/app/views/users/_project_journal.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目日志）
提交（10）
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb index ea39cbae5..9e4dfaf24 100644 --- a/app/views/users/_project_news.html.erb +++ b/app/views/users/_project_news.html.erb @@ -3,9 +3,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目新闻）
提交（10）
diff --git a/app/views/users/show_chen.erb b/app/views/users/show_chen.erb index 74b303fad..950350202 100644 --- a/app/views/users/show_chen.erb +++ b/app/views/users/show_chen.erb @@ -29,9 +29,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）
提交（10）
@@ -58,9 +58,9 @@
用户头像
-
尹教授 TO +
尹教授 TO 分布式计算环境(课程名称)
-
+
ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）
提交（10）
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index a56087017..e432a8f48 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -496,13 +496,13 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;} .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;} .homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;} -.homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;} +.homepagePortraitImage {width:90px; height:90px; position:relative; border:1px solid #cbcbcb; padding: 2px;} .homepagePortraitImage:hover {border:1px solid #269ac9;} .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} .homepageEditProfile {width:16px; height:16px; border-radius:2px; background-color:#888888; position:absolute; right:5px; bottom:5px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;} .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -14px -37px no-repeat; width:20px; height:20px; display:block;} -.homepageImageName {font-size:16px; color:#484848; margin-right:5px; height:25px; float:left; font-weight: bold; max-width:78px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;} +.homepageImageName {font-size:16px; color:#484848; height:25px; float:left; font-weight: bold; max-width:78px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;} .homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;} a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px;} From 886a00e18dc4a7e95fb4b0b076c57e26700c6701 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Sat, 29 Aug 2015 14:22:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?footer=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/header.css | 2 +- public/stylesheets/new_user.css | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 2ba6f0bbf..6b7aa209e 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -97,7 +97,7 @@ a.topnav_login_box:hover {color:#a1ebff;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} -.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px;} +.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;} .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} .departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;} .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 3f3af2785..4933e1c18 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -488,7 +488,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px no-repeat; width:30px; height:35px; display:block;} .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;} .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;} -.portraitRadius {border-radius: 5px;} +.portraitRadius {border-radius: 3px;} .homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;} .homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;} .navHomepageProfile ul li ul {display:none;} @@ -610,7 +610,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;} .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} -.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;} +.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9; height:30px; line-height:30px; vertical-align:middle;} .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;} .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;} .postAttSize {color:#888888; font-size:12px;} @@ -702,7 +702,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} -.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; } +.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; } .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;} .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;} .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;} From b30a07d651949651343856d2cc6a0d556f483b97 Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 29 Aug 2015 14:27:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_message.html.erb | 2 +- app/views/users/_course_news.html.erb | 2 +- app/views/users/_project_message.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index ff7e43105..f8b5c70a1 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -96,7 +96,7 @@ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_date(reply.created_on) %> - <%= link_to( + <%#= link_to( l(:button_delete), {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, :method => :post, diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 603901ae4..15fc74386 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -79,7 +79,7 @@ <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_date(comment.created_on) %> - <%= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, + <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment}, :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index e60676ac6..89f149303 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -93,7 +93,7 @@ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_date(reply.created_on) %> - <%= link_to( + <%#= link_to( l(:button_delete), {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, :method => :post, From 0d8624a642e6400855e8cf162f27d5a23554c033 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Sat, 29 Aug 2015 14:43:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4933e1c18..2fa219423 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -456,7 +456,7 @@ input.sendSourceText:hover {background-color:#297fb8;} .popbox{/* width:300px; *//* height:100px; */position:fixed !important;/* z-index:100; */left:50%;top:50%;margin:-100px 0 0 -150px; /* background:#fff; */ -moz-border-radius:5px; /* -webkit-border-radius:5px; */ /* border-radius:5px; */ /* box-shadow:0px 0px 8px #194a81; */ /* overflow:auto; */} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} -.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;} +.uploadText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block;} .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;} .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;} .uploadBox:hover {background-color:#297fb8;} @@ -538,7 +538,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;} .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;} .homepageNewsPortrait {width:40px; display:block; margin-top:7px;} -.homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; } +.homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; } .homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;} .homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;} .homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } @@ -589,7 +589,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostReplyInputContainer {width:670px; margin:0px auto;} .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;} .homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;} -.homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#15bccf;} +.homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#269ac9;} .homepagePostReplySubmit:hover {background-color:#329cbd;} a.postReplySubmit {color:#ffffff; display:block;} .homepagePostReplyCancel {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#888888; background-color:#cecece; margin-left:8px;} @@ -604,7 +604,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} -a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;} +a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:60px;} .homepagePostReplyDes {float:left; width:595px; margin-left:15px;} .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;} @@ -865,7 +865,8 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666; text-align:center;} .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;} .mr15{ margin-right:15px;} -.uppic_btn{background: #64bdd9;color: #fff;width: 80px;height: 25px;margin-top: 105px;} +.uppic_btn{background: #64bdd9;color: #fff; padding:2px 10px; cursor:pointer; margin-top: 105px; outline: none; border: none;} +.uppic_btn:hover {background-color: #329cbd;} /*20150820课程作业 LB*/ .HomeWork {width:708px; background-color:#ffffff; padding:10px 20px 20px 20px; border:1px solid #dddddd;} From 250d7a48dc9bd678be42b4441ca2cc8932aececa Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 29 Aug 2015 14:49:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 4af2b8165..91a35e711 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -55,4 +55,4 @@
-<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => @page} %> \ No newline at end of file +<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %> \ No newline at end of file