hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'huang_temp2' into develop

Browse Source 
Conflicts:
	app/views/layouts/base_org2.html.erb
guange_dev
huang 9 years ago
parent 1f073c19ae e05e6ba53d
commit 0eb6dbe48a
17 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'https://rubygems.org/' source 'https://ruby.taobao.org/'
### <20><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>bundle config mirror.https://rubygems.org https://gems.ruby-china.org <20>л<EFBFBD><D0BB><EFBFBD>ruby-chinaԴ ### <20><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>bundle config mirror.https://rubygems.org https://gems.ruby-china.org <20>л<EFBFBD><D0BB><EFBFBD>ruby-chinaԴ
unless RUBY_PLATFORM =~ /w32/ unless RUBY_PLATFORM =~ /w32/

10
app/views/layouts/base_org2.html.erb
Unescape View File

@ -86,14 +86,6 @@
<li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;"> <li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
<%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %> <%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
</li> </li>
<% when 'course' %>
<li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
<a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
</li>
<% when 'project' %>
<li class="nav-element-default" style="display:<%= field.hide == 0?'block':'none' %>;">
<a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
</li>
<% end %> <% end %>
<% else %> <% else %>
<% if field.field_type == "Post" && field.hide == 0 %> <% if field.field_type == "Post" && field.hide == 0 %>
@ -181,7 +173,7 @@
<li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li> <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> <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
<li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li> <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
<li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
</ul> </ul>
<div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div> <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
<div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br /> <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />

3
app/views/messages/_project_show.html.erb
Unescape View File

@ -104,10 +104,11 @@
<ul> <ul>
<li class="homepagePostSettingIcon"> <li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText"> <ul class="homepagePostSettiongText">
<% if @topic.author.id == User.current.id %>
<li> <li>
<%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %> <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
</li> </li>
<% if @topic.author.id == User.current.id %>
<li> <li>
<%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post, <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post,
:data => {:confirm => l(:text_are_you_sure)}, :data => {:confirm => l(:text_are_you_sure)},

2
app/views/org_document_comments/_new.html.erb
Unescape View File

@ -36,7 +36,7 @@
$('#doc_title_hint').hide(); $('#doc_title_hint').hide();
} }
</script> </script>
<div class="resources" nhname="new_topic_form"> <div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" nhname="new_topic_form">
<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
<div> <div>
<input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题" /> <input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题" />

6
app/views/org_document_comments/show.html.erb
Unescape View File

