From 47c171dbf02052dd75ef9bf5f089e95a87b3a7ae Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 30 Jul 2015 10:54:25 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=80=81=E5=B8=88?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=9A=84=E2=80=9C=E5=8F=82?= =?UTF-8?q?=E5=8A=A0=E5=8C=BF=E8=AF=84=E2=80=9D=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E2=80=9C=E5=8F=82=E5=8A=A0=E5=8C=BF=E8=AF=84=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users_new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 683c7b0b5..670d03663 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -181,7 +181,7 @@ <% if (get_join_course_count(@user) != 0) %>
  • 加入课程 :
    • <% end %> - <% if @user.user_extensions.identity == 0 %> + <% if @user.user_extensions.identity == 1 %>
  • 参加匿评 :
    • <% end %> <% if (get_projectandcourse_attachment_count(@user) != 0) %> @@ -212,7 +212,7 @@ <% if (get_join_course_count(@user) != 0) %>
  • <%= get_join_course_count(@user) %>
    • <% end %> - <% if @user.user_extensions.identity == 0 %> + <% if @user.user_extensions.identity == 1 %>
  • <%= get_anonymous_evaluation_count(@user) %>
    • <% end %> <% if (get_projectandcourse_attachment_count(@user) != 0) %> From 6cb3d195842696b88347634c2ac8876aa27a7967 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 30 Jul 2015 11:10:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E6=95=B0=E4=B8=8E?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=B8=8D=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_course.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb index f2972df44..0b879f905 100644 --- a/app/views/courses/_course.html.erb +++ b/app/views/courses/_course.html.erb @@ -61,7 +61,7 @@

    - <%= content_tag('span', link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %> + <%= content_tag('span', link_to("#{course_activity_count @course}", course_path(@course)), :class => "info") %> <%= content_tag('span', l(:label_x_activity, :count => @course_activity_count[@course.id])) %>

    From dfa06ab069323c27a02f993654b7a2f16e015881 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 30 Jul 2015 11:13:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=88=9B=E5=BB=BA=E9=97=AE=E5=8D=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=88=90=E4=BA=86=E5=8F=91=E5=B8=83=E9=97=AE=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/users_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 8a49f8e2d..f68ae7f34 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -482,7 +482,7 @@ module UsersHelper when "Message" return ( activity.act.parent_id == nil || activity.act.parent_id == '' ) ? '发布了帖子' : '回复了帖子' when "Poll" - return '发布了问卷' + return '创建了问卷' else return '有了新动态' end From 31efdee69be207df1c29e58d1b07ea0a3270ba21 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 30 Jul 2015 14:27:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BA=BA=E7=9A=84=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3b1ee93c8..d959c763c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -26,6 +26,10 @@ <% end %>
    +<% else %> +
    + +
    <% end %>
    From 8340e9fe1b1a8947ea6d3c0e816fbdb9216473b6 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 31 Jul 2015 15:36:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users_new.html.erb | 11 +++++++++++ app/views/tags/_tag_name.html.erb | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 670d03663..3b3839c50 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -236,6 +236,17 @@
    + +
    +

    <%= l(:label_tag)%>:

    +
    +
    + <%= render :partial => 'tags/project_tag', :locals => {:obj => @user,:object_flag => "1"}%> +
    +
    +
    +
    + <%= render :partial => 'layouts/user_watch_list', :locals => {:user => @user} %> <%= render :partial => 'layouts/user_fans_list', :locals => {:user => @user} %> <% visitor_count,visitor_list = get_visitor_users(@user) %> diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index cb00ac8d7..7cd7bc02b 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -42,7 +42,7 @@ <% else %>
    - + <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> <% case object_flag %> From e17b83470694f71c32b4c06b3b99a855b1889bd1 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 31 Jul 2015 16:09:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=A4=B4=E5=83=8F=E7=9A=84=E5=8F=B3?= =?UTF-8?q?=E4=B8=8B=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_user_watch_btn.html.erb | 17 ++++++++++------- app/views/layouts/base_users_new.html.erb | 4 +--- public/stylesheets/users.css | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/views/layouts/_user_watch_btn.html.erb b/app/views/layouts/_user_watch_btn.html.erb index 234b81152..578319b68 100644 --- a/app/views/layouts/_user_watch_btn.html.erb +++ b/app/views/layouts/_user_watch_btn.html.erb @@ -1,8 +1,11 @@ -<% if(User.current.logged? && User.current!=target)%> - <%if(target.watched_by?(User.current))%> - 取消关注 - <% else %> - 关注 - <% end %> +<% if User.current.logged?%> + <% if User.current == target%> + 编辑资料 + <%else%> + <%if(target.watched_by?(User.current))%> + 取消关注 + <% else %> + 添加关注 + <% end %> + <% end%> <% end %> \ No newline at end of file diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 1f8e10bc9..33973b047 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -146,9 +146,7 @@ (<%=@user.projects.count%>)
    -
    - 编辑资料 -
    + <% else%>
    diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css index 649ce1255..9a809b7ce 100644 --- a/public/stylesheets/users.css +++ b/public/stylesheets/users.css @@ -97,7 +97,9 @@ a.select_btn_select{ background:#64bddb; color:#fff;} .w70{ width:70px;} .h200{ height:200px;} /* 个人主页*/ -a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:33px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;} +a.edit_btn{display:block; background:url(../images/leftside.png) -1px 0 no-repeat; width:33px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;} +a:hover.edit_btn{ color:#ff5722;} +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;} a:hover.gz_btn{ color:#ff5722;} a.qx_btn{display:block; background:url(../images/pic_uersall.png) -318px -47px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;} a:hover.qx_btn{color:#64bdd9;}