diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index aa0093cf1..7f027009a 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -344,7 +344,7 @@ module WatchersHelper def exit_project_link(project) link_to(l(:label_exit_project),exit_cur_project_path(project.id), :remote => true, :confirm => l(:lable_sure_exit_project), - :class => "pr_join_a_quit" ) + :class => "sy_btn_grey mr5" ) end #项目关注、取消关注 diff --git a/app/views/layouts/_base_project_top.html.erb b/app/views/layouts/_base_project_top.html.erb index ee5f952d5..820a004de 100644 --- a/app/views/layouts/_base_project_top.html.erb +++ b/app/views/layouts/_base_project_top.html.erb @@ -20,18 +20,16 @@ <%= @project.name %> <%= @project.is_public? ? l(:label_public) : l(:label_private) %> -

项目评分: <% if @project.project_type == 0 %> <% unless static_project_score(@project.project_score) == 0 %> - <%= l(:label_project_score)%> : <%= link_to(format("%.2f" ,static_project_score(@project.project_score)).to_i, - {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, - :id => @project.id}, :class => "sy_cblue" ) %> + {:controller => 'projects', + :action => 'show_projects_score', + :remote => true, + :id => @project.id}, :class => "sy_cblue" ) %> <% end %> <% end %> @@ -39,10 +37,8 @@ <%= l(:label_user_watcher) %>: <%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'sy_corange' %> <%= l(:label_member) %>: <%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'sy_corange', :id => 'project_members_number' %>

-
- <% text = @project.project_new_type == 1 ? l(:label_development_team) : (@project.project_new_type == 2 ? l(:label_research_group) : l(:label_friend_organization))%> - <% typeclass = @project.project_new_type == 1 ? "pr_kafa" : (@project.project_new_type == 2 ? "pr_keyan" : "pr_friend")%> - <%= render 'layouts/join_exit_project',{:text => text, :typeclass => typeclass} %> +
+ <%= render 'layouts/join_exit_project' %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 385d936f2..969db6961 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -48,81 +48,17 @@
<%= render :partial => 'layouts/base_project_top' %> -
-
- -
- <%= l(:label_project_ivite_code)%> - <%= (User.current.member_of?(@project) || User.current.admin?) ? @project.invite_code : "******" %> -
- -
- <%= render 'layouts/join_exit_project' %> -
- -
-
- <%= link_to "#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %> - <% if @project.is_public? %> - <%= l(:label_public)%> - <% else %> - <%= l(:label_private)%> - <% end %> -
-
- <%# 更新访问数,刷新的时候更新访问次数 %> - <% update_visiti_count @project %> - <%# over %> -
- <% if @project.project_type == 0 %> - <% unless static_project_score(@project.project_score) == 0 %> - <%= l(:label_project_score)%> : - <%= link_to(format("%.2f" ,static_project_score(@project.project_score)).to_i, - {:controller => 'projects', - :action => 'show_projects_score', - :remote => true, - :id => @project.id}, :class => "c_orange f14" ) %> - <% end %> - <% end %> -
- - -
- <%= l(:label_member) %>(<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue', :id => 'project_members_number' %>) - - <%= l(:label_user_watcher) %>(<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue' %>) - <% unless @project.enabled_modules.where("name = 'files'").empty? %> - - <%= l(:project_module_attachments) %>( - <% @project.project_score.attach_num %> - <%= link_to "#{@project.project_score.attach_num }", project_files_path(@project), :class => 'info_foot_num c_blue', :id=>'project_files_count_info' %>) - <% end %> -
-
-
- + <%# 更新访问数,刷新的时候更新访问次数 %> + <% update_visiti_count @project %> - +
-
@@ -149,7 +85,6 @@
-
访问计数 <%= @project.visits.to_i %> (自2016年5月)
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index 5fc47ad81..5b05a1d94 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -375,6 +375,7 @@ ul.subNavArrow:hover li ul {display:block;} /*左侧导航*/ .subNavBox{width:240px; background:#fff;margin:10px 10px 0 0;} +.subNavBoxProject{width:240px; background:#fff;} .subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6; height:26px;padding-left:10px;background-color:#fff; padding-top:2px;} .subNav_jiantou{background:url(/images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} .subNav_jiantou:hover{color:#0781b4; }