mumuki-laboratory 7.6.0 → 7.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +184 -2
- data/app/assets/javascripts/mumuki_laboratory/application.js +0 -1
- data/app/assets/javascripts/mumuki_laboratory/application/assets-loader.js +1 -1
- data/app/assets/javascripts/mumuki_laboratory/application/bridge.js +36 -10
- data/app/assets/javascripts/mumuki_laboratory/application/button.js +90 -1
- data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js +1 -0
- data/app/assets/javascripts/mumuki_laboratory/application/custom-editor.js +46 -4
- data/app/assets/javascripts/mumuki_laboratory/application/discussions.js +14 -13
- data/app/assets/javascripts/mumuki_laboratory/application/kids.js +73 -36
- data/app/assets/javascripts/mumuki_laboratory/application/progress.js +3 -0
- data/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js +51 -0
- data/app/assets/javascripts/mumuki_laboratory/application/submission.js +184 -35
- data/app/assets/stylesheets/mumuki_laboratory/application/_modules.scss +1 -0
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_discussion.scss +43 -4
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kids.scss +3 -3
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kindergarten.scss +55 -0
- data/app/controllers/assets_controller.rb +2 -0
- data/app/controllers/concerns/with_authorization.rb +4 -0
- data/app/controllers/discussions_controller.rb +5 -0
- data/app/controllers/discussions_messages_controller.rb +9 -1
- data/app/controllers/exercise_solutions_controller.rb +4 -2
- data/app/helpers/application_helper.rb +9 -5
- data/app/helpers/discussions_helper.rb +30 -20
- data/app/helpers/exercise_input_helper.rb +1 -1
- data/app/helpers/icons_helper.rb +3 -3
- data/app/views/book_discussions/index.html.erb +3 -3
- data/app/views/discussions/_message.html.erb +8 -3
- data/app/views/discussions/index.html.erb +0 -1
- data/app/views/discussions/new.html.erb +33 -0
- data/app/views/discussions/show.html.erb +12 -42
- data/app/views/exercise_solutions/_contextualization_results_container.html.erb +1 -1
- data/app/views/exercise_solutions/_results_title.html.erb +2 -2
- data/app/views/exercises/_read_only.html.erb +33 -6
- data/app/views/layouts/_discussions.html.erb +19 -1
- data/app/views/layouts/_social_media.html.erb +3 -3
- data/app/views/layouts/_test_results.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/editors/_custom.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/layouts/_input_bottom.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/layouts/_input_kindergarten.html.erb +40 -0
- data/app/views/layouts/exercise_inputs/layouts/{_input_kids.html.erb → _input_primary.html.erb} +1 -1
- data/app/views/layouts/exercise_inputs/layouts/_input_right.html.erb +1 -1
- data/app/views/layouts/modals/_kids_context.html.erb +1 -8
- data/app/views/user_mailer/1st_reminder.html.erb +2 -2
- data/app/views/user_mailer/2nd_reminder.html.erb +2 -2
- data/app/views/user_mailer/3rd_reminder.html.erb +2 -2
- data/app/views/user_mailer/no_submissions_reminder.html.erb +2 -2
- data/config/routes.rb +2 -1
- data/lib/mumuki/laboratory/controllers/results_rendering.rb +1 -2
- data/lib/mumuki/laboratory/locales/en.yml +5 -0
- data/lib/mumuki/laboratory/locales/es.yml +5 -0
- data/lib/mumuki/laboratory/locales/pt.yml +5 -2
- data/lib/mumuki/laboratory/version.rb +1 -1
- data/spec/controllers/confirmations_controller_spec.rb +1 -1
- data/spec/controllers/exercise_solutions_controller_spec.rb +41 -6
- data/spec/dummy/db/schema.rb +11 -1
- data/spec/features/exercise_flow_spec.rb +1 -1
- data/spec/helpers/breadcrumbs_helper_spec.rb +1 -1
- metadata +10 -9
- data/app/views/layouts/modals/_new_discussion.html.erb +0 -27
- data/vendor/assets/javascripts/hotjar.js +0 -8
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
<%= content_for :breadcrumbs do %>
|
|
2
|
+
<%= breadcrumbs_for_discussion @discussion, @debatable %>
|
|
3
|
+
<% end %>
|
|
4
|
+
|
|
5
|
+
<%= form_for [@debatable, @discussion] do |f| %>
|
|
6
|
+
<div>
|
|
7
|
+
<div class="discussion-context">
|
|
8
|
+
<%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
|
|
9
|
+
</div>
|
|
10
|
+
</div>
|
|
11
|
+
|
|
12
|
+
<hr class="message-divider">
|
|
13
|
+
|
|
14
|
+
<%= render layout: 'discussions/message_container', locals: {user: @discussion.initiator} do %>
|
|
15
|
+
<div class="discussion-message-bubble" id="new-discussion-description-container">
|
|
16
|
+
<div class="discussion-message-bubble-header">
|
|
17
|
+
<div class="discussion-message-bubble-title">
|
|
18
|
+
<%= @discussion.initiator.name %>
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
21
|
+
<div class="discussion-message-bubble-content">
|
|
22
|
+
<div class="container-fluid">
|
|
23
|
+
<div class="row">
|
|
24
|
+
<div class="discussion-new-message-content">
|
|
25
|
+
<%= f.editor :description, '', {id: 'new-discussion-message', class: 'form-control', placeholder: t(:discussion_description_placeholder)} %>
|
|
26
|
+
</div>
|
|
27
|
+
</div>
|
|
28
|
+
</div>
|
|
29
|
+
</div>
|
|
30
|
+
</div>
|
|
31
|
+
<%= f.submit t(:save), class: 'btn btn-success btn-block discussion-new-message-button' %>
|
|
32
|
+
<% end %>
|
|
33
|
+
<% end %>
|
|
@@ -3,55 +3,25 @@
|
|
|
3
3
|
<% end %>
|
|
4
4
|
|
|
5
5
|
<div>
|
|
6
|
-
<div class="row">
|
|
7
|
-
<% if current_user %>
|
|
8
|
-
<div class="mu-inline-block-right hidden-xs discussion-user-menu">
|
|
9
|
-
<h3>
|
|
10
|
-
<% if @discussion.subscribable? %>
|
|
11
|
-
<a class="discussion-subscription" onclick="mumuki.Forum.discussionSubscription('<%= subscription_discussion_url(@discussion) %>')">
|
|
12
|
-
<%= fa_icon(:eye, class: 'fa-xs') %>
|
|
13
|
-
<%= span_toggle t(:subscribe), t(:unsubscribe), current_user.subscribed_to?(@discussion) %>
|
|
14
|
-
</a>
|
|
15
|
-
<% end %>
|
|
16
|
-
<% if @discussion.solved? %>
|
|
17
|
-
<a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
|
|
18
|
-
<%= fa_icon(:star, class: 'fa-xs') %>
|
|
19
|
-
<%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion) %>
|
|
20
|
-
</a>
|
|
21
|
-
<% end %>
|
|
22
|
-
</h3>
|
|
23
|
-
</div>
|
|
24
|
-
<% end %>
|
|
25
|
-
<div class="mu-inline-block-left">
|
|
26
|
-
<div class="discussion-header">
|
|
27
|
-
<h3 class="discussion-title">
|
|
28
|
-
<%= @discussion.title %>
|
|
29
|
-
</h3>
|
|
30
|
-
</div>
|
|
31
|
-
<div class="discussion-description">
|
|
32
|
-
<%= label_for_contextualization(@discussion) %> ·
|
|
33
|
-
<span class="discussion-info">
|
|
34
|
-
<span class="discussion-initiator-name">
|
|
35
|
-
<%= @discussion.initiator.name %>
|
|
36
|
-
</span>
|
|
37
|
-
<%= discussion_info(@discussion) %>
|
|
38
|
-
</span>
|
|
39
|
-
</div>
|
|
40
|
-
</div>
|
|
41
|
-
</div>
|
|
42
|
-
|
|
43
6
|
<div class="discussion-context">
|
|
44
7
|
<%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
|
|
45
8
|
</div>
|
|
46
|
-
|
|
47
9
|
</div>
|
|
48
10
|
|
|
49
11
|
<% if @discussion.has_messages? || @discussion.commentable_by?(current_user) %>
|
|
50
|
-
<
|
|
12
|
+
<div>
|
|
13
|
+
<h3>
|
|
14
|
+
<%= t :messages %>
|
|
15
|
+
<% if @discussion.last_moderator_access_visible_for?(current_user) %>
|
|
16
|
+
<small class="pull-right">
|
|
17
|
+
<span><%= t :last_seen, name: @discussion.last_moderator_access_by.full_name %></span>
|
|
18
|
+
<span><%= t :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %></span>
|
|
19
|
+
</small>
|
|
20
|
+
<% end %>
|
|
21
|
+
</h3>
|
|
22
|
+
</div>
|
|
51
23
|
|
|
52
|
-
<
|
|
53
|
-
<%= t :messages %>
|
|
54
|
-
</h3>
|
|
24
|
+
<hr class="message-divider">
|
|
55
25
|
|
|
56
26
|
<% if @discussion.has_messages? %>
|
|
57
27
|
<div class="discussion-messages">
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization}" %>">
|
|
1
|
+
<div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization.submission_status}" %>">
|
|
2
2
|
<%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
|
|
3
3
|
<%= yield %>
|
|
4
4
|
</div>
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
<h4 class="text-<%= icon_class_for(contextualization) %>">
|
|
2
|
-
<strong><%= fa_icon icon_type_for(contextualization) %> <%= t_contextualization_status contextualization %></strong>
|
|
1
|
+
<h4 class="text-<%= icon_class_for(contextualization.submission_status) %>">
|
|
2
|
+
<strong><%= fa_icon icon_type_for(contextualization.submission_status) %> <%= t_contextualization_status contextualization %></strong>
|
|
3
3
|
</h4>
|
|
@@ -9,13 +9,40 @@
|
|
|
9
9
|
|
|
10
10
|
<details open>
|
|
11
11
|
<summary class="discussion-summary">
|
|
12
|
-
<div class="mu-inline-block-right hidden-xs">
|
|
13
|
-
<h1><%= language_icon @debatable.language %></h1>
|
|
14
|
-
</div>
|
|
15
12
|
<h3 class="discussion-exercise-title">
|
|
16
|
-
<span
|
|
17
|
-
|
|
13
|
+
<span>
|
|
14
|
+
<span class="hidden-xs"><%= t(:exercise_number, number: exercise.number) %>: </span>
|
|
15
|
+
<span><%= exercise.name %></span>
|
|
16
|
+
</span>
|
|
17
|
+
<span class="mu-inline-block-right hidden-xs">
|
|
18
|
+
<h1 class="no-margin"><%= language_icon exercise.language %></h1>
|
|
19
|
+
</span>
|
|
18
20
|
</h3>
|
|
21
|
+
<div class="discussion-description">
|
|
22
|
+
<%= label_for_contextualization(@discussion, class: 'hidden-xs') %> ·
|
|
23
|
+
<span class="discussion-info">
|
|
24
|
+
<span class="discussion-initiator-name">
|
|
25
|
+
<%= @discussion.initiator.name %>
|
|
26
|
+
</span>
|
|
27
|
+
<span class="hidden-xs"><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
|
|
28
|
+
</span>
|
|
29
|
+
<% if current_user && @discussion.persisted? %>
|
|
30
|
+
<span class="mu-inline-block-right discussion-user-menu no-margin">
|
|
31
|
+
<% if @discussion.subscribable? %>
|
|
32
|
+
<a class="discussion-subscription" onclick="mumuki.Forum.discussionSubscription('<%= subscription_discussion_url(@discussion) %>')">
|
|
33
|
+
<%= fa_icon(:eye, class: 'fa-xs') %>
|
|
34
|
+
<%= span_toggle t(:subscribe), t(:unsubscribe), current_user.subscribed_to?(@discussion), class: 'hidden-sm hidden-xs' %>
|
|
35
|
+
</a>
|
|
36
|
+
<% end %>
|
|
37
|
+
<% if @discussion.solved? %>
|
|
38
|
+
<a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
|
|
39
|
+
<%= fa_icon('thumbs-o-up', class: 'fa-xs') %>
|
|
40
|
+
<%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion), class: 'hidden-sm hidden-xs' %>
|
|
41
|
+
</a>
|
|
42
|
+
<% end %>
|
|
43
|
+
</span>
|
|
44
|
+
<% end %>
|
|
45
|
+
</div>
|
|
19
46
|
</summary>
|
|
20
47
|
|
|
21
48
|
<% if should_render_read_only_exercise_tabs?(@discussion) %>
|
|
@@ -64,7 +91,7 @@
|
|
|
64
91
|
|
|
65
92
|
<div role="tabpanel" class="tab-pane" id="results">
|
|
66
93
|
<div class="mu-tab-body">
|
|
67
|
-
<%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion
|
|
94
|
+
<%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion} do %>
|
|
68
95
|
<div class="row">
|
|
69
96
|
<div class="col-md-12 submission-results">
|
|
70
97
|
<%= render partial: 'exercise_solutions/contextualization_results_body',
|
|
@@ -20,6 +20,14 @@
|
|
|
20
20
|
<%= discussion_dropdown_filter :sort, Discussion.sorting_filters do |sorting_filter| %>
|
|
21
21
|
<%= t sorting_filter %>
|
|
22
22
|
<% end %>
|
|
23
|
+
|
|
24
|
+
<% if current_user&.moderator_here? %>
|
|
25
|
+
<div class="discussion-requires-attention pull-right">
|
|
26
|
+
<%= label_tag :requires_moderator_response, t(:requires_attention) %>
|
|
27
|
+
<%= check_box_tag :requires_moderator_response, true, discussion_filter_params[:requires_moderator_response], class: 'form-input', onclick: 'mumuki.Forum.discussionsToggleCheckbox($(this))' %>
|
|
28
|
+
</div>
|
|
29
|
+
<% end %>
|
|
30
|
+
|
|
23
31
|
</div>
|
|
24
32
|
</div>
|
|
25
33
|
<% if @filtered_discussions.empty? %>
|
|
@@ -48,7 +56,17 @@
|
|
|
48
56
|
<span class="discussion-status-icon">
|
|
49
57
|
<%= discussion_status_fa_icon(discussion) %>
|
|
50
58
|
</span>
|
|
51
|
-
|
|
59
|
+
<span class="hidden-sm hidden-xs"><%= discussion.exercise.friendly %></span>
|
|
60
|
+
<span class="hidden-md hidden-lg"><%= discussion.exercise.name %></span>
|
|
61
|
+
<% if discussion.last_moderator_access_visible_for?(current_user) %>
|
|
62
|
+
<div class="pull-right discussion-moderator-access" >
|
|
63
|
+
<%= profile_picture_for(discussion.last_moderator_access_by, 32) %>
|
|
64
|
+
<span class="moderator-initials">
|
|
65
|
+
<%= discussion.last_moderator_access_by.name_initials %>
|
|
66
|
+
</span>
|
|
67
|
+
</div>
|
|
68
|
+
<% end %>
|
|
69
|
+
|
|
52
70
|
</div>
|
|
53
71
|
<span class="discussion-description">
|
|
54
72
|
<%= discussion.description %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/
|
|
2
|
-
<a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/
|
|
1
|
+
<a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiOrg" target="_blank"></a>
|
|
2
|
+
<a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiOrg" target="_blank"></a>
|
|
3
3
|
<a class="fa fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
|
|
4
|
-
<a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/
|
|
4
|
+
<a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumukiorg" target="_blank"></a>
|
|
@@ -4,4 +4,4 @@
|
|
|
4
4
|
|
|
5
5
|
<%= form.hidden_field :content, id: "mu-custom-editor-value", value: @current_content %>
|
|
6
6
|
<%= form.hidden_field :content_extra, id: "mu-custom-editor-extra", value: @exercise.extra %>
|
|
7
|
-
<%= form.hidden_field :
|
|
7
|
+
<%= form.hidden_field :content_test, id: "mu-custom-editor-test", value: @exercise.test %>
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
<i class="fa fa-expand fa-stack-1x"></i>
|
|
34
34
|
</span>
|
|
35
35
|
</a>
|
|
36
|
-
|
|
36
|
+
<!--<a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a> -->
|
|
37
37
|
</div>
|
|
38
38
|
|
|
39
39
|
</div>
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
html: {role: 'form', class: 'new_solution mu-editor mu-editor-overlap'}) do |f| %>
|
|
4
4
|
<%= render_exercise_input_editor f, exercise %>
|
|
5
5
|
|
|
6
|
-
<div class="actions mu-kids-submit-button">
|
|
6
|
+
<div class="actions mu-submit-button mu-kids-submit-button">
|
|
7
7
|
<%= render_submit_button(@assignment) %>
|
|
8
8
|
</div>
|
|
9
9
|
<div class="actions mu-kids-reset-button"></div>
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap #{pending_messages_filter(@assignment)}"}) do |f| %>
|
|
34
34
|
<%= render_exercise_input_editor f, exercise %>
|
|
35
35
|
|
|
36
|
-
<div class="actions">
|
|
36
|
+
<div class="actions mu-submit-button">
|
|
37
37
|
<%= render_submit_button(@assignment) %>
|
|
38
38
|
</div>
|
|
39
39
|
<% end %>
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
<% content_for :no_container do %>
|
|
2
|
+
|
|
3
|
+
<div <%= turbolinks_enable_for exercise %>>
|
|
4
|
+
|
|
5
|
+
<div class="mu-kids-landscape-support container-fluid">
|
|
6
|
+
<img class="mu-kids-character-animation"/>
|
|
7
|
+
<h3><%= t :only_landscape_support %></h3>
|
|
8
|
+
</div>
|
|
9
|
+
|
|
10
|
+
<div class="mu-kids-exercise mu-kindergarten container-fluid">
|
|
11
|
+
|
|
12
|
+
<div class="mu-kids-exercise-description mu-kids-exercise-description-fixed">
|
|
13
|
+
<div class="mu-kids-character">
|
|
14
|
+
<%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
|
|
15
|
+
</div>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="mu-kids-exercise-workspace">
|
|
18
|
+
<div class="mu-exercise-content mu-kids-blocks">
|
|
19
|
+
<%= yield :exercise_content %>
|
|
20
|
+
</div>
|
|
21
|
+
<div class="mu-kids-states mu-kids-single-state mu-multiple-scenarios">
|
|
22
|
+
<div class="mu-scenarios">
|
|
23
|
+
<div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
|
|
24
|
+
<div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
|
|
25
|
+
</div>
|
|
26
|
+
<div class="mu-kids-state mu-state-final mu-final-state">
|
|
27
|
+
<div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
|
|
28
|
+
</div>
|
|
29
|
+
</div>
|
|
30
|
+
<ol class="indicators"></ol>
|
|
31
|
+
</div>
|
|
32
|
+
</div>
|
|
33
|
+
</div>
|
|
34
|
+
|
|
35
|
+
<%= render partial: 'layouts/modals/kids_results', locals: {exercise: exercise, assignment: @assignment} %>
|
|
36
|
+
<%= render partial: 'layouts/modals/kids_results_aborted' %>
|
|
37
|
+
<%= render partial: 'layouts/modals/kids_context', locals: {exercise: exercise, assignment: @assignment} %>
|
|
38
|
+
|
|
39
|
+
</div>
|
|
40
|
+
<% end %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<div class="modal fade mu-kids-context" id="kids-context" tabindex="-1" role="dialog" aria-hidden="true">
|
|
1
|
+
<div class="modal fade mu-kids-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
|
|
2
2
|
<div class="modal-dialog">
|
|
3
3
|
<div class="modal-content">
|
|
4
4
|
<div class="modal-header">
|
|
@@ -24,10 +24,3 @@
|
|
|
24
24
|
</div>
|
|
25
25
|
</div>
|
|
26
26
|
</div>
|
|
27
|
-
|
|
28
|
-
<script>
|
|
29
|
-
$('#kids-context').modal({
|
|
30
|
-
backdrop: 'static',
|
|
31
|
-
keyboard: false
|
|
32
|
-
});
|
|
33
|
-
</script>
|
|
@@ -180,7 +180,7 @@
|
|
|
180
180
|
<tbody><tr>
|
|
181
181
|
|
|
182
182
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
183
|
-
<a href="http://www.facebook.com/
|
|
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
184
|
</td>
|
|
185
185
|
|
|
186
186
|
|
|
@@ -212,7 +212,7 @@
|
|
|
212
212
|
<tbody><tr>
|
|
213
213
|
|
|
214
214
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
215
|
-
<a href="http://www.twitter.com/
|
|
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
216
|
</td>
|
|
217
217
|
|
|
218
218
|
|
|
@@ -180,7 +180,7 @@
|
|
|
180
180
|
<tbody><tr>
|
|
181
181
|
|
|
182
182
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
183
|
-
<a href="http://www.facebook.com/
|
|
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
184
|
</td>
|
|
185
185
|
|
|
186
186
|
|
|
@@ -212,7 +212,7 @@
|
|
|
212
212
|
<tbody><tr>
|
|
213
213
|
|
|
214
214
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
215
|
-
<a href="http://www.twitter.com/
|
|
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
216
|
</td>
|
|
217
217
|
|
|
218
218
|
|
|
@@ -180,7 +180,7 @@
|
|
|
180
180
|
<tbody><tr>
|
|
181
181
|
|
|
182
182
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
183
|
-
<a href="http://www.facebook.com/
|
|
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
184
|
</td>
|
|
185
185
|
|
|
186
186
|
|
|
@@ -212,7 +212,7 @@
|
|
|
212
212
|
<tbody><tr>
|
|
213
213
|
|
|
214
214
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
215
|
-
<a href="http://www.twitter.com/
|
|
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
216
|
</td>
|
|
217
217
|
|
|
218
218
|
|
|
@@ -180,7 +180,7 @@
|
|
|
180
180
|
<tbody><tr>
|
|
181
181
|
|
|
182
182
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
183
|
-
<a href="http://www.facebook.com/
|
|
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
184
|
</td>
|
|
185
185
|
|
|
186
186
|
|
|
@@ -212,7 +212,7 @@
|
|
|
212
212
|
<tbody><tr>
|
|
213
213
|
|
|
214
214
|
<td align="center" valign="middle" width="24" class="muMailFollowIconContent">
|
|
215
|
-
<a href="http://www.twitter.com/
|
|
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
216
|
</td>
|
|
217
217
|
|
|
218
218
|
|
data/config/routes.rb
CHANGED
|
@@ -6,7 +6,7 @@ Rails.application.routes.draw do
|
|
|
6
6
|
root to: 'book#show'
|
|
7
7
|
|
|
8
8
|
concern :debatable do |options|
|
|
9
|
-
resources :discussions, options.merge(only: [:index, :show, :create, :update, :destroy]) do
|
|
9
|
+
resources :discussions, options.merge(only: [:index, :new, :show, :create, :update, :destroy]) do
|
|
10
10
|
post :subscription, on: :member
|
|
11
11
|
post :upvote, on: :member
|
|
12
12
|
end
|
|
@@ -17,6 +17,7 @@ Rails.application.routes.draw do
|
|
|
17
17
|
resources :discussions, only: [] do
|
|
18
18
|
resources :messages, only: [:create, :destroy], controller: 'discussions_messages' do
|
|
19
19
|
post :approve, on: :member
|
|
20
|
+
post :question, on: :member
|
|
20
21
|
end
|
|
21
22
|
end
|
|
22
23
|
|