Skip to content

Commit a5290a0

Browse files
Bilka2Bilka2
committed
Reduce merge conflicts with #4994 
1 parent 73461ee commit a5290a0

File tree

2 files changed

+62
-48
lines changed

2 files changed

+62
-48
lines changed

‎app/views/admin/admin_invitations/index.html.erb

+35-24
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,64 @@
1010
</ul>
1111
<!--/subnav-->
1212
<!--main content-->
13-
<%= form_tag url_for(controller: "admin/admin_invitations", action: :create) do %>
13+
<%= form_tag url_for(controller: "admin/admin_invitations", action: :create), class: "invitation simple post", autocomplete: "off" do %>
1414
<fieldset class="simple">
15-
<h3 class="heading"><%= t(".send_to_email.title") %></h3>
16-
<p><%= t(".send_to_email.send_code_to_email") %>
17-
<%= text_field_tag "invitation[invitee_email]", (@invitation.try(:invitee_email) || "") %>
18-
<span class="submit actions"><%= submit_tag t(".send_to_email.submit") %></span>
15+
<h3 class="heading"><%= t(".send_to_email.heading") %></h3>
16+
<p>
17+
<%= t(".send_to_email.description") %>
18+
<%= text_field_tag "invitation[invitee_email]",
19+
(@invitation.try(:invitee_email) || ""),
20+
title: t(".send_to_email.invite_by_email_title") %>
21+
<span class="submit actions"><%= submit_tag t(".send_to_email.invite_user") %></span>
1922
</p>
2023
</fieldset>
2124
<% end %>
2225

23-
<%= form_tag url_for(controller: "admin/admin_invitations", action: "invite_from_queue") do %>
26+
<%= form_tag url_for(controller: "admin/admin_invitations", action: :invite_from_queue), class: "queue invitation simple post", autocomplete: "off" do %>
2427
<fieldset class="simple">
25-
<h3 class="heading"><%= t(".send_to_queue.title_html", invitations_queue_link: link_to(t(".send_to_queue.invitations_queue"), invite_requests_path)) %></h3>
26-
<p><%= t(".send_to_queue.current_request_count", count: InviteRequest.count) %></p>
28+
<h3 class="heading">
29+
<%= t(".invite_from_queue.heading_html",
30+
invitations_queue_link: link_to(t(".invite_from_queue.invitations_queue"), invite_requests_path)) %>
31+
</h3>
32+
<p><%= t(".invite_from_queue.requests_in_queue", count: InviteRequest.count) %></p>
2733
<p>
28-
<%= label_tag "invitation[invite_from_queue]", t(".send_to_queue.invite_number") %> <%= text_field_tag "invitation[invite_from_queue]" %>
29-
<span class="submit actions"><%= submit_tag t(".send_to_queue.submit") %></span>
34+
<%= label_tag "invitation[invite_from_queue]", t(".invite_from_queue.number_to_invite") %>
35+
<%= text_field_tag "invitation[invite_from_queue]" %>
36+
<span class="submit actions"><%= submit_tag t(".invite_from_queue.invite_from_queue") %></span>
3037
</p>
3138
</fieldset>
3239
<% end %>
3340

34-
<%= form_tag url_for(controller: "admin/admin_invitations", action: "grant_invites_to_users") do %>
41+
<%= form_tag url_for(controller: "admin/admin_invitations", action: :grant_invites_to_users), class: "bulk invitation simple post", autocomplete: "off" do %>
3542
<fieldset>
36-
<h3 class="heading"><%= t(".grant_to_users.title") %></h3>
43+
<h3 class="heading"><%= t(".grant_invites.heading") %></h3>
3744
<dl>
38-
<dt><%= label_tag "invitation[number_of_invites]", t(".grant_to_users.amount") %></dt>
45+
<dt><%= label_tag "invitation[number_of_invites]", t(".grant_invites.number_of_invitations") %></dt>
3946
<dd><%= text_field_tag "invitation[number_of_invites]" %></dd>
40-
<dt><%= label_tag "invitation[user_group]", t(".grant_to_users.user_type") %></dt>
41-
<dd><%= select_tag "invitation[user_group]", "<option>All</option><option>With no unused invitations</option>".html_safe %></dd>
42-
<dt class="landmark"><%= t(".grant_to_users.submit_landmark") %></dt>
43-
<dd class="submit actions"><%= submit_tag t(".grant_to_users.submit") %></dd>
47+
<dt><%= label_tag "invitation[user_group]", t(".grant_invites.users") %></dt>
48+
<dd>
49+
<%= select_tag "invitation[user_group]",
50+
options_for_select([t(".grant_invites.all"), t(".grant_invites.with_no_unused")],
51+
t(".grant_invites.all")) %>
52+
</dd>
53+
<dt class="landmark"><%= t(".grant_invites.landmark_submit") %></dt>
54+
<dd class="submit actions"><%= submit_tag t(".grant_invites.generate_invitations") %></dd>
4455
</dl>
4556
</fieldset>
4657
<% end %>
4758

48-
<%= form_tag url_for(controller: "admin/admin_invitations", action: "find"), method: :get do %>
59+
<%= form_tag url_for(controller: "admin/admin_invitations", action: :find), class: "invitation simple search", autocomplete: "off", method: :get do %>
4960
<fieldset>
50-
<h3 class="heading"><%= t(".track_invitations.title") %></h3>
61+
<h3 class="heading"><%= t(".find.heading") %></h3>
5162
<dl>
52-
<dt><%= label_tag "invitation[user_name]", t(".track_invitations.user_name") %></dt>
63+
<dt><%= label_tag "invitation[user_name]", t(".find.username") %></dt>
5364
<dd><%= text_field_tag "invitation[user_name]" %></dd>
54-
<dt><%= label_tag "invitation[token]", t(".track_invitations.invite_token") %></dt>
65+
<dt><%= label_tag "invitation[token]", t(".find.invite_token") %></dt>
5566
<dd><%= text_field_tag "invitation[token]" %></dd>
56-
<dt><%= label_tag "track_invitation_invitee_email", t(".track_invitations.email") %></dt>
67+
<dt><%= label_tag "track_invitation_invitee_email", t(".find.email") %></dt>
5768
<dd><%= text_field_tag "invitation[invitee_email]", nil, id: "track_invitation_invitee_email" %></dd>
58-
<dt class="landmark"><%= t(".track_invitations.submit_landmark") %></dt>
59-
<dd class="submit actions"><%= submit_tag t(".track_invitations.submit") %></dd>
69+
<dt class="landmark"><%= t(".find.landmark_submit") %></dt>
70+
<dd class="submit actions"><%= submit_tag t(".find.search") %></dd>
6071
</dl>
6172
</fieldset>
6273
<% end %>

‎config/locales/views/en.yml

+27-24
Original file line numberDiff line numberDiff line change
@@ -86,35 +86,38 @@ en:
8686
token: Enter an invite token
8787
user_name: Enter a user name
8888
index:
89-
grant_to_users:
90-
amount: 'Number of invitations:'
91-
submit: Generate invitations
92-
submit_landmark: Submit
93-
title: Give invite codes to current users
94-
user_type: 'Users:'
89+
find:
90+
email: All or part of an email address
91+
heading: Track invitations
92+
invite_token: Invite token
93+
landmark_submit: Submit
94+
search: Search
95+
username: Username
96+
grant_invites:
97+
all: All
98+
generate_invitations: Generate invitations
99+
heading: Give invite codes to current users
100+
landmark_submit: Submit
101+
number_of_invitations: Number of invitations
102+
users: Users
103+
with_no_unused: With no unused invitations
104+
invite_from_queue:
105+
heading_html: Send invite codes to people in our %{invitations_queue_link}
106+
invitations_queue: Invitations queue
107+
invite_from_queue: Invite from queue
108+
number_to_invite: Number of people to invite
109+
requests_in_queue:
110+
one: There is %{count} request in the queue.
111+
other: There are %{count} requests in the queue.
95112
navigation:
96113
queue: Manage Queue
97114
requests: Manage Requests
98115
page_heading: Invite New Users
99116
send_to_email:
100-
send_code_to_email: 'Send an invite code to the following email address:'
101-
submit: Invite user
102-
title: Send to email
103-
send_to_queue:
104-
current_request_count:
105-
one: There is %{count} request in the queue.
106-
other: There are %{count} requests in the queue.
107-
invitations_queue: invitations queue
108-
invite_number: 'Number of people to invite:'
109-
submit: Invite from queue
110-
title_html: Send invite codes to people in our %{invitations_queue_link}
111-
track_invitations:
112-
email: 'Enter all or part of an email address:'
113-
invite_token: 'Enter an invite token:'
114-
submit: Go
115-
submit_landmark: Submit
116-
title: Track invitations
117-
user_name: 'Enter a user name:'
117+
description: Email address
118+
heading: Send to Email
119+
invite_by_email_title: Invite by email
120+
invite_user: Invite user
118121
admin_nav:
119122
ao3_news: AO3 News
120123
archive_faq: Archive FAQ

0 commit comments

Comments
 (0)