mumuki-laboratory 9.9.0 → 9.12.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (77) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/mumuki_laboratory/application/bridge.js +15 -9
  3. data/app/assets/javascripts/mumuki_laboratory/application/confirmation.js +10 -8
  4. data/app/assets/javascripts/mumuki_laboratory/application/editors.js +5 -3
  5. data/app/assets/javascripts/mumuki_laboratory/application/progress.js +4 -4
  6. data/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js +12 -1
  7. data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js +8 -2
  8. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_discussion.scss +32 -34
  9. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_dropdown.scss +11 -0
  10. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_faqs.scss +1 -1
  11. data/app/controllers/application_controller.rb +1 -1
  12. data/app/controllers/users_controller.rb +38 -1
  13. data/app/helpers/application_helper.rb +2 -2
  14. data/app/helpers/discussions_helper.rb +11 -4
  15. data/app/helpers/icons_helper.rb +1 -1
  16. data/app/helpers/menu_bar_helper.rb +7 -3
  17. data/app/helpers/notifications_helper.rb +13 -0
  18. data/app/helpers/time_zone_helper.rb +5 -0
  19. data/app/helpers/user_discussions_helper.rb +38 -0
  20. data/app/helpers/user_menu_helper.rb +4 -0
  21. data/app/mailers/user_mailer.rb +11 -1
  22. data/app/views/discussions/new.html.erb +1 -1
  23. data/app/views/layouts/_discussions.html.erb +1 -37
  24. data/app/views/layouts/_discussions_list.html.erb +38 -0
  25. data/app/views/layouts/_user_menu.html.erb +1 -0
  26. data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb +1 -1
  27. data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_files.html.erb +4 -4
  28. data/app/views/layouts/mailer.html.erb +7 -1
  29. data/app/views/notifications/_custom.html.erb +1 -0
  30. data/app/views/notifications/_dropdown.html.erb +2 -2
  31. data/app/views/notifications/_exam_authorization_request_updated.html.erb +2 -0
  32. data/app/views/notifications/_exam_registration.html.erb +2 -1
  33. data/app/views/notifications/previews/_custom.html.erb +1 -0
  34. data/app/views/notifications/previews/_discussion.html.erb +2 -0
  35. data/app/views/notifications/previews/_exam_authorization_request_updated.html.erb +2 -0
  36. data/app/views/notifications/previews/_exam_registration.html.erb +2 -0
  37. data/app/views/notifications/previews/_message.html.erb +2 -0
  38. data/app/views/user_mailer/1st_reminder.html.erb +7 -349
  39. data/app/views/user_mailer/1st_reminder.text.erb +0 -4
  40. data/app/views/user_mailer/2nd_reminder.html.erb +7 -349
  41. data/app/views/user_mailer/2nd_reminder.text.erb +0 -4
  42. data/app/views/user_mailer/3rd_reminder.html.erb +7 -349
  43. data/app/views/user_mailer/3rd_reminder.text.erb +0 -4
  44. data/app/views/user_mailer/_mail_template.erb +336 -0
  45. data/app/views/user_mailer/certificate.html.erb +7 -335
  46. data/app/views/user_mailer/certificate.text.erb +0 -3
  47. data/app/views/user_mailer/no_submissions_reminder.html.erb +7 -349
  48. data/app/views/user_mailer/no_submissions_reminder.text.erb +0 -4
  49. data/app/views/user_mailer/notification.html.erb +1 -0
  50. data/app/views/user_mailer/notification.text.erb +6 -0
  51. data/app/views/user_mailer/notifications/_custom.html.erb +11 -0
  52. data/app/views/user_mailer/notifications/_exam_authorization_request_updated.html.erb +1 -0
  53. data/app/views/user_mailer/notifications/_exam_registration.html.erb +7 -0
  54. data/app/views/user_mailer/notifications/exam_authorization_request_updated/_approved.html.erb +7 -0
  55. data/app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb +7 -0
  56. data/app/views/users/discussions.html.erb +19 -11
  57. data/app/views/users/manage_notifications.html.erb +26 -0
  58. data/app/views/users/notifications.html.erb +54 -0
  59. data/config/routes.rb +4 -0
  60. data/lib/mumuki/laboratory.rb +1 -0
  61. data/lib/mumuki/laboratory/controllers/notifications.rb +2 -2
  62. data/lib/mumuki/laboratory/locales/en.yml +45 -5
  63. data/lib/mumuki/laboratory/locales/es-CL.yml +46 -5
  64. data/lib/mumuki/laboratory/locales/es.yml +47 -7
  65. data/lib/mumuki/laboratory/locales/pt.yml +44 -4
  66. data/lib/mumuki/laboratory/mailers/message_delivery.rb +15 -0
  67. data/lib/mumuki/laboratory/version.rb +1 -1
  68. data/spec/controllers/users_controller_spec.rb +48 -0
  69. data/spec/dummy/db/schema.rb +7 -1
  70. data/spec/features/notifications_flow_spec.rb +2 -1
  71. data/spec/javascripts/editors-spec.js +21 -3
  72. data/spec/javascripts/submissions-store-spec.js +11 -0
  73. data/spec/mailers/previews/user_mailer_preview.rb +87 -1
  74. metadata +135 -116
  75. data/app/views/notifications/_discussion.html.erb +0 -1
  76. data/app/views/notifications/_exam_authorization_request.html.erb +0 -1
  77. data/app/views/notifications/_message.html.erb +0 -1
