Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/trackers_controller.rb

@@ -38,12 +38,13 @@ class TrackersController < ApplicationController
     @tracker ||= Tracker.new(params[:tracker])
     @trackers = Tracker.sorted.all
     @projects = Project.where("project_type = #{Project::ProjectType_project}").all
-    @courses = Course.all
+    # 去掉原因，这块代码已经没有用到
-    @course_activity_count=Hash.new
+    # @courses = Course.all
-    @courses.each do |course|
+    # @course_activity_count=Hash.new
-      @course_activity_count[course.id]=0
+    # @courses.each do |course|
-    end
+    #   @course_activity_count[course.id]=0
-    @course_activity_count=get_course_activity @courses,@course_activity_count
+    # end
+    # @course_activity_count=get_course_activity @courses,@course_activity_count
   end
 
   def create

app/views/courses/_course.html.erb

@@ -58,14 +58,14 @@
 		<%= content_tag('span',  "#{garble @course.members.count}", :class => "info") %>
          <%= content_tag('span',  l(:label_x_member, :count => memberCount(@course))) %>
 	</p>
-	
+
 	<!--gcm-->
 	<p class="stats">
 		<%= content_tag('span',  link_to("#{@course_activity_count[@course.id]}", course_path(@course)), :class => "info") %>
 		<%= content_tag('span',  l(:label_x_activity, :count => @course_activity_count[@course.id])) %>
 	</p>
 	<!--gcm-->
-	
+
 	<div class="buttons_for_course" style="margin-top:30px;margin-left:144px">
 		<span class="info"></span>
       <% if(course_endTime_timeout? @course) %>

app/views/files/_project_file_list.html.erb

@@ -24,9 +24,9 @@
                 <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
 
                 <% if manage_allowed && file.container_id == project.id && file.container_type == "Project"  %>
-                <span id="is_public_<%= file.id %>">
+                    <span id="is_public_<%= file.id %>">
-                  <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
+                        <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
-                </span>
+                    </span>
                 <% else %>
                       <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
                 <% end %>

app/views/messages/_form_project.html.erb

@@ -25,7 +25,7 @@
 </li>
 <li>
   <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-  <label class="fl ml3" >&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+  <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <%= text_area :quote,:quote,:style => 'display:none' %>
   <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
   <div class="cl"></div>

app/views/repositories/show.html.erb

@@ -30,7 +30,7 @@
     </p>
   </div>
 </div>
-<div class="repos_more"><a id="showgithelp" value="hide_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">收起Git操作指南</a></div>
+<div class="repos_more"><a id="showgithelp" value="show_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">展开Git操作指南</a></div>
 <div id="repos_git_more">
   <br>
   <div class=" c_dark f14">

config/locales/projects/zh.yml

@@ -415,4 +415,4 @@ zh:
   #     
   field_sharing: 共享
   label_title_code_review: 代码评审
-  label_home_non_project: 您还没有创建项目，您可能对系统的其它项目感兴趣！
+  label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！

db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb

@@ -1,4 +1,4 @@
-class AddIndexToHomeworkattachCourseId < ActiveRecord::Migration
+class AddIndexToHomeworkforcourseCourseId < ActiveRecord::Migration
   def change
     add_index(:homework_for_courses,:course_id)
   end

public/javascripts/project.js

@@ -71,13 +71,35 @@ function showhelpAndScrollTo(id) {
     {
         cookiesave("repositories_visiable", true,'','','');
     }
+    var information = $("#showgithelp");
+    var val = information.attr("value");
+    if(val=="show_help")
+    {
+        $("#showgithelp").text("收起Git操作指南");
+        information.attr("value", "hide_help");
+    }
+    else
+    {
+        $("#showgithelp").text("展开Git操作指南");
+        information.attr("value", "show_help");
+    }
 }
 
+
+
 $(function(){
+    var information = $("#showgithelp");
+    var val = information.attr("value");
     if(cookieget("repositories_visiable") == "true")
     {
         $('#repos_git_more').hide();
     }
+    else
+    {
+        $('#repos_git_more').show();
+        $("#showgithelp").text("收起Git操作指南");
+        information.attr("value", "hide_help");
+    }
 });
 
 

public/stylesheets/project.css

@@ -76,7 +76,7 @@ a.problem_name{ color:#ff5722; }
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a.problem_tit02{ color:#0781b4;  font-weight:bold;max-width:400px;}
-.problem_tit_div{ color:#0781b4;  font-weight:bold;width:400px; }
+.problem_tit_div{ color:#0781b4;  font-weight:bold;max-width:400px; }
 a.problem_tit_a{ color:#0781b4;   }
 .problem_tit_a:hover{ color:#09658c;   }
 a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; }
@@ -180,6 +180,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col
 /* 版本库展示Git操作文档 */
 .repos_more{height:23px; width:100%; border:1px solid #CCC; background:#F6F6F6; text-align:center; font-size:12px; padding-top:2px;}
 .lh23{line-height: 23px;}
+.repos_git_more{display: none;}
 
 /* 弹框 新样式还没设计出来，暂时用的课程那边的样式 */
 .alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;}