@ -5,7 +5,7 @@
showNormalImage('message_description_<%= @document.id %>'); showNormalImage('message_description_<%= @document.id %>');
}); });
</script> </script>
<div class="resources" id="organization_document_<%= @document.id %>"> <div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" id="organization_document_<%= @document.id %>">
<div class="homepagePostBrief"> <div class="homepagePostBrief">
<div class="homepagePostPortrait"> <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) %> <%= link_to image_tag(url_to_avatar(User.find(@document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(@document.creator_id) %>
@ -124,7 +124,7 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<%# end %> <%# end %>
<% if User.current.logged?%> <%# if User.current.logged?%>
<div class="talkWrapMsg" nhname="about_talk_reply"> <div class="talkWrapMsg" nhname="about_talk_reply">
<em class="talkWrapArrow"></em> <em class="talkWrapArrow"></em>
<div class="cl"></div> <div class="cl"></div>
@ -137,7 +137,7 @@
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>
<% end %> <%# end %>
</div> </div>
</div> </div>

5
app/views/projects/settings/_new_edit.html.erb
Unescape View File

@ -30,6 +30,11 @@
<input id="project_is_public" name="project[is_public]" type="checkbox" <%= @project.is_public ? "checked" : ""%>> <input id="project_is_public" name="project[is_public]" type="checkbox" <%= @project.is_public ? "checked" : ""%>>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<li >
<label class="label02">隐藏代码库&nbsp;&nbsp;：</label>
<input id="project_hidden_repo" name="project[hidden_repo]" type="checkbox" <%= @project.hidden_repo ? "checked" : ""%>>
<div class="cl"></div>
</li>
</ul> </ul>
<a href="javascript:void(0)" class="blue_btn ml110" onclick="submit_edit_project(<%= @project.id %>);" >保存</a> <a href="javascript:void(0)" class="blue_btn ml110" onclick="submit_edit_project(<%= @project.id %>);" >保存</a>
<% end %> <% end %>

3
app/views/projects/show.html.erb
Unescape View File

@ -29,6 +29,8 @@
<!--CONTENT LIST--> <!--CONTENT LIST-->
</div> </div>
<%# 时间紧，权限待优化 %>
<% 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? %> <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank? %>
<div class="resources mt10"> <div class="resources mt10">
<div class="homepagePostBrief"> <div class="homepagePostBrief">
@ -37,6 +39,7 @@
</div> </div>
</div> </div>
<% end %> <% end %>
<% end %>
<%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %> <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
</div> </div>

2
app/views/sub_document_comments/_new.html.erb
Unescape View File

@ -36,7 +36,7 @@
$('#doc_title_hint').hide(); $('#doc_title_hint').hide();
} }
</script> </script>
<div class="resources" nhname="new_topic_form"> <div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" nhname="new_topic_form">
<%= 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| %> <%= 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| %>
<div> <div>
<input class="postDetailInput fl" maxlength="250" name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#sub_document_editor').show();" placeholder="请输入文章标题" /> <input class="postDetailInput fl" maxlength="250" name="sub_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#sub_document_editor').show();" placeholder="请输入文章标题" />

6
app/views/sub_document_comments/show.html.erb
Unescape View File

@ -8,7 +8,7 @@
showNormalImage('message_description_<%= @document.id %>'); showNormalImage('message_description_<%= @document.id %>');
}); });
</script> </script>
<div class="resources" id="organization_document_<%= @document.id %>"> <div class="resources" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>;" id="organization_document_<%= @document.id %>">
<div class="homepagePostBrief"> <div class="homepagePostBrief">
<div class="homepagePostPortrait"> <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) %> <%= 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 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<%# end %> <%# end %>
<% if User.current.logged?%> <%# if User.current.logged?%>
<div class="talkWrapMsg" nhname="about_talk_reply"> <div class="talkWrapMsg" nhname="about_talk_reply">
<em class="talkWrapArrow"></em> <em class="talkWrapArrow"></em>
<div class="cl"></div> <div class="cl"></div>
@ -151,7 +151,7 @@
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>
<% end %> <%# end %>
</div> </div>
</div> </div>

2
lib/dalli-2.7.2/Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'https://rubygems.org' source 'https://ruby.taobao.org/'
gemspec gemspec

2
lib/gitlab-cli/Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'https://rubygems.org' source 'https://ruby.taobao.org/'
# Specify your gem's dependencies in gitlab.gemspec # Specify your gem's dependencies in gitlab.gemspec
gemspec gemspec

2
lib/grack/Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'https://rubygems.org/' source 'https://ruby.taobao.org/'
gemspec gemspec

2
lib/plugins/acts-as-taggable-on/Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'https://rubygems.org' source 'https://ruby.taobao.org/'
gemspec gemspec

2
lib/rails_kindeditor/Gemfile
Unescape View File

@ -1,4 +1,4 @@
source "https://rubygems.org" source "https://ruby.taobao.org/"
gemspec gemspec

2
lib/wechat/Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'https://rubygems.org' source 'https://ruby.taobao.org/'
gemspec gemspec

2
plugins/redmine_ckeditor/Gemfile
Unescape View File

@ -1,4 +1,4 @@
source 'https://rubygems.org/' source 'https://ruby.taobao.org/'
gem 'rich', '1.4.6' gem 'rich', '1.4.6'
gem 'kaminari' gem 'kaminari'

8
public/javascripts/application.js
Unescape View File

@ -1358,10 +1358,10 @@ function autoUrl(id){
var reStr = full; var reStr = full;
if (full.length > 0){ if (full.length > 0){
if (full.indexOf("://") >= 0){ if (full.indexOf("://") >= 0){
reStr = "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>"; reStr = "<a style='color:#136ec2' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
} }
else{ else{
reStr = "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>"; reStr = "<a style='color:#136ec2' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
} }
} }
return reStr ; return reStr ;
@ -1377,10 +1377,10 @@ function autoUrl(id){
var reStr = full; var reStr = full;
if (full.length > 0){ if (full.length > 0){
if (full.indexOf("://") >= 0){ if (full.indexOf("://") >= 0){
reStr = "<a style='color:#15bccf' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>"; reStr = "<a style='color:#136ec2' target='_Blank' href="+"'"+full+"'"+">"+full+"</a>";
} }
else{ else{
reStr = "<a style='color:#15bccf' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>"; reStr = "<a style='color:#136ec2' target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
} }
} }
return reStr ; return reStr ;

Write Preview
Loading…
Cancel
Save