paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

hotspots: Rename and update click_to_reply.

Browse Source
This commit is contained in:
Rishi Gupta
2017-08-29 17:13:04 -07:00
committed by Tim Abbott
parent c985791773
commit 4a383544af
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/hotspots.md
View File

@@ -14,9 +14,8 @@ for discussion.
### Step 1: Create hotspot content ### Step 1: Create hotspot content
In `zerver/lib/hotspots.py`, add your content to the `ALL_HOTSPOTS` dictionary. In `zerver/lib/hotspots.py`, add your content to the `ALL_HOTSPOTS` dictionary.
Each key-value pair in `ALL_HOTSPOTS` associates the name of the hotspot - e.g. Each key-value pair in `ALL_HOTSPOTS` associates the name of the hotspot with the
`click_to_reply`, `new_topic_button`, `stream_settings` - with content content displayed to the user.
displayed to the user.
``` ```
ALL_HOTSPOTS = { ALL_HOTSPOTS = {

7
static/js/hotspots.js
View File

@@ -12,10 +12,11 @@ var VIEWPORT_CENTER = 'viewport_center';
// popover orientation can optionally be fixed here (property: popover), // popover orientation can optionally be fixed here (property: popover),
// otherwise popovers.compute_placement is used to compute orientation // otherwise popovers.compute_placement is used to compute orientation
var HOTSPOT_LOCATIONS = { var HOTSPOT_LOCATIONS = {
click_to_reply: { intro_reply: {
element: '.selected_message .messagebox-content', element: '.selected_message .messagebox-content',
offset_x: 0.5, offset_x: 0.85,
offset_y: 0.5, offset_y: 0.7,
popover: BOTTOM,
}, },
new_topic_button: { new_topic_button: {
element: '#left_bar_compose_stream_button_big', element: '#left_bar_compose_stream_button_big',

6
zerver/lib/hotspots.py
View File

@@ -6,8 +6,8 @@ SEND_ALL = False
ALL_HOTSPOTS = { ALL_HOTSPOTS = {
# TODO: Tag these for translation once we've finalized the content. # TODO: Tag these for translation once we've finalized the content.
'click_to_reply': { 'intro_reply': {
'title': 'Respond to a message', 'title': 'Reply to a message',
'description': 'Click anywhere on a message to reply.', 'description': 'Click anywhere on a message to reply.',
}, },
'new_topic_button': { 'new_topic_button': {
@@ -36,7 +36,7 @@ def get_next_hotspots(user):
return result return result
seen_hotspots = frozenset(UserHotspot.objects.filter(user=user).values_list('hotspot', flat=True)) seen_hotspots = frozenset(UserHotspot.objects.filter(user=user).values_list('hotspot', flat=True))
for hotspot in ['click_to_reply', 'new_topic_button', 'stream_settings']: for hotspot in ['intro_reply', 'new_topic_button', 'stream_settings']:
if hotspot not in seen_hotspots: if hotspot not in seen_hotspots:
return [{ return [{
'name': hotspot, 'name': hotspot,

2
zerver/tests/test_events.py
View File

@@ -1388,7 +1388,7 @@ class EventsRegisterTest(ZulipTestCase):
('delay', check_int), ('delay', check_int),
]))), ]))),
]) ])
events = self.do_test(lambda: do_mark_hotspot_as_read(self.user_profile, 'click_to_reply')) events = self.do_test(lambda: do_mark_hotspot_as_read(self.user_profile, 'intro_reply'))
error = schema_checker('events[0]', events[0]) error = schema_checker('events[0]', events[0])
self.assert_on_error(error) self.assert_on_error(error)

10
zerver/tests/test_hotspots.py
View File

@@ -18,12 +18,12 @@ class TestGetNextHotspots(ZulipTestCase):
user = self.example_user('hamlet') user = self.example_user('hamlet')
hotspots = get_next_hotspots(user) hotspots = get_next_hotspots(user)
self.assertEqual(len(hotspots), 1) self.assertEqual(len(hotspots), 1)
self.assertEqual(hotspots[0]['name'], 'click_to_reply') self.assertEqual(hotspots[0]['name'], 'intro_reply')
def test_some_done_some_not(self): def test_some_done_some_not(self):
# type: () -> None # type: () -> None
user = self.example_user('hamlet') user = self.example_user('hamlet')
do_mark_hotspot_as_read(user, 'click_to_reply') do_mark_hotspot_as_read(user, 'intro_reply')
do_mark_hotspot_as_read(user, 'stream_settings') do_mark_hotspot_as_read(user, 'stream_settings')
hotspots = get_next_hotspots(user) hotspots = get_next_hotspots(user)
self.assertEqual(len(hotspots), 1) self.assertEqual(len(hotspots), 1)
@@ -49,13 +49,13 @@ class TestHotspots(ZulipTestCase):
user = self.example_user('hamlet') user = self.example_user('hamlet')
self.login(user.email) self.login(user.email)
result = self.client_post('/json/users/me/hotspots', result = self.client_post('/json/users/me/hotspots',
{'hotspot': ujson.dumps('click_to_reply')}) {'hotspot': ujson.dumps('intro_reply')})
self.assert_json_success(result) self.assert_json_success(result)
self.assertEqual(list(UserHotspot.objects.filter(user=user) self.assertEqual(list(UserHotspot.objects.filter(user=user)
.values_list('hotspot', flat=True)), ['click_to_reply']) .values_list('hotspot', flat=True)), ['intro_reply'])
result = self.client_post('/json/users/me/hotspots', result = self.client_post('/json/users/me/hotspots',
{'hotspot': ujson.dumps('invalid')}) {'hotspot': ujson.dumps('invalid')})
self.assert_json_error(result, "Unknown hotspot: invalid") self.assert_json_error(result, "Unknown hotspot: invalid")
self.assertEqual(list(UserHotspot.objects.filter(user=user) self.assertEqual(list(UserHotspot.objects.filter(user=user)
.values_list('hotspot', flat=True)), ['click_to_reply']) .values_list('hotspot', flat=True)), ['intro_reply'])