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

2016-10-11 14:59:04 +08:00 · 2016-10-11 14:59:04 +08:00 · 0b93d196d2
parent 005cd09d4a dd452f9efe
commit 0b93d196d2
20 changed files with 54 additions and 9 deletions
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@ -102,7 +102,7 @@ class SubDocumentCommentsController < ApplicationController
    @subdomain = @document.sub_domain
    @org_subfield = @subdomain.org_subfield
    @organization = @org_subfield.organization
-    @act = OrgActivity.find(params[:id])
+    @act = OrgActivity.find(params[:act_id])
    @comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain, :creator_id => User.current.id, :reply_id => params[:id])
    @comment.content = params[:sub_content]
    @document.children << @comment
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@ -158,6 +158,8 @@ function cookieget(n)
    })

 </script>
+<% forum = Forum.where(:id => 1).first %>
+<% unless forum.nil? %>
 <div class="scrollsidebar" id="scrollsidebar" style="float: right">
    <div class="side_content">
        <div class="side_list">
@ -189,4 +191,5 @@ function cookieget(n)
      <a href="#" class="closeSidebar"></a>
    </div>
 </div>
+<% end %>
 </body>
--- a/app/views/layouts/_base_footer_public.html.erb
+++ b/app/views/layouts/_base_footer_public.html.erb
@ -4,7 +4,10 @@
      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
      <li class="fl"><a href="https://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
+      <% memo = Memo.where(:id => 1168).first %>
+      <% unless memo.nil? %>
      <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
+      <% end %>
      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
      <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
        <select class="languageBox">
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@ -4,7 +4,8 @@
      <li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
      <li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
      <li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
-      <% if hidden_unproject_infos %>
+      <% memo = Memo.where(:id => 1168).first %>
+      <% if hidden_unproject_infos && !memo.nil? %>
          <li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
      <% end %>
      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>
--- a/app/views/layouts/_forbidden_new_feedback.html.erb
+++ b/app/views/layouts/_forbidden_new_feedback.html.erb
@ -1,5 +1,7 @@
 <%= javascript_include_tag "feedback" %>

+<% forum = Forum.where(:id => 1).first %>
+<% unless forum.nil? %>
 <div class="scrollsidebar" id="scrollsidebar">
  <div class="side_content">
    <div class="side_list">
@ -49,3 +51,4 @@
    </div>
  </div>
 </div>
+<% end %>
--- a/app/views/layouts/_logined_header_show.html.erb
+++ b/app/views/layouts/_logined_header_show.html.erb
@ -14,9 +14,12 @@
          <li class="navHomepageMenu fl">
            <a href ="javascript:void(0);" disabled="true" class="c_white f16 db p10">题库</a>
          </li>
+          <% memo = Memo.where(:id => 1168).first %>
+          <% unless memo.nil? %>
          <li class="navHomepageMenu fl mr30">
            <a href ="javascript:void(0);" disabled="true" class="c_white f16 db p10">帮助中心</a>
          </li>
+          <% end %>
      <% end %>
    </ul>
  </div>
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@ -1,5 +1,6 @@
 <%= javascript_include_tag "feedback" %>
-
+<% forum = Forum.where(:id => 1).first %>
+<% unless forum.nil? %>
 <div class="scrollsidebar pr" id="scrollsidebar">
  <div class="side_content">
    <div class="side_list">
@ -49,3 +50,4 @@
    </div>
  </div>
 </div>
+<% end %>
--- a/app/views/layouts/_org_custom_footer.html.erb
+++ b/app/views/layouts/_org_custom_footer.html.erb
@ -2,7 +2,10 @@
  <ul>
    <li ><a href="<%= about_us_path %>" target="_blank" class="" >关于我们<span>|</span></a></li>
    <li ><a href="<%= agreement_path %>" target="_blank" class="" >服务协议<span>|</span></a></li>
+    <% memo = Memo.where(:id => 1168).first %>
+    <% unless memo.nil? %>
    <li ><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="" >帮助中心<span>|</span></a></li>
+    <% end %>
    <li ><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="" > 贴吧交流</a></li>
    <div class="cl"></div>
  </ul>
--- a/app/views/layouts/_org_subdomain_footer.html.erb
+++ b/app/views/layouts/_org_subdomain_footer.html.erb
@ -3,7 +3,10 @@
    <ul class="sn-footer-link">
      <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
      <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+      <% memo = Memo.where(:id => 1168).first %>
+      <% unless memo.nil? %>
      <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+      <% end %>
      <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
    </ul>
    <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@ -7,9 +7,12 @@
      <!--<li class="navHomepageMenu fl mr40">-->
        <!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
      <!--</li>-->
+      <% memo = Memo.where(:id => 1168).first %>
+      <% unless memo.nil? %>
      <li class="navHomepageMenu fl mr40">
        <a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="c_white f16 db p10" >帮助中心</a>
      </li>
