diff --git a/Gemfile b/Gemfile index a599613ba..d392c6561 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org/' +source 'https://ruby.taobao.org/' ### ����ִ��bundle config mirror.https://rubygems.org https://gems.ruby-china.org �л���ruby-chinaԴ unless RUBY_PLATFORM =~ /w32/ diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 610af6857..29f28a441 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -86,14 +86,6 @@
  • <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
    • - <% when 'course' %> -
  • - 课程动态 -
    • - <% when 'project' %> -
  • - 项目动态 -
    • <% end %> <% else %> <% if field.field_type == "Post" && field.hide == 0 %> @@ -181,7 +173,7 @@
  • 关于我们
  • 服务协议
  • 帮助中心
    • -
  • 在线报名
    • +
    联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org
    地 址：湖南省长沙市开福区东风路89号观园大厦23层
    diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index 39990e215..43b0798aa 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -104,10 +104,11 @@
    - <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank? %> -
    -
    - <%= render :partial => "rep_static" %> -
    -
    -
    + <%# 时间紧，权限待优化 %> + <% unless @project.hidden_repo && !User.current.member_of?(@project) && !User.current.admin? %> + <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank? %> +
    +
    + <%= render :partial => "rep_static" %> +
    +
    +
    + <% end %> <% end %> <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %> diff --git a/app/views/sub_document_comments/_new.html.erb b/app/views/sub_document_comments/_new.html.erb index c6cc13164..aec91c878 100644 --- a/app/views/sub_document_comments/_new.html.erb +++ b/app/views/sub_document_comments/_new.html.erb @@ -36,7 +36,7 @@ $('#doc_title_hint').hide(); } -
    +
    <%= form_tag org_subfield_sub_domain_sub_document_comments_path(:org_subfield_id => @org_subfield.id, :sub_domain_id => @subdomain.id), :id => 'new_sub_document_form' do |f| %>
    diff --git a/app/views/sub_document_comments/show.html.erb b/app/views/sub_document_comments/show.html.erb index 7050c1c66..f85f3ed25 100644 --- a/app/views/sub_document_comments/show.html.erb +++ b/app/views/sub_document_comments/show.html.erb @@ -8,7 +8,7 @@ showNormalImage('message_description_<%= @document.id %>'); }); -
    +
    <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %> @@ -138,7 +138,7 @@
    <%# end %> - <% if User.current.logged?%> + <%# if User.current.logged?%>
    @@ -151,7 +151,7 @@
    - <% end %> + <%# end %>
    diff --git a/lib/dalli-2.7.2/Gemfile b/lib/dalli-2.7.2/Gemfile index aeb2bb358..59c3c15a0 100644 --- a/lib/dalli-2.7.2/Gemfile +++ b/lib/dalli-2.7.2/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'https://ruby.taobao.org/' gemspec diff --git a/lib/gitlab-cli/Gemfile b/lib/gitlab-cli/Gemfile index 54fbdf177..846f49bed 100644 --- a/lib/gitlab-cli/Gemfile +++ b/lib/gitlab-cli/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'https://ruby.taobao.org/' # Specify your gem's dependencies in gitlab.gemspec gemspec diff --git a/lib/grack/Gemfile b/lib/grack/Gemfile index 2aa7df2fe..360e439a0 100644 --- a/lib/grack/Gemfile +++ b/lib/grack/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org/' +source 'https://ruby.taobao.org/' gemspec diff --git a/lib/plugins/acts-as-taggable-on/Gemfile b/lib/plugins/acts-as-taggable-on/Gemfile index e37a382a0..4e6730add 100644 --- a/lib/plugins/acts-as-taggable-on/Gemfile +++ b/lib/plugins/acts-as-taggable-on/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'https://ruby.taobao.org/' gemspec diff --git a/lib/rails_kindeditor/Gemfile b/lib/rails_kindeditor/Gemfile index 9a36070cb..c4b60f19b 100644 --- a/lib/rails_kindeditor/Gemfile +++ b/lib/rails_kindeditor/Gemfile @@ -1,4 +1,4 @@ -source "https://rubygems.org" +source "https://ruby.taobao.org/" gemspec diff --git a/lib/wechat/Gemfile b/lib/wechat/Gemfile index ee4ef6e9e..8627d2525 100644 --- a/lib/wechat/Gemfile +++ b/lib/wechat/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org' +source 'https://ruby.taobao.org/' gemspec diff --git a/plugins/redmine_ckeditor/Gemfile b/plugins/redmine_ckeditor/Gemfile index 115107d18..568df01b4 100644 --- a/plugins/redmine_ckeditor/Gemfile +++ b/plugins/redmine_ckeditor/Gemfile @@ -1,4 +1,4 @@ -source 'https://rubygems.org/' +source 'https://ruby.taobao.org/' gem 'rich', '1.4.6' gem 'kaminari' diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 303fc3ac9..96dd99ed2 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1358,10 +1358,10 @@ function autoUrl(id){ var reStr = full; if (full.length > 0){ if (full.indexOf("://") >= 0){ - reStr = ""+full+""; + reStr = ""+full+""; } else{ - reStr = ""+full+""; + reStr = ""+full+""; } } return reStr ; @@ -1377,10 +1377,10 @@ function autoUrl(id){ var reStr = full; if (full.length > 0){ if (full.indexOf("://") >= 0){ - reStr = ""+full+""; + reStr = ""+full+""; } else{ - reStr = ""+full+""; + reStr = ""+full+""; } } return reStr ;