data/app/views/user_mailer/certificate.text.erb CHANGED
@@ -5,6 +5,3 @@
5
5
 
6
6
 
7
7
  © Copyright 2015-<%= Time.current.year %> Mumuki.
8
-
9
- <%= t :stop_emails? %>
10
- <%= t :cancel_subscription %>
data/app/views/user_mailer/no_submissions_reminder.html.erb CHANGED
@@ -1,349 +1,7 @@
1
- <span class="muMailPreviewText" style="display:none; font-size:0px; line-height:0px; max-height:0px; max-width:0px; opacity:0; overflow:hidden; visibility:hidden; mso-hide:all;"><%= t :dont_leave_us %></span><!--<![endif]-->
2
- <center>
3
- <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="bodyTable">
4
- <tbody><tr>
5
- <td align="center" valign="top" id="bodyCell">
6
- <!-- BEGIN TEMPLATE // -->
7
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
8
- <tbody><tr>
9
- <td align="center" valign="top" id="templateHeader" data-template-container="">
10
- <!--[if (gte mso 9)|(IE)]>
11
- <table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;">
12
- <tr>
13
- <td align="center" valign="top" width="600" style="width:600px;">
14
- <![endif]-->
15
- <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer">
16
- <tbody><tr>
17
- <td valign="top" class="headerContainer"><table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailTextBlock" style="min-width:100%;">
18
- <tbody class="muMailTextBlockOuter">
19
- <tr>
20
- <td valign="top" class="muMailTextBlockInner" style="padding-top:9px;">
21
- <!--[if mso]>
22
- <table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;">
23
- <tr>
24
- <![endif]-->
25
-
26
- <!--[if mso]>
27
- <td valign="top" width="600" style="width:600px;">
28
- <![endif]-->
29
- <table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="muMailTextContentContainer">
30
- <tbody><tr>
31
-
32
- <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
33
-
34
- <h1><span style="color:#FFFFFF"><%= t :we_miss_you %></span></h1>
35
-
36
- </td>
37
- </tr>
38
- </tbody></table>
39
- <!--[if mso]>
40
- </td>
41
- <![endif]-->
42
-
43
- <!--[if mso]>
44
- </tr>
45
- </table>
46
- <![endif]-->
47
- </td>
48
- </tr>
49
- </tbody>
50
- </table></td>
51
- </tr>
52
- </tbody></table>
53
- <!--[if (gte mso 9)|(IE)]>
54
- </td>
55
- </tr>
56
- </table>
57
- <![endif]-->
58
- </td>
59
- </tr>
60
- <tr>
61
- <td align="center" valign="top" id="templateBody" data-template-container="">
62
- <!--[if (gte mso 9)|(IE)]>
63
- <table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;">
64
- <tr>
65
- <td align="center" valign="top" width="600" style="width:600px;">
66
- <![endif]-->
67
- <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer">
68
- <tbody><tr>
69
- <td valign="top" class="bodyContainer"><table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailCaptionBlock">
70
- <tbody class="muMailCaptionBlockOuter">
71
- <tr>
72
- <td class="muMailCaptionBlockInner" valign="top" style="padding:9px;">
73
-
74
-
75
-
76
-
77
- <table border="0" cellpadding="0" cellspacing="0" class="muMailCaptionRightContentOuter" width="100%">
78
- <tbody><tr>
79
- <td valign="top" class="muMailCaptionRightContentInner" style="padding:0 9px ;">
80
- <table align="left" border="0" cellpadding="0" cellspacing="0" class="muMailCaptionRightImageContentContainer" width="264">
81
- <tbody><tr>
82
- <td class="muMailCaptionRightImageContent" align="center" valign="top">
83
-
84
-
85
-
86
- <img alt="" src="https://gallery.mailchimp.com/046b6c670d9f80ebd6c5d075b/images/225fe60f-780a-451e-90aa-afb01f88a1b4.png" width="159" style="max-width:159px;" class="muMailImage">
87
-
88
-
89
-
90
- </td>
91
- </tr>
92
- </tbody></table>
93
- <table class="muMailCaptionRightTextContentContainer" align="right" border="0" cellpadding="0" cellspacing="0" width="264">
94
- <tbody><tr>
95
- <td valign="top" class="muMailTextContent">
96
- <h3 class="null" style="text-align: center;"><br>
97
- <span style="font-size:24px"><%= t :you_never_submitted_solutions %></span></h3>
98
-
99
- <div style="text-align: center;"><br>
100
- <span style="font-size:16px"><%= t :dont_leave_us %></span></div>
101
-
102
- </td>
103
- </tr>
104
- </tbody></table>
105
- </td>
106
- </tr>
107
- </tbody></table>
108
-
109
-
110
-
111
-
112
- </td>
113
- </tr>
114
- </tbody>
115
- </table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailButtonBlock" style="min-width:100%;">
116
- <tbody class="muMailButtonBlockOuter">
117
- <tr>
118
- <td style="padding-top:0; padding-right:18px; padding-bottom:18px; padding-left:18px;" valign="top" align="center" class="muMailButtonBlockInner">
119
- <table border="0" cellpadding="0" cellspacing="0" class="muMailButtonContentContainer" style="border-collapse: separate !important;border-radius: 3px;background-color: #FF5B81;">
120
- <tbody>
121
- <tr>
122
- <td align="center" valign="middle" class="muMailButtonContent" style="font-family: Helvetica; font-size: 18px; padding: 18px;">
123
- <a class="muMailButton " title=<%= t :keep_learning %> href=<%= Mumukit::Platform.laboratory.organic_url @user.last_organization %> target="_self" style="font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;"><%= t :keep_learning %></a>
124
- </td>
125
- </tr>
126
- </tbody>
127
- </table>
128
- </td>
129
- </tr>
130
- </tbody>
131
- </table></td>
132
- </tr>
133
- </tbody></table>
134
- <!--[if (gte mso 9)|(IE)]>
135
- </td>
136
- </tr>
137
- </table>
138
- <![endif]-->
139
- </td>
140
- </tr>
141
- <tr>
142
- <td align="center" valign="top" id="templateFooter" data-template-container="">
143
- <!--[if (gte mso 9)|(IE)]>
144
- <table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;">
145
- <tr>
146
- <td align="center" valign="top" width="600" style="width:600px;">
147
- <![endif]-->
148
- <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer">
149
- <tbody><tr>
150
- <td valign="top" class="footerContainer"><table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailFollowBlock" style="min-width:100%;">
151
- <tbody class="muMailFollowBlockOuter">
152
- <tr>
153
- <td align="center" valign="top" style="padding:9px" class="muMailFollowBlockInner">
154
- <table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailFollowContentContainer" style="min-width:100%;">
155
- <tbody><tr>
156
- <td align="center" style="padding-left:9px;padding-right:9px;">
157
- <table border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width:100%;" class="muMailFollowContent">
158
- <tbody><tr>
159
- <td align="center" valign="top" style="padding-top:9px; padding-right:9px; padding-left:9px;">
160
- <table align="center" border="0" cellpadding="0" cellspacing="0">
161
- <tbody><tr>
162
- <td align="center" valign="top">
163
- <!--[if mso]>
164
- <table align="center" border="0" cellspacing="0" cellpadding="0">
165
- <tr>
166
- <![endif]-->
167
-
168
- <!--[if mso]>
169
- <td align="center" valign="top">
170
- <![endif]-->
171
-
172
-
173
- <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
174
- <tbody><tr>
175
- <td valign="top" style="padding-right:10px; padding-bottom:9px;" class="muMailFollowContentItemContainer">
176
- <table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailFollowContentItem">
177
- <tbody><tr>
178
- <td align="left" valign="middle" style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
179
- <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
180
- <tbody><tr>
181
-
182
- <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
183
- <a href="http://www.facebook.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-facebook-48.png" style="display:block;" height="24" width="24" class=""></a>
184
- </td>
185
-
186
-
187
- </tr>
188
- </tbody></table>
189
- </td>
190
- </tr>
191
- </tbody></table>
192
- </td>
193
- </tr>
194
- </tbody></table>
195
-
196
- <!--[if mso]>
197
- </td>
198
- <![endif]-->
199
-
200
- <!--[if mso]>
201
- <td align="center" valign="top">
202
- <![endif]-->
203
-
204
-
205
- <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
206
- <tbody><tr>
207
- <td valign="top" style="padding-right:10px; padding-bottom:9px;" class="muMailFollowContentItemContainer">
208
- <table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailFollowContentItem">
209
- <tbody><tr>
210
- <td align="left" valign="middle" style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
211
- <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
212
- <tbody><tr>
213
-
214
- <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
215
- <a href="http://www.twitter.com/MumukiOrg" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-twitter-48.png" style="display:block;" height="24" width="24" class=""></a>
216
- </td>
217
-
218
-
219
- </tr>
220
- </tbody></table>
221
- </td>
222
- </tr>
223
- </tbody></table>
224
- </td>
225
- </tr>
226
- </tbody></table>
227
-
228
- <!--[if mso]>
229
- </td>
230
- <![endif]-->
231
-
232
- <!--[if mso]>
233
- <td align="center" valign="top">
234
- <![endif]-->
235
-
236
-
237
- <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
238
- <tbody><tr>
239
- <td valign="top" style="padding-right:0; padding-bottom:9px;" class="muMailFollowContentItemContainer">
240
- <table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailFollowContentItem">
241
- <tbody><tr>
242
- <td align="left" valign="middle" style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
243
- <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
244
- <tbody><tr>
245
-
246
- <td align="center" valign="middle" width="24" class="muMailFollowIconContent">
247
- <a href="https://www.youtube.com/channel/UCQmkknsaTT2TDLT_-MDSGvQ" target="_blank"><img src="https://cdn-images.mailchimp.com/icons/social-block-v2/outline-light-youtube-48.png" style="display:block;" height="24" width="24" class=""></a>
248
- </td>
249
-
250
-
251
- </tr>
252
- </tbody></table>
253
- </td>
254
- </tr>
255
- </tbody></table>
256
- </td>
257
- </tr>
258
- </tbody></table>
259
-
260
- <!--[if mso]>
261
- </td>
262
- <![endif]-->
263
-
264
- <!--[if mso]>
265
- </tr>
266
- </table>
267
- <![endif]-->
268
- </td>
269
- </tr>
270
- </tbody></table>
271
- </td>
272
- </tr>
273
- </tbody></table>
274
- </td>
275
- </tr>
276
- </tbody></table>
277
-
278
- </td>
279
- </tr>
280
- </tbody>
281
- </table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailDividerBlock" style="min-width:100%;">
282
- <tbody class="muMailDividerBlockOuter">
283
- <tr>
284
- <td class="muMailDividerBlockInner" style="min-width:100%; padding:18px;">
285
- <table class="muMailDividerContent" border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width: 100%;border-top: 2px solid #505050;">
286
- <tbody><tr>
287
- <td>
288
- <span></span>
289
- </td>
290
- </tr>
291
- </tbody></table>
292
- <!--
293
- <td class="muMailDividerBlockInner" style="padding: 18px;">
294
- <hr class="muMailDividerContent" style="border-bottom-color:none; border-left-color:none; border-right-color:none; border-bottom-width:0; border-left-width:0; border-right-width:0; margin-top:0; margin-right:0; margin-bottom:0; margin-left:0;" />
295
- -->
296
- </td>
297
- </tr>
298
- </tbody>
299
- </table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="muMailTextBlock" style="min-width:100%;">
300
- <tbody class="muMailTextBlockOuter">
301
- <tr>
302
- <td valign="top" class="muMailTextBlockInner" style="padding-top:9px;">
303
- <!--[if mso]>
304
- <table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;">
305
- <tr>
306
- <![endif]-->
307
-
308
- <!--[if mso]>
309
- <td valign="top" width="600" style="width:600px;">
310
- <![endif]-->
311
- <table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="muMailTextContentContainer">
312
- <tbody><tr>
313
-
314
- <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
315
-
316
- © Copyright 2015-<%= Time.current.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki</a><em>.</em><br>
317
- <br>
318
- <%= t :stop_emails? %><br>
319
- <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>
320
- </td>
321
- </tr>
322
- </tbody></table>
323
- <!--[if mso]>
324
- </td>
325
- <![endif]-->
326
-
327
- <!--[if mso]>
328
- </tr>
329
- </table>
330
- <![endif]-->
331
- </td>
332
- </tr>
333
- </tbody>
334
- </table></td>
335
- </tr>
336
- </tbody></table>
337
- <!--[if (gte mso 9)|(IE)]>
338
- </td>
339
- </tr>
340
- </table>
341
- <![endif]-->
342
- </td>
343
- </tr>
344
- </tbody></table>
345
- <!-- // END TEMPLATE -->
346
- </td>
347
- </tr>
348
- </tbody></table>
349
- </center>
1
+ <%= render partial: 'user_mailer/mail_template', locals: {
2
+ title: t(:we_miss_you),
3
+ subtitle: t(:dont_leave_us),
4
+ text: t(:you_never_submitted_solutions),
5
+ button: t(:keep_learning),
6
+ url: Mumukit::Platform.laboratory.organic_url(@user.last_organization)
7
+ } %>
data/app/views/user_mailer/no_submissions_reminder.text.erb CHANGED
@@ -4,10 +4,6 @@
4
4
  <%= t :you_never_submitted_solutions %>
