diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b42f13035..e2ebfe36d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -250,13 +250,13 @@ module ApplicationHelper s << h(block_given? ? yield(project) : project.name) unless User.current.member_of?(@project) s << "" - s << watcher_link(@project, User.current) + s << watcher_link(@project, User.current)#, ['whiteButton']) s << "" end if @project.project_type == 1 unless Course.find_by_extra(@project.identifier).tea_id == User.current.id s << "" - s << join_in_course(@project, User.current) + s << join_in_course(@project, User.current)#, ['whiteButton']) s << "" end end diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index 3c9c88e0e..83c22fc74 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -44,17 +44,17 @@ <%= content_tag('span', @project.watcher_users.count, :class => "info") %><%= content_tag('span', l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
- <%= content_tag('span', link_to("#{@project.homeworks.count}", "\#"), :class => "info") %><%= content_tag('span', l(:label_x_task, :count => @project.homeworks.count)) %> + <%= content_tag('span', link_to("#{@project.homeworks.count}", homework_project_path(@project)), :class => "info") %><%= content_tag('span', l(:label_x_task, :count => @project.homeworks.count)) %>
- <%= content_tag('span', "#{@project.members.count}", :class => "info") %><%= content_tag('span', l(:label_x_member, :count => @project.members.count)) %> + <%= content_tag('span', link_to("#{@project.members.count}", member_project_path(@project)), :class => "info") %><%= content_tag('span', l(:label_x_member, :count => @project.members.count)) %>
<% files_count = @project.attachments.count %> <% @project.versions.each do |version| %> <% files_count += version.attachments.count %> <% end %> - <%= content_tag('span', files_count, :class => "info") %><%= content_tag('span', l(:label_x_data,:count => files_count)) %> + <%= content_tag('span', link_to(files_count, file_project_path(@project)), :class => "info") %><%= content_tag('span', l(:label_x_data,:count => files_count)) %>
diff --git a/public/stylesheets/nyan_css.css b/public/stylesheets/nyan_css.css index 3511d0727..2fcd1f8fd 100644 --- a/public/stylesheets/nyan_css.css +++ b/public/stylesheets/nyan_css.css @@ -1,5 +1,5 @@ /*add by nyan*/ -.joinButton { +.whiteButton { -moz-box-shadow:inset 0px 1px 0px 0px #ffffff; -webkit-box-shadow:inset 0px 1px 0px 0px #ffffff; @@ -32,7 +32,7 @@ text-shadow:0px 1px 0px #ffffff; } -.joinButton:hover { +.whiteButton:hover { background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #f6f6f6), color-stop(1, #ffffff)); background:-moz-linear-gradient(top, #f6f6f6 5%, #ffffff 100%); @@ -44,7 +44,7 @@ background-color:#f6f6f6; } -.joinButton:active { +.whiteButton:active { position:relative; top:1px; }