scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-02 13:12:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #132 from Ducz0r/lm-sci-228

Browse source 
Updates to invite users to team modal window
This commit is contained in:
Luka Murn 2016-09-05 15:53:15 +02:00 committed by GitHub
commit 81883911c4
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/users/settings/organizations/add_user_modal.js
View file

@ -55,6 +55,7 @@ inviteExistingCollapsible
.on("shown.bs.collapse", function() {
// Focus input when collapsible is shown
inviteExistingQuery.focus();
invitingExisting = true;
});
inviteNewCollapsible

22
app/views/users/settings/organizations/_destroy_user_organization_modal_body.html.erb
View file

@ -1,13 +1,15 @@
<%= bootstrap_form_for user_organization, url: destroy_user_organization_path(user_organization, format: :json), remote: :true, method: :delete, data: { id: "destroy-user-organization-form" } do |f| %>
<p><%= t("users.settings.organizations.edit.destroy_uo_message", user: user_organization.user.full_name, org: user_organization.organization.name) %></p>
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
&nbsp;
<%= t("users.settings.organizations.edit.destroy_uo_alert_heading") %>
<ul>
<li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_1") %></li>
<li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_2").html_safe %></li>
<li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_3") %></li>
</ul>
</div>
<% if user_organization.user.confirmed? %>
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
&nbsp;
<%= t("users.settings.organizations.edit.destroy_uo_alert_heading") %>
<ul>
<li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_1") %></li>
<li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_2").html_safe %></li>
<li><%= t("users.settings.organizations.edit.destroy_uo_alert_line_3") %></li>
</ul>
</div>
<% end %>
<% end %>