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

Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq

This commit is contained in:
lizanle 2015-04-17 14:20:58 +08:00
parent 532a8cb5c3 1382f9a0cd
commit b6db00643e
9 changed files with 104 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/files_helper.rb
View File

@ -61,7 +61,7 @@ module FilesHelper
s = '' s = ''
projects.each do |project| projects.each do |project|
if !project_contains_attachment?(project,attachment) && User.current.allowed_to?(:manage_files, project) if !project_contains_attachment?(project,attachment) && User.current.allowed_to?(:manage_files, project)
s << "<label>#{ check_box_tag name, project.id, false, :id => nil } #{h project.name}</label>" s << "<label>#{ check_box_tag name, project.id, false, :id => nil } #{h project.name}</label><br/>"
end end
end end
s.html_safe s.html_safe

4
app/views/attachments/_project_file_links.html.erb
View File

@ -59,12 +59,14 @@
<% end %> <% end %>
</p> </p>
<% end %> <% end %>
<div class="thumbnails">
<% if defined?(thumbnails) && thumbnails %> <% if defined?(thumbnails) && thumbnails %>
<% images = attachments.select(&:thumbnailable?) %> <% images = attachments.select(&:thumbnailable?) %>
<% if images.any? %> <% if images.any? %>
<% images.each do |attachment| %> <% images.each do |attachment| %>
<div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div> <div class="pro_pic fl "><%= thumbnail_issue_tag(attachment) %></div>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
</div>
</div> </div>

4
app/views/files/_project_file_list.html.erb
View File

@ -45,8 +45,8 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="tag_h"> <div class="tag_h">
<%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "10"} %> <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
<%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "10"} %> <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div><!---re_con_box end--> </div><!---re_con_box end-->

6
app/views/files/_show_quote_resource_project.html.erb
View File

@ -1,6 +1,6 @@
<div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;"> <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
<div class="upload_con"> <div class="upload_con">
<h2>将此课件引入我的资源库</h2> <h2>将此文件件引入我的资源库</h2>
<% if error == '403' %> <% if error == '403' %>
<div class="upload_box"> <div class="upload_box">
<div style="color: red;">您没有权限引用此资源</div> <div style="color: red;">您没有权限引用此资源</div>
@ -13,13 +13,11 @@
remote: true, remote: true,
id: "relation_file_form" do %> id: "relation_file_form" do %>
<%= hidden_field_tag(:file_id, file.id) %> <%= hidden_field_tag(:file_id, file.id) %>
<%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects')%> <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects', :class => "hidden")%>
<a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a> <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
<% end -%> <% end -%>
</div> </div>
<% end %> <% end %>
</div> </div>
</div> </div>

3
app/views/issues/_attributes.html.erb
View File

@ -9,7 +9,8 @@
<%= f.select :status_id, <%= f.select :status_id,
(@allowed_statuses.collect { |p| [p.name, p.id] }), (@allowed_statuses.collect { |p| [p.name, p.id] }),
{:no_label => true}, {:no_label => true},
:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')", # ajax 刷新
#:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
:class => "w150" %> :class => "w150" %>
<% else %> <% else %>
<%= h(@issue.status.name) %> <%= h(@issue.status.name) %>

2
app/views/issues/update_form.js.erb
View File

@ -1,5 +1,5 @@
$('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>'); $('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>');
$(.splitcontent).style("display", "block") //$(.splitcontent).style("display", "block")
<% if User.current.allowed_to?(:log_time, @issue.project) %> <% if User.current.allowed_to?(:log_time, @issue.project) %>
$('#log_time').show(); $('#log_time').show();
<% else %> <% else %>

164
app/views/projects/settings/_new_members.html.erb
View File