+      <% end %>
    </ul>
  </div>
  <script>
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@ -152,7 +152,10 @@
    <ul class="footerAbout">
      <li class="fl"><a href="<%= about_us_path %>"  class=" f_grey mw20" target="_blank">关于我们</a>|</li>
      <li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <% memo = Memo.where(:id => 1168).first %>
+      <% unless memo.nil? %>
      <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <% end %>
      <li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
    </ul>
  </div>
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@ -172,8 +172,10 @@
      <ul class="sn-footer-link">
        <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
        <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+        <% memo = Memo.where(:id => 1168).first %>
+        <% unless memo.nil? %>
        <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
-
+        <% end %>
      </ul>
      <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
      <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@ -406,7 +406,10 @@
      <ul>
        <li><a href="<%= about_us_path %>" target="_blank" class="fl">关于我们</a></li>
        <li><a href="<%= agreement_path %>" target="_blank" class="fl"> 服务协议 </a></li>
+        <% memo = Memo.where(:id => 1168).first %>
+        <% unless memo.nil? %>
        <li><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="fl">帮助中心</a></li>
+        <% end %>
        <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="fl"> 贴吧交流</a></li>
      </ul>
      <div class="cl"></div>
--- a/app/views/layouts/base_organization.html.erb
+++ b/app/views/layouts/base_organization.html.erb
@ -106,7 +106,10 @@
    <ul class="footerAbout">
      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <% memo = Memo.where(:id => 1168).first %>
+      <% unless memo.nil? %>
      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <% end %>
      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
    </ul>
  </div>
--- a/app/views/organizations/_org2_footer.html.erb
+++ b/app/views/organizations/_org2_footer.html.erb
@ -3,7 +3,10 @@
    <ul class="sn-footer-link">
      <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
      <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
+      <% memo = Memo.where(:id => 1168).first %>
+      <% unless memo.nil? %>
      <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
+      <% end %>
      <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
    </ul>
    <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@ -77,7 +77,11 @@
    <%= render :partial => 'dir_list' %>
 <% end %>

+<% memo = Memo.where(:id => 1232).first %>
+<% unless memo.nil? %>
 <a href="<%= Setting.protocol + "://" %><%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>
+<% end %>
+
 <div class="fr">
  <a style="color: #7f7f7f;">导出统计结果：</a>
  <%= link_to "最近一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week"  } %> <a style="color: #7f7f7f;">|</a>
--- a/app/views/sub_document_comments/_show_sub_document.html.erb
+++ b/app/views/sub_document_comments/_show_sub_document.html.erb
@ -1,4 +1,4 @@
-<div class="resources mt10" id="organization_document_<%= document.id %>">
+<div class="resources mt10" id="organization_sub_document_comments_<%= document.id %>">
  <div class="homepagePostBrief">
    <div class="homepagePostPortrait">
      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
--- a/app/views/sub_document_comments/add_reply.js.erb
+++ b/app/views/sub_document_comments/add_reply.js.erb
@ -1,2 +1,2 @@
-$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
+$("#organization_sub_document_comments_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
 sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");
--- a/app/views/sub_domains/show.html.erb
+++ b/app/views/sub_domains/show.html.erb
@ -129,7 +129,10 @@
        <ul class="sn-footer-link">
          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">关于我们</a></li>
          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">服务协议</a></li>
+          <% memo = Memo.where(:id => 1168).first %>
+          <% unless memo.nil? %>
          <li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">帮助中心</a></li>
+          <% end %>
          <li><a href="javascript:void(0);" class="sn-link-white sn-f18">在线报名</a></li>
        </ul>
        <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
--- a/app/views/users/_user_resource_tip_list.html.erb
+++ b/app/views/users/_user_resource_tip_list.html.erb
@ -5,7 +5,7 @@
  <li class="resource-list-time fr">
    <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
    <% if @order == "created_on" %>
-        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "#{@score == 'desc' ? 'st_down' : 'st_up'} mt16", :remote => true %>
    <% end %>
  </li>
  <!--<li class="resource-list-quote fr">-->
@ -17,14 +17,14 @@
  <li class="resource-list-download fr">
    <%= link_to "下载数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "fl", :remote => true %>
    <% if @order == "downloads" %>
-        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+        <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "#{@score == 'desc' ? 'st_down' : 'st_up'} mt16", :remote => true %>
    <% end %>
  </li>
  <li class="resource-list-size fr">
    <div style="margin: 0 auto; width: 40px">
      <%= link_to "大小", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "fl", :remote => true %>
      <% if @order == "filesize" %>
-          <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
+          <%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "#{@score == 'desc' ? 'st_down' : 'st_up'} mt16", :remote => true %>
      <% end %>
    </div>
  </li>