jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2015-03-21 16:37:40 +08:00
parent 799fa776ee 75ae68ffc8
commit bf5c99321e
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/watchers_helper.rb
View File

@ -284,7 +284,7 @@ module WatchersHelper
def exit_project_link(project) def exit_project_link(project)
link_to(l(:label_exit_project),exit_cur_project_path(project.id), link_to(l(:label_exit_project),exit_cur_project_path(project.id),
:remote => true, :confirm => l(:lable_sure_exit_project), :remote => true, :confirm => l(:lable_sure_exit_project),
:style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" ) :style => "color: #fff; display:block;font-size:12px; padding: 0px 5px; margin-right: 10px; height: 20px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" )
end end
#项目关注、取消关注 #项目关注、取消关注

6
app/views/layouts/base_projects.html.erb
View File

@ -153,7 +153,7 @@
<span class="subnav_num">(<%= @project.issues.count %>)</span><span> <span class="subnav_num">(<%= @project.issues.count %>)</span><span>
<% end %> <% end %>
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %></span> <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px !important;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %></span>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
@ -164,7 +164,7 @@
<span class="subnav_num">(<%= @project.boards.first.topics.count %>)</span> <span class="subnav_num">(<%= @project.boards.first.topics.count %>)</span>
<% end %> <% end %>
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %> <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px !important;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %>
<% end %> <% end %>
</div> </div>
<% end%> <% end%>
@ -175,7 +175,7 @@
<span class="subnav_num">(<%= attaments_num %>)</span> <span class="subnav_num">(<%= attaments_num %>)</span>
<% end %> <% end %>
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px !important;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %>
<% end %> <% end %>
</div> </div>
<% end%> <% end%>

6
app/views/projects/invite_members_by_mail.html.erb
View File

@ -4,7 +4,7 @@
var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
if(email == "") if(email == "")
{ {
$("#valid_email").html("电子邮件不能为空"); $("#valid_email").html("邮箱地址不能为空！");
} }
else if (filter.test(email)) { else if (filter.test(email)) {
$("#valid_email").html(""); $("#valid_email").html("");
@ -12,7 +12,7 @@
} }
else else
{ {
$("#valid_email").html("您所填写的邮件格式不正确"); $("#valid_email").html("您输入的邮箱格式不正确！");
} }
return false; return false;
} }
@ -55,7 +55,7 @@
</div> </div>
<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %> <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %>
<span id="valid_email" style="color: #FF0000;"></span> <span id="valid_email" style="color: #FF0000;"></span>
<%= text_field_tag 'mail', '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "verifyAddress();" %> <%= text_field_tag 'mail', '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onblur => "verifyAddress();" %>
<div class="cl"></div> <div class="cl"></div>
<div class="cl"></div> <div class="cl"></div>
<a href="#" class="btn_free" onclick="senderEmail($(this));"> <a href="#" class="btn_free" onclick="senderEmail($(this));">

2
config/locales/projects/zh.yml
View File

@ -195,7 +195,7 @@ zh:
label_invite_join: 邀请加入 label_invite_join: 邀请加入
label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
label_email_format_error: 您所填写的电子邮件格式不正确 label_email_format_error: 您输入的邮箱格式不正确！
label_user_role_null: 用户和角色不能留空！ label_user_role_null: 用户和角色不能留空！
label_send_email: 免费发送 label_send_email: 免费发送
label_input_email: 请输入邮箱地址 label_input_email: 请输入邮箱地址

2
public/stylesheets/application.css
View File

@ -31,7 +31,7 @@ a{ text-decoration:none; }
.fl{ float: left;} .fl{ float: left;}
.fr{ float:right;} .fr{ float:right;}
.project_h4{ font-size:14px; color:#3b3b3b;} .project_h4{ font-size:14px; color:#3b3b3b;}
.project_watch_new{color: #fff !important; display:block !important; padding: 0px 5px !important; margin-right: 10px !important; height: 22px !important; line-height: 21px !important;padding-top:1px !important; background: none repeat scroll 0% 0% #64BDD9 !important;} .project_watch_new{color: #fff !important;font-size:12px; display:block !important; padding: 0px 4px !important; margin-right: 10px !important; height: 20px !important; line-height: 21px !important;padding-top:1px !important; background: none repeat scroll 0% 0% #64BDD9 !important;}
.project_content{ width:940px; margin:10px auto;} .project_content{ width:940px; margin:10px auto;}
.project_left{ float:left;} .project_left{ float:left;}