@ -11,113 +11,113 @@
<div class="members_left"> <div class="members_left">
<% if members.any? %> <% if members.any? %>
<ul style=" border-bottom:none;"> <ul style=" border-bottom:none;">
<li><span class="w90 f_b" ><%= l(:label_user) %></span><span class="w210 f_b"><%= l(:label_role_plural) %></span><span></span></li> <li><span class="w90 f_b" ><%= l(:label_user) %></span><span class="w210 f_b"><%= l(:label_role_plural) %></span><span></span></li>
<%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
<% members.each do |member| %> <% members.each do |member| %>
<li > <li >
<%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %> <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %>
<span class="w210 fl"> <span class="w210 fl">
<%= h member.roles.sort.collect(&:to_s).join(', ') %> <%= h member.roles.sort.collect(&:to_s).join(', ') %>
<%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
:method => :put, :method => :put,
:html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
) do |f| %> ) do |f| %>
<% roles.each do |role| %> <% roles.each do |role| %>
<ul style="text-align: left;" class="m115"> <ul class="m120" style="text-align: left;" >
<%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
:disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
<label ><%= h role %></label> <label ><%= h role %></label>
</ul> </ul>
<!--<br/>--> <!--<br/>-->
<% end %> <% end %>
<%= hidden_field_tag 'membership[role_ids][]', '' %> <%= hidden_field_tag 'membership[role_ids][]', '' %>
<div class="m130"> <div class="m130">
<a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;"> <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
<%= l(:button_change)%> <%= l(:button_change)%>
</a> </a>
<a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)"> <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').hide();$(this).parent().parent().parent().parent().height(30)">
<%= l(:button_cancel)%> <%= l(:button_cancel)%>
</a> </a>
</div> </div>
<% end %> <% end %>
</span> </span>
<% unless member.user_id == @project.user_id %> <% unless member.user_id == @project.user_id %>
<a href="javascript:void(0) " class="c_dblue ml15 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a> <a href="javascript:void(0) " class="c_dblue ml15 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
<%= delete_link membership_path(member), <%= delete_link membership_path(member),
:remote => true, :remote => true,
:class => "c_dblue ml30 fl", :class => "c_dblue ml30 fl",
:data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
<% end%> <% end%>
</li> </li>
<% end%> <% end%>
</ul> </ul>
<% else %> <% else %>
<p class="nodata"><%= l(:label_no_data) %></p> <p class="nodata"><%= l(:label_no_data) %></p>
<% end %> <% end %>
</div><!-- left --> </div><!-- left -->
<!--right begin--> <!--right begin-->
<% if roles.any? %> <% if roles.any? %>
<div class="members_right"> <div class="members_right">
<!-- applied --> <!-- applied -->
<% if @project.applied_projects.any? %> <% if @project.applied_projects.any? %>
<div class="members_jion"> <div class="members_jion">
<p class="c_blue mb10 fb"><%= l(:label_apply_project) %></p> <p class="c_blue mb10 fb"><%= l(:label_apply_project) %></p>
<%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> <%= form_for(@applied_members, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
<div id="principals_for_applied_member"> <div id="principals_for_applied_member">
<%= render_principals_for_applied_members_new(@project) %> <%= render_principals_for_applied_members_new(@project) %>
</div> </div>
<ul class="mb10"> <ul class="mb10">
<li><%= l(:label_role_plural) %>:</li> <li><%= l(:label_role_plural) %>:</li>
<% roles.each do |role| %> <% roles.each do |role| %>
<li> <li>
<%= check_box_tag 'membership[role_ids][]', role.id %> <%= check_box_tag 'membership[role_ids][]', role.id %>
<label ><%= h role %></label > <label ><%= h role %></label >
</li> </li>
<% end %> <% end %>
</ul> </ul>
<a remote="true" href="javascript:void(0)" class="blue_btn fl" onclick="$('#new_membership').submit();"> <a remote="true" href="javascript:void(0)" class="blue_btn fl" onclick="$('#new_membership').submit();">
<%= l(:label_approve) %> <%= l(:label_approve) %>
</a> </a>
<a remote="true" href="javascript:void(0)" class="grey_btn fl ml10" onclick="refusal_applied_member();"> <a remote="true" href="javascript:void(0)" class="grey_btn fl ml10" onclick="refusal_applied_member();">
<%= l(:label_refusal) %> <%= l(:label_refusal) %>
</a> </a>
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% end %><!--members_jion end--> <% end %><!--members_jion end-->
<div class="cl"></div> <div class="cl"></div>
<!-- add members --> <!-- add members -->
<p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p> <p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p>
<%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
<div class="member_search"> <div class="member_search">
<input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友"> <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
<%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %> <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
<div class="cl"></div> <div class="cl"></div>
<div id="principals_for_new_member"> <div id="principals_for_new_member">
<%= render_principals_for_new_project_members(@project) %> <%= render_principals_for_new_project_members(@project) %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<ul class="rolebox mb10 mt10"> <ul class="rolebox mb10 mt10">
<li class="fb"> <li class="fb">
<%= l(:label_role_plural) %>： <%= l(:label_role_plural) %>：
</li>
<% roles.each do |role| %>
<li>
<%= check_box_tag 'membership[role_ids][]', role.id %>
<label ><%= h role %></label>
</li> </li>
<% end %> <% roles.each do |role| %>
</ul> <li>
<div class="cl mb10"></div> <%= check_box_tag 'membership[role_ids][]', role.id %>
<a href="javascript:void(0)" class="member_btn" onclick="$(this).parent().parent().submit();"> <label ><%= h role %></label>
新增成员 </li>
</a> <% end %>
</div> </ul>
<% end%> <div class="cl mb10"></div>
</div><!-- 右边 end--> <a href="javascript:void(0)" class="member_btn" onclick="$(this).parent().parent().submit();">
新增成员
</a>
</div>
<% end%>
</div><!-- 右边 end-->
<% end %> <% end %>
<script type="text/javascript"> <script type="text/javascript">

2
app/views/repositories/_breadcrumbs.html.erb
View File

@ -25,7 +25,7 @@
<% <%
# @rev is revsion or Git and Mercurial branch or tag. # @rev is revsion or Git and Mercurial branch or tag.
# For Mercurial *tip*, @rev and @changeset are nil. # For Mercurial *tip*, @rev and @changeset are nil.
rev_text = @changeset.nil? ? "master" : format_revision(@changeset) rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
%> %>
<p class="fl f14 fb c_grey02"><%= "@ #{h rev_text}" unless rev_text.blank? %></p> <p class="fl f14 fb c_grey02"><%= "@ #{h rev_text}" unless rev_text.blank? %></p>

10
public/stylesheets/project.css
View File

@ -534,3 +534,13 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
/*pre标签换行*/ /*pre标签换行*/
.break_word{word-break: break-all;word-wrap: break-word;} .break_word{word-break: break-all;word-wrap: break-word;}
.break_word_firefox{white-space: pre-wrap;word-break: break-all;} .break_word_firefox{white-space: pre-wrap;word-break: break-all;}
/*问题跟踪attachment显示*/
div.attachments { margin-top: 12px; }
div.attachments p { margin:4px 0 2px 0; }
div.attachments img { vertical-align: middle; }
div.attachments span.author { font-size: 0.9em; color: #888; }
div.thumbnails {margin-top:0.6em;}
div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;}