Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality

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
     
     #项目关注、取消关注
@@ -361,8 +361,8 @@ module WatchersHelper
                        :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort))
       method = watched ? 'delete' : 'post'
       link_to text, url, :remote => true, :method => method,
-                         :class => "pr_join_a" ,:id=>id
-     end
+                         :class => "sy_btn_pink mr5" ,:id=>id
+    end
     
     # 申请加入项目
     def join_in_project_link(project, user, options=[])
@@ -372,9 +372,9 @@ module WatchersHelper
       method = 'post'
       @applied_flag = project.instance_of?(Project)
       if applied
-        link = "<a class ='pr_join_a'>#{text}</a>"
+        link = "<a class ='sy_btn_pink mr5'>#{text}</a>"
       else
-        link = link_to(text, url, :remote => true, :method => method, :id => "#{project.id}", :class => "pr_join_a")
+        link = link_to(text, url, :remote => true, :method => method, :id => "#{project.id}", :class => "sy_btn_pink mr5")
       end
       link.html_safe
       # if applied

app/models/project.rb

@@ -305,6 +305,11 @@ class Project < ActiveRecord::Base
     errors[:identifier].blank? && !(new_record? || identifier.blank?)
   end
 
+  # returns project's creater
+  def creater
+    User.find(self.user_id).try(:show_name)
+  end
+
   # returns latest created projects
   # non public projects will be returned only if user is a member of those
   def self.latest(user=nil, count=5)

app/views/layouts/_base_project_top.html.erb

@@ -0,0 +1,45 @@
+<div class="sy_class_infobox mb10 clear">
+  <div class="sy_class_logo fl">
+    <div class="pr" style="width: 110px; height:110px;">
+      <% if User.current.logged? && (User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project) || User.current.admin?) %>
+          <%=link_to image_tag(url_to_avatar(@project), width:"110", height: "110", :id => 'nh_source_tx'), my_clear_user_avatar_temp_path(:course => @project.id), :remote => true%>
+          <div class="homepageEditProfile undis">
+            <%=link_to '', my_clear_user_avatar_temp_path(:project => @project.id), :class => 'homepageEditProfileIcon', :title => '点击编辑头像', :remote => true %>
+          </div>
+      <% else %>
+          <%= image_tag(url_to_avatar(@project), :width => "110", :height => "110", :alt => "项目logo") %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="sy_class_id fl"><p><%= l(:label_project_ivite_code)%><br /><span class="sy_corange"><%= (User.current.member_of?(@project) || User.current.admin?) ? @project.invite_code : "******" %></span></p></div>
+  <div class="sy_class_info fl ml15">
+    <div  class="sy_class_titbox clear">
+      <h3 class="fl sy_class_title">
+        <a href="javascript:void(0);"class="mr5 c_dark"><%= @project.creater %></a>/
+        <a href="javascript:void(0);"class=" ml5 c_dark"><%= @project.name %></a>
+      </h3>
+      <span class="sy_new_orange fl ml10 mt5"><%= @project.is_public? ? l(:label_public) : l(:label_private) %></span>
+    </div>
+    <p class="sy_cgrey">
+      <span class=" mr15">项目评分：
+        <% if @project.project_type == 0 %>
+            <% unless static_project_score(@project.project_score) == 0 %>
+                <%= 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" ) %>
+            <% end %>
+        <% end %>
+      </span>
+      <span class=" mr15">浏览：<a class="sy_corange"><%= @project.visits.to_i %></a></span>
+      <span class=" mr15"><%= l(:label_user_watcher) %>: <%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'sy_corange'  %></span>
+      <span class=" mr15"><%= l(:label_member) %>: <%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'sy_corange', :id => 'project_members_number' %></span>
+    </p>
+    <div class="mt15 clear" id="join_exit_project_div">
+      <%= render 'layouts/join_exit_project' %>
+    </div>
+  </div>
+  <div class="cl"></div>
+</div>

app/views/layouts/_join_exit_project.html.erb

@@ -1,19 +1,18 @@
-<div class="pr_info_join fl">
+
    <!--关注:非项目成员-->
-  <div id="join_in_project_applied">
-    <%= render :partial => "projects/applied_status" %>
-  </div>
+  <%= render :partial => "projects/applied_status" %>
+
   <!--配置项目-->
   <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)  %>
-      <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %>
+      <%= link_to "#{l(:button_configure)}", settings_project_path(@project), :class => "sy_btn_blue mr5" %>
   <% end %>
   <!--项目类型-->
