Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add popover for org_profile page and add explanation for public plan #3241

Merged
merged 5 commits into from
Jan 24, 2023
Merged

add popover for org_profile page and add explanation for public plan #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15eb3ae
add popover for org_profile page
pengyin-shan Nov 17, 2022
5fa3d11
update message for public plan definition
pengyin-shan Nov 17, 2022
d480507
Merge branch 'development' into org_type_tip
briri Nov 29, 2022
3d254a1
Merge branch 'development' into org_type_tip
pengyin-shan Nov 29, 2022
6bb36e8
Merge branch 'development' into org_type_tip
briri Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions app/views/orgs/_profile_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<%
shared_links_tooltip = _('Links will be displayed next to your organisation\'s logo')
org_config_info_tooltip = _('This information can only be changed by a system administrator. Contact the Help Desk if you have questions or to request changes.')
org_types_tooltip = _(
'This information can only be changed by a system administrator. Contact %{support_email} if you have questions or to request changes.' % { support_email: Rails.configuration.x.organisation.email}
)
%>

<%= form_for(org, url: url, html: { multipart: true, method: method,
Expand Down Expand Up @@ -136,7 +139,13 @@
<div class="row">
<% if current_user.can_super_admin? %>
<fieldset class="col-xs-8">
<legend><%= _('Organisation Types') %></legend>
<legend>
<%= _('Organisation Types') %>
&nbsp; <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip" data-placement="right" title="<%= org_types_tooltip %>">
<i class="fas fa-question-circle fa-reverse" ></i>
<em class="sr-only"></em>
</a>
</legend>
<div class="checkbox">
<%= f.label :funder do %>
<%= f.check_box :funder, { class: 'org_types', value: org.funder? }, "true", "false" %>
Expand All @@ -159,7 +168,13 @@
<% else %>
<div class="col-xs-8">
<dl>
<dt><%= _('Organisation type(s)') %></dt>
<dt>
<%= _('Organisation type(s)') %>
&nbsp; <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip" data-placement="right" title="<%= org_types_tooltip %>">
<i class="fas fa-question-circle fa-reverse" ></i>
<em class="sr-only"></em>
</a>
</dt>
<dd><%= org.org_type_to_s %></dd>
</dl>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/plans/_share_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<%= f.radio_button :visibility, :publicly_visible,
data: { url: visibility_plan_path(@plan),
remote: true, method: :post } %>
<%= _('Public: anyone can view') %>
<%= _('Public: anyone can view or download from the Public DMPs page') %>
<% end %>
</div>
</div>
Expand Down