Merge branch 'develop' into szzh

app/controllers/avatar_controller.rb

@@ -10,7 +10,7 @@ class AvatarController < ApplicationController
     unless request.content_type == 'application/octet-stream'
       @source_type = params[:source_type]
       @source_id = params[:source_id]
-      @temp_file = params[:avatar][:image] 
+      @temp_file = params[:avatar][:image]
       @image_file = @temp_file.original_filename
     else
       unless request.raw_post.nil?
@@ -23,7 +23,7 @@ class AvatarController < ApplicationController
             #image_file.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
           else
             @image_file=params[:filename]
-          end      
+          end
           @temp_file = StringIO.new(@temp_file)
         end
       end

app/controllers/files_controller.rb

@@ -230,6 +230,7 @@ class FilesController < ApplicationController
     @order = ""
     @is_remote = false
     if params[:project_id]
+      @page = params[:page] ? params[:page].to_i + 1 : 2
       @container_type = 0
       if params[:sort]
         params[:sort].split(",").each do |sort_type|

app/controllers/issues_controller.rb

@@ -412,6 +412,7 @@ class IssuesController < ApplicationController
       if params[:issue_id]
         @issue_id = params[:issue_id]
       end
+      @priorities = IssuePriority.active
       respond_to do |format|
         format.js
       end

app/helpers/application_helper.rb

@@ -59,6 +59,19 @@ module ApplicationHelper
     end
   end
 
+  # 判断组织左侧展开或者隐藏
+  def is_hide_org_left obj
+    if obj.nil?
+      return true
+    else
+      if obj.hide == 0
+        return true
+      else
+        return false
+      end
+    end
+  end
+
   # Time 2015-03-24 16:38:05
   # Author lizanle
   # Description after save后需要进行资源记录的更新

app/views/files/_course_file.html.erb

@@ -123,7 +123,7 @@
     <div class="cl"></div>
   </div>
   <div  id="course_list">
-   <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments, :page=>2}  %>
+   <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}  %>
   </div>
 </div>
 <% html_title(l(:label_attachment_plural)) -%>

app/views/files/_project_list.html.erb

@@ -45,8 +45,17 @@
     <% end %>
 <% end %>
 
-<ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-</ul>
+<% if project_attachments.count == 10%>
+    <% if params[:action] == 'search_project' %>
+        <!--<ul class="wlist">-->
+          <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>-->
+        <!--</ul>-->
+        <%=link_to "点击展开更多",  search_project_project_files_path({:project_id => project.id, :page => @obj_pages.nil? ? @feedback_pages.page + 1 : @obj_pages.page + 1}.merge(params)),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
+    <%else%>
+        <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
+        <%=link_to "点击展开更多",  project_files_path(:project_id => project.id,:page => @page),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
+    <%end%>
+<% end%>
+
 
 

app/views/issues/add_journal.js.erb

@@ -1,6 +1,21 @@
 <% if @issue_id %> //issue详情中回复
     $("#reply_div_<%= @issue_id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => Issue.find( @issue_id),:replies_all_i=>0}) %>");
     $("#div_issue_attachment_<%=@issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => Issue.find( @issue_id)}) %>");
+    $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%");
+    issue_desc_editor = KindEditor.create('#issue_description',
+        {"width":"85%",
+            "resizeType":0,
+            "no_label":true,
+            "at_id":<%= @issue.project_id%>,
+            "at_type":"Project",
+            "autoHeightMode":true,
+            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, \"<%=@issue.project_id %>\", 'Project');}; this.loadPlugin('autoheight')})",
+            "emotionsBasePath":'<%= Setting.host_name%>',
+            "height":300,
+            "allowFileManager":true,
+            "uploadJson":"/kindeditor/upload",
+            "fileManagerJson":"/kindeditor/filemanager"});
 //    $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>");
     $(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue_id).journals.count %>)')
     sd_create_editor_from_data(<%= @issue.id %>, null, "100%");

app/views/organizations/_org_left_subfield_list.html.erb

@@ -37,10 +37,10 @@
 <% org_activity_field = organization.org_subfields.where('field_type="default" and name="activity" and field_type="default"').first %>
 <% org_course_field = organization.org_subfields.where('field_type="default" and name="course" and field_type="default"').first %>
 <% org_project_field = organization.org_subfields.where('field_type="default" and name="project" and field_type="default"').first %>
-<div class="homepageLeftMenuBlock" style="display:<%= org_activity_field.hide == 0?'block':'none' %>;" id="org_subfield_<%= org_activity_field.id %>">
+<div class="homepageLeftMenuBlock" style="display:<%= is_hide_org_left(org_activity_field) ? 'block':'none' %>;" id="org_subfield_<%= org_activity_field.id %>">
   <%= link_to "动态",organization_path(organization), :class => "homepageMenuText" %>
 </div>
-<div style="display:<%= org_project_field.hide == 0?'block':'none' %>;" id="org_subfield_<%= org_project_field.id %>">
+<div style="display:<%= is_hide_org_left(org_project_field) ? 'block':'none' %>;" id="org_subfield_<%= org_project_field.id %>">
     <div class="homepageLeftMenuBlock">
       <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
       <% if User.current.logged? and User.current.admin_of_org?(organization) %>
@@ -54,7 +54,7 @@
       </ul>
     </div>
 </div>
-<div style="display:<%= org_course_field.hide == 0?'block':'none' %>;" id="org_subfield_<%= org_course_field.id %>">
+<div style="display:<%= is_hide_org_left(org_course_field) ? 'block':'none' %>;" id="org_subfield_<%= org_course_field.id %>">
     <div class="homepageLeftMenuBlock">
       <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
       <% if User.current.logged? and User.current.admin_of_org?(organization) %>

public/stylesheets/public.css

@@ -435,6 +435,8 @@ a:hover.search_btn{ background: #0fa9bb;}
 .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
 .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) 5px -394px no-repeat; display:inline-block; float:left; cursor: pointer;}
 .searchIconPopup:hover {background:url(../images/homepage_icon.png) 5px -420px no-repeat;}
+.searchIcon2{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon2.png) -180px -273px no-repeat; display:inline-block; float:left; cursor: pointer;}
+.searchIcon2:hover {background:url(../images/homepage_icon2.png) -180px -314px no-repeat;}
 .courseSend {width:390px; height:15px; line-height:15px; margin-bottom:10px;display:block;white-space:nowrap;}
 .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
 .sendCourseName {font-size:12px; color:#5f6060;display:inline-block}
@@ -969,6 +971,12 @@ span.at a{color:#269ac9;text-decoration: none;}
 .sectionContent span {width:160px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:20px; vertical-align:top;}
 .orgDirection {width:392px; background-color:#f1f1f1; height:30px; vertical-align:middle; line-height:30px; color:#585858; padding-left:10px;}
 .orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}
+/*新课程、项目资源库*/
+.reCon{ margin:5px; width:710px;}
+.reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}
+.researchBox { width:240px; height:24px; border:1px solid #dddddd; color:#666666; outline:none;}
+.blueBtn{ width:60px; height:26px; color:#FFF; border:none; background-color:#269ac9; cursor:pointer; padding-left:0px; text-align:center;}
+.blueBtn:hover {background-color:#298fbd;}
 
 /*文本描述展开高度*/
 .maxh360 {max-height: 810px;}