-  <% if (User.current.login? && User.current.member_of?(@project) && Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager")) || User.current.admin? %>
-      <%= link_to "<span class='#{typeclass}'></span>#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%>
-  <% end %>
+  <!--<%# if (User.current.login? && User.current.member_of?(@project) && Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager")) || User.current.admin? %>-->
+      <!--<%#= link_to "<span class='#{typeclass}'></span>#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%>-->
+  <!--<%# end %>-->
   <!--退出项目-->
   <% if (User.current.member_of? @project) && User.current.login? && !User.current.admin &&
      !Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %>
       <%= exit_project_link(@project) %>
   <% end %>
-</div>
+

app/views/layouts/base_projects.html.erb

@@ -47,88 +47,18 @@
   <div class="cl"></div>
 
   <div id="content">
+    <%= render :partial => 'layouts/base_project_top' %>
     <div id="LSide" class="fl">
-      <div class="project_info">
-        <div class="pr_info_logo fl mr10 mb5">
-          <div class="pr" style="width: 64px; height:64px;">
-            <% if User.current.logged? && (User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project) || User.current.admin?)%>
-              <%=link_to image_tag(url_to_avatar(@project),width:"60", height: "60", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:project => @project.id), :remote => true%>
-              <div class="homepageEditProfile undis">
-                <%=link_to '', my_clear_user_avatar_temp_path(:project => @project.id), :remote => true, :class => 'homepageEditProfileIcon', :title => '点击编辑Logo' %>
-              </div>
-            <% else %>
-              <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60", :alt => "项目logo") %>
-            <% end %>
-          </div>
-        </div>
-        <div class="pr_info_id fl mb5 f14">
-          <%= l(:label_project_ivite_code)%>
-          <%= (User.current.member_of?(@project) || User.current.admin?) ? @project.invite_code : "******" %>
-        </div>
-        <!--关注、申请加入/退出项目-->
-        <div id="join_exit_project_div">
-          <% 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} %>
-        </div>
-        <!-- 项目得分 -->
-        <div class="cl"></div>
-        <div>
-          <%= link_to "#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %>
-          <% if @project.is_public? %>
-            <span class="img_private"><%= l(:label_public)%></span>
-          <% else %>
-            <span class="img_private"><%= l(:label_private)%></span>
-          <% end %>
-        </div>
-        <div class="cl"></div>
-        <%# 更新访问数,刷新的时候更新访问次数 %>
-        <%  update_visiti_count @project %>
-        <%# over %>
-        <div>
-          <% if @project.project_type == 0 %>
-            <% unless static_project_score(@project.project_score) == 0 %>
-              <span class="fb f14 "><%= l(:label_project_score)%> :</span>
-              <%= 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 %>
-        </div>
-
-        <!--参数-->
-        <div class="pr_info_foot">
-          <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue', :id => 'project_members_number' %>）
-          <span>|&nbsp;</span>
-          <%= 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? %>
-            <span>|&nbsp;</span>
-            <%= 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' %></span>）
-          <% end %>
-        </div>
-        <div class="cl"></div>
-      </div><!--参数 end-->
-
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @project %>
       <!--邀请加入-->
-      <div class="subNavBox">
+      <div class="subNavBoxProject">
         <div id="project_memu_list">
-          <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
-            <%= render :partial => 'projects/development_group', :locals => {:project => @project} %>
-          <% elsif @project.project_new_type == 2 %>
-            <%= render :partial => 'projects/research_team', :locals => {:project => @project} %>
-          <% else %>
-            <%= render :partial => 'projects/friend_group', :locals => {:project => @project} %>
-          <% end %>
+          <%= render :partial => 'projects/development_group', :locals => {:project => @project} %>
         </div>
-
-        <!-- end -->
-      </div><!--项目侧导航 end-->
+      </div>
+      <!--项目侧导航 end-->
       <div class="cl"></div>
-
       <!-- 项目描述 -->
       <div class="project_intro">
         <div id="course_description" class="course_description">
@@ -155,7 +85,6 @@
         </div>
         <div class="cl"></div>
       </div><!--项目标签 end-->
-
       <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %> （自2016年5月）</div>
     </div>
   </div>

app/views/projects/_applied_status.html.erb

@@ -4,6 +4,7 @@
     <% if AppliedProject.where(:user_id => User.current, :project_id => @project_id).first.nil? %>
         <%= join_in_project_link(@project, User.current) %>
     <% else %>
-        等待审批
+        <a class="sy_btn_blue mr5">等待审批</a>
     <% end %>
-<% end %>
+<% end %>
+

config/locales/projects/zh.yml

@@ -51,7 +51,7 @@ zh:
   label_project_ivite_code: "邀请码:"
 
   label_agree_join_project: 同意加入
-  label_apply_project: "+申请加入"
+  label_apply_project: "+加入"
   label_button_following: "+添加关注"
   label_exit_project: 退出项目
   label_apply_project_waiting: 已处理申请，请等待管理员审核

db/migrate/20160923024443_change_poroject_type.rb

@@ -0,0 +1,9 @@
+class ChangePorojectType < ActiveRecord::Migration
+  def up
+    projects = Project.where("project_new_type !=?", 1)
+    projects.update_all(:project_new_type => 1)
+  end
+
+  def down
+  end
+end

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;  }