Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
This commit is contained in:
		
						commit
						ef9afca19f
					
				|  | @ -7,7 +7,7 @@ | ||||||
| 				<% sys_user.sub_roles.each do |sr| %> | 				<% sys_user.sub_roles.each do |sr| %> | ||||||
| 					<div class="for_unit" style="display:none;"> <%= sr.key %></div> | 					<div class="for_unit" style="display:none;"> <%= sr.key %></div> | ||||||
| 				<% end %> | 				<% end %> | ||||||
| 				<%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.approval_setting_window_title'),:content => "#{sys_user.sub_roles.collect{|sr| sr.key}.join(',')}"},:class=>"checkbox clear" do %> | 				<%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.approval_setting_window_title'),:content => "#{sys_user.sub_roles.collect{|sr| sr.i18n_variable[I18n.locale]}.join(',')}"},:class=>"checkbox clear" do %> | ||||||
| 					<div class="check-icon"> | 					<div class="check-icon"> | ||||||
| 					</div> | 					</div> | ||||||
| 					<div class='member-avatar'> | 					<div class='member-avatar'> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue