Skip to content

Commit eb592d3

Browse files
committed
Apply changes requested in #584
1 parent 42ddf75 commit eb592d3

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

lib/pause_2017/templates/admin/email_for_admin.html.ep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<thead>
1010
<tr>
1111
<th class="sort asc" data-sort="userid">id</th>
12-
<th class="sort" data-sort="email"><i>id</i>@cpan.org gets forwarded to</th>
12+
<th class="sort" data-sort="email">Contact Email</th>
1313
</tr>
1414
</thead>
1515
<tbody class="list">

lib/pause_2017/templates/public/request_id/_form.html.ep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Note: You can enter fairly free-form text here but it must consist of at least t
2323
<p>
2424
<%= text_field "pause99_request_id_email", size => 32 %>
2525
</p>
26+
<p><small>Note that contact information will be shared with the CPAN security team (<a href="https://security.cpan.org/">security.cpan.org</a>)<% if (!$PAUSE::cpan_dot_org_mail_forwarding_ok) {%> and the E-Mail forwarding service<% } %>.</small></p>
2627
</div>
2728

2829
<div class="alternate<%= $alt++ % 2 + 1 %>">

lib/pause_2017/templates/user/cred/edit.html.ep

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ for communicating with you.
109109
</td></tr>
110110

111111
<tr><td class="alternate<%= $alter++ % 2 + 1 %>"><h4 class="altering">The email address <i><%= $cpan_alias %></i> should be configured to forward mail to ...</h4>
112+
% if (!$PAUSE::cpan_dot_org_mail_forwarding_ok) {
113+
<p class="explain"><b>
114+
🚧 The mail forwarding service is currently not
115+
available. Changes here will only take effect when the service can
116+
be started up again. -- </b></p>
117+
% }
112118
<p class="explain">
113119
<b>cpan.org</b> has a mail
114120
address for you and it's your choice if you want it to point to your

0 commit comments

Comments
 (0)