Merge branch 'dev_hjq' into szzh

app/helpers/repositories_helper.rb

@@ -236,13 +236,14 @@ module RepositoriesHelper
   # 判断项目是否有主版本库
   def judge_main_repository(pro)
     if pro.repositories.blank?
-      return false
+      status =  false
     else
-      pro.repositories.sort.each do |rep|
-        rep.is_default?
-        return true
+      pro.repositories.each do |rep|
+        status = true and break if rep.is_default?
+        status = false
       end
     end
+    status
   end
   # def cvs_field_tags(form, repository)
     # content_tag('p', form.text_field(

app/views/avatar/_avatar_form.html.erb

@@ -43,7 +43,7 @@
     	<div id="upload_progressbar" style="height:14px; margin-bottom: 10px;display: block"></div>
     </div>
 </span>
-<%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %>
+<%= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %>
   <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
   </a>

app/views/layouts/base_projects.html.erb

@@ -80,11 +80,13 @@
         <div class="cl"></div>
         <div>
           <% if @project.project_type == 0 %>
-            <span class="fb f14 "><%= l(:label_project_score)%> :</span>
-            <%= link_to(format("%.2f" ,project_scores(@project)  ).to_i, {:controller => 'projects',
-                                                                       :action => 'show_projects_score',
-                                                                       :remote => true,
-                                                                       :id => @project.id}, :class => "c_orange f14" ) %>
+            <% unless project_scores(@project) == 0 %>
+              <span class="fb f14 "><%= l(:label_project_score)%> :</span>
+              <%= link_to(format("%.2f" ,project_scores(@project)  ).to_i, {:controller => 'projects',
+                                                                         :action => 'show_projects_score',
+                                                                         :remote => true,
+                                                                         :id => @project.id}, :class => "c_orange f14" ) %>
+            <% end %>
           <% end %>
         </div>
 

app/views/welcome/index.html.erb

@@ -45,10 +45,10 @@
 			<% if @organization.nil? %>
 				<% unless @first_page.nil? %>
 					<!-- 改为国际化后无法通过后台配置
-						 <%= @first_page.description.html_safe %>
+						 <%#= @first_page.description.html_safe %>
 						 -->
-					<span class="font_welcome_trustie"><%= l(:label_welcome_trustie_project)%></span>,&nbsp;
-				    <span class="font_welcome_tdescription"><span class="font_welcome_tdescription"><%= l(:label_welcome_trustie_project_description)%></span></span>
+					<!--<span class="font_welcome_trustie"><%#= @first_page.title.html_safe %></span>,&nbsp;-->
+				    <span class="font_welcome_tdescription"><span class="font_welcome_tdescription"><%= @first_page.description.html_safe %></span></span>
 				<% end %>
 			<% else %>
                 <span class="font_welcome_school" style="color: #E8770D">

config/locales/projects/zh.yml

@@ -350,7 +350,7 @@ zh:
   label_input_email: 请输入邮箱地址
   
   label_invite_trustie_user: "邀请Trustie注册用户" 
-  label_invite_trustie_user_tips: "输入姓名、邮箱、昵称"
+  label_invite_trustie_user_tips: "支持姓名、邮箱、昵称搜索！"
   label_user_role_null: 用户和角色不能留空！
   label_invite_project: 邀请您加入项目
   label_mail_invite_success: 您已成功加入项目！