5
5
 
6
6
  <%= t :dont_leave_us %>
7
- <%= t :keep_learning %>
8
7
 
9
8
 
10
9
  © Copyright 2015-<%= Time.current.year %> Mumuki.
11
-
12
- <%= t :stop_emails? %>
13
- <%= t :cancel_subscription %>
data/app/views/user_mailer/notification.html.erb ADDED
@@ -0,0 +1 @@
1
+ <%= render partial: "user_mailer/notifications/#{@notification.subject}" %>
data/app/views/user_mailer/notification.text.erb ADDED
@@ -0,0 +1,6 @@
1
+ <%= t :you_have_a_new_notification %>
2
+
3
+ <%= render(partial: "notifications/#{@notification.subject}", locals: { notification: @notification }) %>
4
+
5
+
6
+ © Copyright 2015-<%= Time.current.year %> Mumuki.
data/app/views/user_mailer/notifications/_custom.html.erb ADDED
@@ -0,0 +1,11 @@
1
+ <% if @notification.custom_content_html.present? %>
2
+ <%= render inline: @notification.custom_content_html %>
3
+ <% else %>
4
+ <%= render partial: 'user_mailer/mail_template', locals: {
5
+ title: t("mailer.title.custom"),
6
+ subtitle: '',
7
+ text: @notification.custom_content_plain_text,
8
+ button: t("mailer.button.custom"),
9
+ url: @organization.url_for('/user/notifications')
10
+ } %>
11
+ <% end %>
data/app/views/user_mailer/notifications/_exam_authorization_request_updated.html.erb ADDED
@@ -0,0 +1 @@
1
+ <%= render partial: "user_mailer/notifications/exam_authorization_request_updated/#{@notification.target.status}" %>
data/app/views/user_mailer/notifications/_exam_registration.html.erb ADDED
@@ -0,0 +1,7 @@
1
+ <%= render partial: 'user_mailer/mail_template', locals: {
2
+ title: t("mailer.title.exam_registration"),
3
+ subtitle: t("mailer.subtitle.exam_registration"),
4
+ text: t("mailer.text.exam_registration", exam_registration_deadline: local_time(@notification.target.end_time, @organization.time_zone)),
5
+ button: t("mailer.button.exam_registration"),
6
+ url: exam_registration_url(@organization, @notification.target)
7
+ } %>
data/app/views/user_mailer/notifications/exam_authorization_request_updated/_approved.html.erb ADDED
@@ -0,0 +1,7 @@
1
+ <%= render partial: 'user_mailer/mail_template', locals: {
2
+ title: t(:congratulations),
3
+ subtitle: t('mailer.subtitle.exam_authorization_request_approved'),
4
+ text: t('mailer.text.exam_authorization_request_approved', exam_start_date: local_time(@notification.target.exam.start_time, @organization.time_zone)),
5
+ button: t('mailer.button.exam_authorization_request_approved'),
6
+ url: @organization.url
7
+ } %>
data/app/views/user_mailer/notifications/exam_authorization_request_updated/_rejected.html.erb ADDED
@@ -0,0 +1,7 @@
1
+ <%= render partial: 'user_mailer/mail_template', locals: {
2
+ title: t("mailer.title.exam_authorization_request_rejected"),
3
+ subtitle: t("mailer.subtitle.exam_authorization_request_rejected"),
4
+ text: t("mailer.text.exam_authorization_request_rejected"),
5
+ button: t("mailer.button.exam_authorization_request_rejected"),
6
+ url: @organization.url_for('/user/exam_authorizations')
7
+ } %>
data/app/views/users/discussions.html.erb CHANGED
@@ -14,17 +14,25 @@
14
14
  <%= t :discussions_will_be_here %>
15
15
  </div>
16
16
  <% else %>
17
- <table class="table table-striped">
18
- <% @watched_discussions.each do |discussion| %>
19
- <tr>
20
- <td>
21
- <%= icon_for_read(discussion.read_by?(@user)) %>
22
- </td>
23
- <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
24
- <td><%= time_ago_in_words discussion.last_message_date %></td>
25
- </tr>
26
- <% end %>
27
- </table>
17
+ <div class="table-responsive mb-3">
18
+ <table class="table">
19
+ <% @watched_discussions.each do |discussion| %>
20
+ <% if discussion.read_by?(@user) != @last_read %>
21
+ <%= user_discussions_table_title(discussion, @user, @last_read) %>
22
+ <% @last_read = discussion.read_by?(@user) %>
23
+
24
+ <%= user_discussions_table_header %>
25
+ <% end %>
26
+
27
+ <%= user_discussions_table_item(discussion, @user) %>
28
+ <% end %>
29
+ </table>
30
+ </div>
31
+
32
+ <div class="discussion-pagination">
33
+ <%= paginate @watched_discussions, nav_class: 'pagination' %>
34
+ </div>
35
+
28
36
  <% end %>
29
37
  </div>
30
38
  </div>