parent
ee1c53bacc
commit
de23c3c2a8
|
@ -633,7 +633,7 @@ module ApplicationHelper
|
|||
def principals_check_box_tags_li(name, principals)
|
||||
s = ''
|
||||
principals.each do |principal|
|
||||
s << "<li>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id), :class => "c_blue" }</li>\n"
|
||||
s << "<li>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id) }</li>\n"
|
||||
end
|
||||
s.html_safe
|
||||
end
|
||||
|
|
|
@ -12,19 +12,19 @@
|
|||
<div class="members_left">
|
||||
<% if members.any? %>
|
||||
<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="w140_h f_b" ><%= l(:label_user) %></span><span class="w180_h f_b"><%= l(:label_role_plural) %></span><span></span></li>
|
||||
<%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
|
||||
<% members.each do |member| %>
|
||||
<li >
|
||||
<%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %>
|
||||
<span class="w210 fl">
|
||||
<%= link_to_user_header member.principal,false,:class => "w140_h c_orange fl" %>
|
||||
<span class="w180_h fl">
|
||||
<%= h member.roles.sort.collect(&:to_s).join(', ') %>
|
||||
<%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
|
||||
:method => :put,
|
||||
:html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
|
||||
) do |f| %>
|
||||
<% roles.each do |role| %>
|
||||
<ul class="ml80" style="text-align: left;" >
|
||||
<ul style="text-align: left;" >
|
||||
<%= 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? } %>
|
||||
<label ><%= h role %></label>
|
||||
|
@ -32,7 +32,7 @@
|
|||
<!--<br/>-->
|
||||
<% end %>
|
||||
<%= hidden_field_tag 'membership[role_ids][]', '' %>
|
||||
<div class="ml80">
|
||||
<div>
|
||||
<a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
|
||||
<%= l(:button_change)%>
|
||||
</a>
|
||||
|
@ -46,7 +46,7 @@
|
|||
<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),
|
||||
:remote => true,
|
||||
:class => "c_dblue ml30 fl",
|
||||
:class => "c_dblue ml15 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? %>
|
||||
<% end%>
|
||||
</li>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<td class="w150"> </td>
|
||||
</tr>
|
||||
<% @project.repositories.sort.each do |repository| %>
|
||||
<tr class="pro_table_on">
|
||||
<tr class="<%= cycle 'pro_table_on', '' %>">
|
||||
<td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
|
||||
<%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %></a></td>
|
||||
<td> <%= checked_image repository.is_default? %></td>
|
||||
|
|
|
@ -18,15 +18,15 @@
|
|||
<td class="w150"></td>
|
||||
</tr>
|
||||
<% for version in @project.shared_versions.sort %>
|
||||
<tr class="pro_table_on">
|
||||
<td >
|
||||
<tr class="<%= cycle 'pro_table_on', '' %>">
|
||||
<td class="tl">
|
||||
<a class="c_blue02"><%= 'shared' if version.project != @project %> <%= link_to_version version %></a>
|
||||
</td>
|
||||
<td class="description"><%= format_date(version.effective_date) %></td>
|
||||
<td class="description" style="word-break:break-all;"><%=h version.description %></td>
|
||||
<td class="description tl" style="word-break:break-all;"><%=h version.description %></td>
|
||||
<td class="status"><%= l("version_status_#{version.status}") %></td>
|
||||
<td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
|
||||
<td style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="">
|
||||
<td class="tl" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" title="">
|
||||
<%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki',
|
||||
:action => 'show',
|
||||
:project_id => version.project,
|
||||
|
|
|
@ -55,6 +55,9 @@ a:hover.btn_free{ background:#d63502;}
|
|||
a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
|
||||
a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;}
|
||||
.rolebox{ margin:10px 0;}
|
||||
.w180_h{ width:180px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; text-align:left;}
|
||||
.w140_h{ width:135px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;}
|
||||
|
||||
/*问题跟踪*/
|
||||
.problem_top{ margin:10px 0 ;}
|
||||
.problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:5px;}
|
||||
|
@ -392,8 +395,8 @@ blockquote {
|
|||
.members_left{ float:left; width:410px; margin-right:20px; text-align:center;}
|
||||
.members_left{}
|
||||
.members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; }
|
||||
.members_left ul li a{ float:left; text-align:center;}
|
||||
.members_left ul li span{ float:left; text-align:center; color:#484747;}
|
||||
.members_left ul li a{ float:left; text-align:left;}
|
||||
.members_left ul li span{ float:left; text-align:center; color:#484747;text-align:left;}
|
||||
.w150{ text-align:center; width:150px;}
|
||||
.f_b{ font-weight: bold;}
|
||||
.members_right{ float:left; width:240px;}
|
||||
|
|
|
@ -410,3 +410,5 @@ div.flash.warning, .conflict {
|
|||
a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
|
||||
a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
|
||||
|
||||
/*文本左对齐*/
|
||||
.tl{text-align: left;}
|
Loading…
Reference in New Issue