diff --git a/common/static/common/js/discussion/discussion.js b/common/static/common/js/discussion/discussion.js index 5e245d1464ea..d1897ef3dca7 100644 --- a/common/static/common/js/discussion/discussion.js +++ b/common/static/common/js/discussion/discussion.js @@ -223,3 +223,63 @@ }(Backbone.Collection)); } }).call(window); + + +// Table Resizing +var orgTable; +var $clone; +var resizeTimer; +var resized = false; + +$(window).load(function() +{ + // Save default table layout + orgTable = $('#helperTable').html(); + if (localStorage.getItem("discussionHelperTable") == null) + { + localStorage.setItem("discussionHelperTable", orgTable); + } + // Update table + renderTable(); +}); + +// Update on window resize +$( window ).resize(function(e) +{ + clearTimeout(resizeTimer); + resizeTimer = setTimeout(function() {renderTable()},150); +}); + +// Update for smaller window size +function renderTable() +{ + if ($(window).width() < 600 && !resized) + { + var replaceHTML = ""; + resized = true; + + $('.helpgrid-row').each( + function() + { + replaceHTML = ""; + var headerHTML = $(this).find("th").html(); + + + $(this).find("td").each( + function() + { + replaceHTML += '
'; + replaceHTML += $(this).html(); + }); + replaceHTML += '
'; + + $(this).html('' + headerHTML + ' ' + replaceHTML + ''); + }); + } + else + { + orgTable = localStorage.getItem("discussionHelperTable"); + $("#helperTable").html(orgTable); + resized = false; + } +} diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py index bda94fcb57e1..717725b2f845 100644 --- a/lms/djangoapps/courseware/tests/test_views.py +++ b/lms/djangoapps/courseware/tests/test_views.py @@ -2170,6 +2170,7 @@ def test_user_with_passing_grade(self, mock_is_course_passed): 'category': 'certificates', 'label': unicode(self.course.id) }, + send_to_track=True, user=self.student ) mock_tracker.reset_mock() diff --git a/lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore b/lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore index 6a55a377065f..2189eb3596ef 100644 --- a/lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore +++ b/lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore @@ -13,7 +13,7 @@ {platform_name: window.PLATFORM_NAME}, true ) %> - +
<%- gettext("Find discussions") %> @@ -46,7 +46,7 @@
<%- gettext('Receive updates') %> - + - <%- gettext("Check this box to receive an email digest once a day notifying you about new, unread activity from posts you are following.") %> +
<%- gettext("Check this box to receive an email digest once a day notifying you about new, unread activity from posts you are following.") %>
diff --git a/lms/djangoapps/discussion/tests/test_tasks.py b/lms/djangoapps/discussion/tests/test_tasks.py index 4446d6680a97..b51cab24763d 100644 --- a/lms/djangoapps/discussion/tests/test_tasks.py +++ b/lms/djangoapps/discussion/tests/test_tasks.py @@ -329,4 +329,5 @@ def test_track_notification_sent(self, context, test_props): user_id=context['thread_author_id'], event_name='edx.bi.email.sent', properties=test_props, + send_to_track=True ) diff --git a/lms/djangoapps/shoppingcart/models.py b/lms/djangoapps/shoppingcart/models.py index 71a305ea2000..c497ea64921c 100644 --- a/lms/djangoapps/shoppingcart/models.py +++ b/lms/djangoapps/shoppingcart/models.py @@ -529,7 +529,7 @@ def _emit_order_event(self, event_name, orderitems): 'revenue': str(self.total_cost), 'currency': self.currency, 'products': [item.analytics_data() for item in orderitems] - }, send_to_track=True, user=user) + }, send_to_track=True, user=self.user) except Exception: # pylint: disable=broad-except # Capturing all exceptions thrown while tracking analytics events. We do not want diff --git a/lms/djangoapps/shoppingcart/tests/test_models.py b/lms/djangoapps/shoppingcart/tests/test_models.py index 2e69958df453..adf28a09d0f5 100644 --- a/lms/djangoapps/shoppingcart/tests/test_models.py +++ b/lms/djangoapps/shoppingcart/tests/test_models.py @@ -286,9 +286,10 @@ def test_purchase(self): 'price': '40.00', 'id': 1, 'quantity': 1 - } - ] + }, + ], }, + send_to_track=True, user=self.user ) def test_purchase_item_failure(self): @@ -889,6 +890,7 @@ def _assert_refund_tracked(self): } ] }, + send_to_track=True, user=self.user ) def test_existing_enrollment(self): diff --git a/lms/templates/user_dropdown.html b/lms/templates/user_dropdown.html index 43b2948ba97f..d6e60cb7c2c7 100644 --- a/lms/templates/user_dropdown.html +++ b/lms/templates/user_dropdown.html @@ -26,8 +26,7 @@
-
@@ -47,13 +45,12 @@ ${username}
- -