jasder
/
trustieforge
forked from jacknudt/trustieforge
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

add link in project/course list page, joinBUtton renamed.

This commit is contained in:
yanxd 2013-10-15 14:46:20 +08:00
parent e1d8c8a992
commit ec63fc41bb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -250,13 +250,13 @@ module ApplicationHelper
s << h(block_given? ? yield(project) : project.name) s << h(block_given? ? yield(project) : project.name)
unless User.current.member_of?(@project) unless User.current.member_of?(@project)
s << "<span style = 'float: right;'>" s << "<span style = 'float: right;'>"
s << watcher_link(@project, User.current) s << watcher_link(@project, User.current)#, ['whiteButton'])
s << "</span>" s << "</span>"
end end
if @project.project_type == 1 if @project.project_type == 1
unless Course.find_by_extra(@project.identifier).tea_id == User.current.id unless Course.find_by_extra(@project.identifier).tea_id == User.current.id
s << "<span style = 'float: right;'>" s << "<span style = 'float: right;'>"
s << join_in_course(@project, User.current) s << join_in_course(@project, User.current)#, ['whiteButton'])
s << "</span>" s << "</span>"
end end
end end

6
app/views/projects/_project.html.erb
View File

@ -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', @project.watcher_users.count, :class => "info") %><%= content_tag('span', l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
</p --> </p -->
<p class="stats"> <p class="stats">
<%= 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)) %>
</p> </p>
<p class="stats"> <p class="stats">
<%= 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)) %>
</p> </p>
<p class="stats"> <p class="stats">
<% files_count = @project.attachments.count %> <% files_count = @project.attachments.count %>
<% @project.versions.each do |version| %> <% @project.versions.each do |version| %>
<% files_count += version.attachments.count %> <% files_count += version.attachments.count %>
<% end %> <% 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)) %>
</p> </p>
</div> </div>

6
public/stylesheets/nyan_css.css
View File

@ -1,5 +1,5 @@
/*add by nyan*/ /*add by nyan*/
.joinButton { .whiteButton {
-moz-box-shadow:inset 0px 1px 0px 0px #ffffff; -moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
-webkit-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; 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:-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%); background:-moz-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
@ -44,7 +44,7 @@
background-color:#f6f6f6; background-color:#f6f6f6;
} }
.joinButton:active { .whiteButton:active {
position:relative; position:relative;
top:1px; top:1px;
} }