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

app/views/attachments/_form_project.html.erb

@@ -1,4 +1,4 @@
-<span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
@@ -38,12 +38,12 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
   <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-  <%= button_tag "文件浏览", :type=>"button", :onclick=>"file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+  <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
   <%= file_field_tag 'attachments[dummy][file]',
-                     :id => "file#{container.id}",
+                     :id => '_file',
                      :class => 'file_selector',
                      :multiple => true,
-                     :onchange => "addInputFiles_board(this, '#{container.id}');",
+                     :onchange => 'addInputFiles(this);',
                      :style => 'display:none',
                      :data => {
                              :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
@@ -56,7 +56,7 @@
                              :file_count => l(:label_file_count),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
-  <span id="upload_file_count<%=container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+  <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 

app/views/boards/_course_show.html.erb

@@ -58,18 +58,23 @@
 
               <div class="cl"></div>
 
-              <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
+              <script>
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+              </script>
+              <div  class="project_board_content break_word" id="content_<%=topic.id%>">
+                <div id="contentmessage<%=topic.id %>" class="upload_img">
                   <%= topic.content %>
-              </p>
+                </div>
-              <% if topic.content.size > 300 %>
+              </div>
-                  <p>
+
-                    <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+
+              <p style="display: none" id="project_show_<%= topic.id%>">
+                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
               </p>
-              <% end %>
               <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>

app/views/boards/_project_show.html.erb

@@ -32,6 +32,7 @@
   <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
 <% if @topics.any? %>
       		<% @topics.each do |topic| %>
+
           <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
@@ -57,19 +58,24 @@
                   <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
               <% end %>
               <div class="cl"></div>
-
+              <script>
-               <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
+                  $(function(){if($("#contentmessage<%=topic.id %>").height()>55){$("#project_show_<%= topic.id%>").show();}});
+              </script>
+              <div  class="project_board_content break_word" id="content_<%=topic.id%>">
+                <div id="contentmessage<%=topic.id %>" class="upload_img">
                   <%= topic.content %>
-               </p>
+                </div>
-              <% if topic.content.size > 300 %>
+              </div>
-              <p>
+
-                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
+
+              <p style="display: none" id="project_show_<%= topic.id%>">
+                <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
                 </span>
 
               </p>
-               <% end %>
+
             <%= link_to_attachments_course topic, :author => false %>
 
               <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
@@ -177,6 +183,7 @@
                <% end %>
            <% end %>
         </div>
+
        <% end %>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>

app/views/boards/show.html.erb

@@ -24,7 +24,14 @@
 
 <script type="text/javascript">//侧导航
 
-
+window.onload = function () {
+    $("p[aa='bb']").each(function() {
+        alert((this.offsetHeight == '55'));
+        if(this.offsetHeight == '55') {
+            this.next.style.dispaly="block";
+        }
+    })
+}
 
 function show_newtalk()
 {

app/views/files/_project_file_list.html.erb

@@ -22,14 +22,14 @@
           <% if User.current.logged? %>
               <!--私有项目资源部能引用，不能设置公开私有-->
               <!--公开项目资源可以应用，管理员和资源上传者拥有设置公开私有权限-->
-              <% if project.is_public? %>
+              <%# if project.is_public? %>
                 <%= 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 (Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") || file.author_id == User.current.id) && project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project" %>
                     <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  %>
                     </span>
                 <% end %>
-              <% end %>
+              <%# end %>
           <% end %>
         </div>
         <div class="cl"></div>

app/views/layouts/_base_development_group.html.erb

@@ -39,13 +39,21 @@
       </div>
   <% end %>
   <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
-  <% unless @project.hidden_repo || @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
+  <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
+    <% if @project.hidden_repo || !@project.is_public? %>
+        <% if User.current.member_of?(@project) %>
             <div class="subNav">
                 <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
                 <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
             </div>
-  <% end %><!--meny end -->
+        <% end %>
-
+    <% else %>
+         <div class="subNav">
+            <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+            <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
+         </div>
+    <% end %>
+  <% end %>
   <!-- more -->
   <div class="subNav subNav_jiantou" onclick="$('#navContent').toggle(500);" id="expand_tools_expand"><%= l(:label_project_more) %></div>
   <ul class="navContent" id="navContent">

app/views/projects/settings/_new_repositories.html.erb

@@ -75,7 +75,7 @@
     <% unless judge_main_repository(@project) %>
         <li>
             <label class="label02"><%=l(:field_repository_is_default)%>：</label>
-            <%= f.check_box :is_default, :label => "" %></p>
+            <%= f.check_box :is_default, :label => "", :no_label => true %></p>
         </li>
     <% end %>
     <li >

app/views/projects/show.html.erb

@@ -40,7 +40,7 @@
               </div>
               <div class="cl"></div>
             </div>
-        <!--jou留言-->
+        <!--缺陷 jou留言 -->
         <% elsif e.forge_act_type == "Journal" %>
             <div class="problem_main">
               <a  class="problem_pic fl"><%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %></a>

app/views/projects/show_new.html.erb

@@ -44,12 +44,7 @@
           <% for tracker in @trackers %>
               <li><%= link_to h(tracker.name), project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>:
                 <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
-                                                    :total => @total_issues_by_tracker[tr 
+                      :total => @total_issues_by_tracker[tracker].to_i) %>
-          	<li><%= l(:default_tracker_bug) %></li>
-          <% end %>
-          <% if tracker.[4]%>
-          	<li><%= l(:default_tracker_mission) %></li>
-            <% end %>
               </li>
           <% end %>
         </ul>
@@ -95,7 +90,7 @@
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+    <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
 <% html_title(l(:label_overview)) -%>

public/stylesheets/jstoolbar.css

@@ -3,6 +3,7 @@
 }
 .jstEditor textarea, .jstEditor iframe {
     margin: 0;
+    margin-left: 80px;
 }
 
 .jstHandle {

public/stylesheets/leftside.css

@@ -45,6 +45,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 /*简介*/
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
+.project_board_content{overflow: hidden;max-height: 55px;word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
 .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}